Merge branch 'main' into codex-review/pr-457

Cargo.lock

@@ -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/commands/openWorkspaceSettings.tsx

@@ -1,10 +1,19 @@
 import type { WorkspaceSettingsTab } from "../components/WorkspaceSettingsDialog";
 import { WorkspaceSettingsDialog } from "../components/WorkspaceSettingsDialog";
 import { activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
+import { showDialog } from "../lib/dialog";
 import { jotaiStore } from "../lib/jotai";
 
 export function openWorkspaceSettings(tab?: WorkspaceSettingsTab) {
   const workspaceId = jotaiStore.get(activeWorkspaceIdAtom);
   if (workspaceId == null) return;
-  WorkspaceSettingsDialog.show(workspaceId, tab);
+  showDialog({
+    id: "workspace-settings",
+    size: "md",
+    className: "h-[calc(100vh-5rem)] !max-h-[40rem]",
+    noPadding: true,
+    render: ({ hide }) => (
+      <WorkspaceSettingsDialog workspaceId={workspaceId} hide={hide} tab={tab} />
+    ),
+  });
 }

apps/yaak-client/components/CommandPaletteDialog.tsx

@@ -15,7 +15,6 @@ import {
 import { createFolder } from "../commands/commands";
 import { createSubEnvironmentAndActivate } from "../commands/createEnvironment";
 import { openSettings } from "../commands/openSettings";
-import { openWorkspaceSettings } from "../commands/openWorkspaceSettings";
 import { switchWorkspace } from "../commands/switchWorkspace";
 import { useActiveCookieJar } from "../hooks/useActiveCookieJar";
 import { useActiveEnvironment } from "../hooks/useActiveEnvironment";
@@ -37,6 +36,7 @@ import { appInfo } from "../lib/appInfo";
 import { copyToClipboard } from "../lib/copy";
 import { createRequestAndNavigate } from "../lib/createRequestAndNavigate";
 import { deleteModelWithConfirm } from "../lib/deleteModelWithConfirm";
+import { showDialog } from "../lib/dialog";
 import { editEnvironment } from "../lib/editEnvironment";
 import { renameModelWithPrompt } from "../lib/renameModelWithPrompt";
 import {
@@ -99,12 +99,6 @@ export function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
         action: "settings.show",
         onSelect: () => openSettings.mutate(null),
       },
-      {
-        key: "workspace_settings.open",
-        label: "Open Workspace Settings",
-        action: "workspace_settings.show",
-        onSelect: () => openWorkspaceSettings(),
-      },
       {
         key: "app.create",
         label: "Create Workspace",
@@ -133,9 +127,13 @@ export function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
       {
         key: "cookies.show",
         label: "Show Cookies",
-        action: "cookies_editor.show",
         onSelect: async () => {
-          CookieDialog.show(activeCookieJar?.id ?? null);
+          showDialog({
+            id: "cookies",
+            title: "Manage Cookies",
+            size: "full",
+            render: () => <CookieDialog cookieJarId={activeCookieJar?.id ?? null} />,
+          });
         },
       },
       {

apps/yaak-client/components/CookieDialog.tsx

@@ -1,731 +1,190 @@
-import type { Cookie } from "@yaakapp-internal/models";
+import type { Cookie, CookieDomain, CookieJar } from "@yaakapp-internal/models";
-import { cookieJarsAtom, patchModel } from "@yaakapp-internal/models";
+import { cookieJarsAtom, patchModelById } from "@yaakapp-internal/models";
-import { formatDate } from "date-fns/format";
 import { useAtomValue } from "jotai";
-import {
-  type ComponentProps,
-  type CSSProperties,
-  type FormEvent,
-  type ReactNode,
-  type RefObject,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-import { showDialog } from "../lib/dialog";
-import { jotaiStore } from "../lib/jotai";
 import { cookieDomain } from "../lib/model_util";
-import {
+import { showPromptForm } from "../lib/prompt-form";
-  Icon,
+import { Banner, InlineCode } from "@yaakapp-internal/ui";
-  SplitLayout,
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeaderCell,
-  TableRow,
-  TruncatedWideTableCell,
-} from "@yaakapp-internal/ui";
 import { IconButton } from "./core/IconButton";
-import { Checkbox } from "./core/Checkbox";
-import classNames from "classnames";
-import { EventDetailHeader } from "./core/EventViewer";
-import { KeyValueRow, KeyValueRows } from "./core/KeyValueRow";
-import { EmptyStateText } from "./EmptyStateText";
-import { PlainInput } from "./core/PlainInput";
-import { Select } from "./core/Select";
-import { showAlert } from "../lib/alert";
 
 interface Props {
   cookieJarId: string | null;
 }
 
+async function showAddCookieForm(cookieJarId: string): Promise<void> {
+  const result = await showPromptForm({
+    id: "add-cookie",
+    title: "Add Cookie",
+    size: "md",
+    inputs: [
+      {
+        name: "cookie_pairs",
+        label: "Cookie Attributes",
+        type: "key_value",
+        description:
+          "Add key-value pairs for the cookie. These will be combined into the cookie string.",
+      },
+      {
+        name: "domain_value",
+        label: "Domain",
+        type: "text",
+        placeholder: "example.com",
+      },
+      {
+        name: "hostOnly",
+        label: "Host Only",
+        type: "checkbox",
+        defaultValue: "true",
+        description:
+          "If enabled, cookie is restricted to the exact host. Otherwise, it applies to the domain and its subdomains.",
+      },
+      {
+        name: "path",
+        label: "Path",
+        type: "text",
+        placeholder: "/",
+        defaultValue: "/",
+      },
+      {
+        name: "secure",
+        label: "Secure",
+        type: "checkbox",
+        defaultValue: "true",
+        description: "If enabled, cookie will only be sent over HTTPS connections.",
+      },
+    ],
+  });
+
+  if (result == null) return;
+
+  // Parse the form results
+  const cookie_pairs_raw = result.cookie_pairs;
+  const domain_value = (result.domain_value as string) ?? "";
+  const path = (result.path as string) ?? "/";
+  const hostOnly = (result.hostOnly as string) === "true";
+  const secure = (result.secure as string) === "true";
+
+  // Convert key-value pairs to raw_cookie string format: key1=value1;key2=value2
+  // Parse cookie_pairs - it comes as a JSON string from the key_value input
+  let parsedPairs: Array<{ name: string; value: string }> = [];
+  try {
+    // Handle null, undefined, or string value
+    const pairsStr =
+      typeof cookie_pairs_raw === "string"
+        ? cookie_pairs_raw
+        : cookie_pairs_raw != null
+          ? JSON.stringify(cookie_pairs_raw)
+          : "[]";
+    if (pairsStr && pairsStr !== "") {
+      parsedPairs = JSON.parse(pairsStr);
+    }
+  } catch {
+    parsedPairs = [];
+  }
+
+  const validPairs = parsedPairs.filter((p) => p?.name?.trim());
+  // Ensure at least one valid pair exists
+  if (validPairs.length === 0) {
+    console.log("No valid cookie pairs provided");
+    return;
+  }
+
+  const raw_cookie = validPairs.map((p) => `${p.name}=${p.value}`).join(";");
+
+  const domain: CookieDomain = hostOnly
+    ? { HostOnly: domain_value ?? "" }
+    : { Suffix: domain_value ?? "" };
+
+  // Build the new cookie with explicit tuple type for path
+  const newCookie: Cookie = {
+    raw_cookie,
+    domain,
+    expires: "SessionEnd",
+    path: [path, secure] as [string, boolean],
+  };
+
+  try {
+    await patchModelById<"cookie_jar", CookieJar>("cookie_jar", cookieJarId, (prev) => ({
+      ...prev,
+      cookies: [...prev.cookies, newCookie],
+    }));
+  } catch (error) {
+    console.error("Failed to add cookie:", error);
+    throw error;
+  }
+}
+
 export const CookieDialog = ({ cookieJarId }: Props) => {
   const cookieJars = useAtomValue(cookieJarsAtom);
   const cookieJar = cookieJars?.find((c) => c.id === cookieJarId);
-  const [filter, setFilter] = useState("");
-  const [filterUpdateKey, setFilterUpdateKey] = useState(0);
-  const [selectedCookieKey, setSelectedCookieKey] = useState<string | null>(null);
-  const [editingCookieKey, setEditingCookieKey] = useState<string | null>(null);
-  const [draftCookie, setDraftCookie] = useState<Cookie | null>(null);
-  const [draftExpiresInput, setDraftExpiresInput] = useState("");
-  const editorFormRef = useRef<HTMLFormElement>(null);
-  const filteredCookies = useMemo(() => {
-    return cookieJar?.cookies.filter((cookie) => cookieMatchesFilter(cookie, filter)) ?? [];
-  }, [cookieJar?.cookies, filter]);
-  const selectedCookie = useMemo(
-    () =>
-      selectedCookieKey == null
-        ? null
-        : (filteredCookies.find((cookie) => cookieKey(cookie) === selectedCookieKey) ?? null),
-    [filteredCookies, selectedCookieKey],
-  );
-  const detailCookie = draftCookie ?? selectedCookie;
-  const isCreatingCookie = editingCookieKey === NEW_COOKIE_KEY;
-  const isEditingCookie = draftCookie != null;
-
-  const handleAddCookie = () => {
-    setSelectedCookieKey(null);
-    setEditingCookieKey(NEW_COOKIE_KEY);
-    setDraftCookie(newCookieDraft());
-    setDraftExpiresInput("");
-  };
-
-  const handleEditCookie = () => {
-    if (selectedCookie == null) {
-      return;
-    }
-
-    setEditingCookieKey(cookieKey(selectedCookie));
-    setDraftCookie(selectedCookie);
-    setDraftExpiresInput(cookieExpiresInputValue(selectedCookie));
-  };
-
-  const handleCancelEdit = () => {
-    if (isCreatingCookie) {
-      setSelectedCookieKey(null);
-    }
-    setEditingCookieKey(null);
-    setDraftCookie(null);
-    setDraftExpiresInput("");
-  };
-
-  const handleCloseDetails = () => {
-    if (isEditingCookie) {
-      handleCancelEdit();
-      return;
-    }
-
-    setSelectedCookieKey(null);
-  };
-
-  const handleSaveCookie = (event: FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-
-    if (cookieJar == null || draftCookie == null) {
-      return;
-    }
-
-    let nextCookie = normalizeCookie(draftCookie);
-    if (nextCookie.expires !== "SessionEnd") {
-      const expires = cookieExpiresFromInput(draftExpiresInput);
-      if (expires == null) {
-        showAlert({
-          id: "invalid-cookie-expires",
-          title: "Invalid Cookie",
-          body: "Cookie expiration must be a valid date.",
-        });
-        return;
-      }
-
-      nextCookie = { ...nextCookie, expires };
-    }
-
-    const nextCookieKey = cookieKey(nextCookie);
-    const nextCookies = cookieJar.cookies.filter((cookie) => {
-      const key = cookieKey(cookie);
-      if (editingCookieKey != null && key === editingCookieKey) {
-        return false;
-      }
-      return key !== nextCookieKey;
-    });
-
-    void patchModel(cookieJar, { cookies: [...nextCookies, nextCookie] });
-    setSelectedCookieKey(nextCookieKey);
-    setEditingCookieKey(null);
-    setDraftCookie(null);
-    setDraftExpiresInput("");
-  };
 
   if (cookieJar == null) {
     return <div>No cookie jar selected</div>;
   }
 
-  return (
+  const onAddCookie = () => showAddCookieForm(cookieJar.id);
-    <div className="pb-2 grid grid-rows-[auto_minmax(0,1fr)] space-y-2">
-      <div className="grid grid-cols-[minmax(0,1fr)_auto] gap-2">
-        <PlainInput
-          name="cookie-filter"
-          label="Filter cookies"
-          hideLabel
-          placeholder="Filter cookies"
-          defaultValue={filter}
-          forceUpdateKey={filterUpdateKey}
-          onChange={setFilter}
-          rightSlot={
-            filter.length > 0 && (
-              <IconButton
-                className="!bg-transparent !h-auto min-h-full opacity-50 hover:opacity-100 -mr-1"
-                icon="x"
-                title="Clear filter"
-                onClick={() => {
-                  setFilter("");
-                  setFilterUpdateKey((key) => key + 1);
-                }}
-              />
-            )
-          }
-        />
-        <IconButton icon="plus" size="sm" title="Add cookie" onClick={handleAddCookie} />
-      </div>
-      {cookieJar.cookies.length === 0 && detailCookie == null ? (
-        <EmptyStateText>
-          Cookies will appear when a response includes a Set-Cookie header.
-        </EmptyStateText>
-      ) : filteredCookies.length === 0 && detailCookie == null ? (
-        <EmptyStateText>No cookies match the current filter.</EmptyStateText>
-      ) : (
-        <SplitLayout
-          layout="vertical"
-          storageKey="cookie-dialog-details"
-          defaultRatio={0.5}
-          className="-mx-2"
-          minHeightPx={10}
-          firstSlot={({ style }) =>
-            filteredCookies.length === 0 ? (
-              <div style={style}>
-                <EmptyStateText>No cookies match the current filter.</EmptyStateText>
-              </div>
-            ) : (
-              <Table scrollable style={style} className="pr-0.5">
-                <TableHead>
-                  <TableRow>
-                    <TableHeaderCell>Name</TableHeaderCell>
-                    <TableHeaderCell>Value</TableHeaderCell>
-                    <TableHeaderCell>Domain</TableHeaderCell>
-                    <TableHeaderCell>Path</TableHeaderCell>
-                    <TableHeaderCell>Expires</TableHeaderCell>
-                    <TableHeaderCell>Size</TableHeaderCell>
-                    <TableHeaderCell>HTTP Only</TableHeaderCell>
-                    <TableHeaderCell>Secure</TableHeaderCell>
-                    <TableHeaderCell>Same Site</TableHeaderCell>
-                    <TableHeaderCell>
-                      <IconButton
-                        icon="list_x"
-                        size="sm"
-                        className="text-text-subtle"
-                        title="Clear all cookies"
-                        onClick={() => {
-                          setSelectedCookieKey(null);
-                          setEditingCookieKey(null);
-                          setDraftCookie(null);
-                          setDraftExpiresInput("");
-                          void patchModel(cookieJar, { cookies: [] });
-                        }}
-                      />
-                    </TableHeaderCell>
-                  </TableRow>
-                </TableHead>
-                <TableBody className="[&_td]:select-auto [&_td]:cursor-auto">
-                  {filteredCookies.map((c: Cookie) => {
-                    const key = cookieKey(c);
-                    const isSelected = key === selectedCookieKey;
 
-                    return (
+  let tableBody;
-                      <TableRow
+  if (cookieJar.cookies.length === 0) {
-                        key={key}
+    tableBody = (
-                        className={classNames(
+      <tr>
-                          "group/tr cursor-default",
+        <td colSpan={3}>
-                          isSelected && "[&_td]:bg-surface-highlight",
+          <Banner>
-                          !isSelected && "hover:[&_td]:bg-surface-hover",
+            Cookies will appear when a response contains the <InlineCode>Set-Cookie</InlineCode>{" "}
-                        )}
+            header
-                        onClick={() => {
+          </Banner>
-                          setSelectedCookieKey(key);
+        </td>
-                          setEditingCookieKey(null);
+      </tr>
-                          setDraftCookie(null);
-                          setDraftExpiresInput("");
-                        }}
-                      >
-                        <TableCell className={classNames("pl-2", isSelected && "rounded-l")}>
-                          {c.name}
-                        </TableCell>
-                        <TruncatedWideTableCell className="min-w-[10rem]">
-                          {c.value}
-                        </TruncatedWideTableCell>
-                        <TableCell>{cookieDomain(c)}</TableCell>
-                        <TableCell>{c.path}</TableCell>
-                        <TableCell>{cookieExpires(c)}</TableCell>
-                        <TableCell>{cookieSize(c)}</TableCell>
-                        <TableCell>
-                          <Icon
-                            icon={c.httpOnly ? "check" : "x"}
-                            className={classNames(!c.httpOnly && "opacity-10")}
-                          />
-                        </TableCell>
-                        <TableCell>
-                          <Icon
-                            icon={c.secure ? "check" : "x"}
-                            className={classNames(!c.secure && "opacity-10")}
-                          />
-                        </TableCell>
-                        <TableCell>{c.sameSite}</TableCell>
-                        <TableCell className="rounded-r pr-2">
-                          <IconButton
-                            icon="trash"
-                            size="xs"
-                            iconSize="sm"
-                            title="Delete"
-                            className="text-text-subtlest ml-auto group-hover/tr:text-text transition-colors"
-                            onClick={(event) => {
-                              event.stopPropagation();
-                              if (isSelected) {
-                                setSelectedCookieKey(null);
-                              }
-                              if (editingCookieKey === key) {
-                                setEditingCookieKey(null);
-                                setDraftCookie(null);
-                                setDraftExpiresInput("");
-                              }
-                              void patchModel(cookieJar, {
-                                cookies: cookieJar.cookies.filter(
-                                  (c2: Cookie) => cookieKey(c2) !== key,
-                                ),
-                              });
-                            }}
-                          />
-                        </TableCell>
-                      </TableRow>
-                    );
-                  })}
-                </TableBody>
-              </Table>
-            )
-          }
-          secondSlot={
-            detailCookie == null
-              ? null
-              : ({ style }) => (
-                  <CookieDetailsPane
-                    formRef={editorFormRef}
-                    isEditing={isEditingCookie}
-                    onSubmit={handleSaveCookie}
-                    style={style}
-                  >
-                    <EventDetailHeader
-                      title={isCreatingCookie ? "New Cookie" : detailCookie.name || "Cookie"}
-                      copyText={isEditingCookie ? undefined : detailCookie.value}
-                      actions={
-                        isEditingCookie
-                          ? [
-                              {
-                                key: "save",
-                                label: isCreatingCookie ? "Create" : "Save",
-                                onClick: () => editorFormRef.current?.requestSubmit(),
-                              },
-                              {
-                                key: "cancel",
-                                label: "Cancel",
-                                onClick: handleCancelEdit,
-                              },
-                            ]
-                          : [
-                              {
-                                key: "edit",
-                                label: "Edit",
-                                onClick: handleEditCookie,
-                              },
-                            ]
-                      }
-                      onClose={handleCloseDetails}
-                    />
-                    {isEditingCookie ? (
-                      <CookieEditor
-                        cookie={detailCookie}
-                        expiresInputValue={draftExpiresInput}
-                        onChange={setDraftCookie}
-                        onExpiresInputChange={setDraftExpiresInput}
-                      />
-                    ) : (
-                      <CookieDetails cookie={detailCookie} />
-                    )}
-                  </CookieDetailsPane>
-                )
-          }
-        />
-      )}
-    </div>
-  );
-};
-
-function CookieDetailsPane({
-  children,
-  formRef,
-  isEditing,
-  onSubmit,
-  style,
-}: {
-  children: ReactNode;
-  formRef: RefObject<HTMLFormElement | null>;
-  isEditing: boolean;
-  onSubmit: (event: FormEvent<HTMLFormElement>) => void;
-  style: CSSProperties;
-}) {
-  const className = "grid grid-rows-[auto_minmax(0,1fr)] bg-surface border-t border-border pt-2";
-
-  if (isEditing) {
-    return (
-      <form ref={formRef} style={style} className={className} onSubmit={onSubmit}>
-        {children}
-      </form>
     );
-  }
+    // );
-
+  } else {
-  return (
+    tableBody = cookieJar?.cookies.map((c: Cookie) => (
-    <div style={style} className={className}>
+      <tr key={JSON.stringify(c)}>
-      {children}
+        <td className="py-2 select-text cursor-text font-mono font-semibold max-w-0">
-    </div>
+          {cookieDomain(c)}
-  );
+        </td>
-}
+        <td className="py-2 pl-4 select-text cursor-text font-mono text-text-subtle whitespace-nowrap overflow-x-auto max-w-[200px] hide-scrollbars">
-
+          {c.raw_cookie}
-CookieDialog.show = (cookieJarId: string | null) => {
+        </td>
-  const cookieJar = jotaiStore.get(cookieJarsAtom)?.find((jar) => jar.id === cookieJarId);
+        <td className="max-w-0 w-10">
-  if (cookieJar == null) {
+          <IconButton
-    showAlert({
+            icon="trash"
-      id: "invalid-jar",
-      body: `Failed to find cookie jar for ID: ${cookieJarId}`,
-      title: "Invalid Cookie Jar",
-    });
-    return;
-  }
-
-  showDialog({
-    id: "cookies",
-    title: `${cookieJar.name} Cookies`,
-    size: "full",
-    render: () => <CookieDialog cookieJarId={cookieJarId} />,
-  });
-};
-
-function CookieDetails({ cookie }: { cookie: Cookie }) {
-  return (
-    <div className="overflow-y-auto">
-      <KeyValueRows selectable>
-        <CookieKeyValueRow label="Name">{cookie.name}</CookieKeyValueRow>
-        <CookieKeyValueRow label="Value" enableCopy copyText={cookie.value}>
-          <pre className="whitespace-pre-wrap break-all">{cookie.value}</pre>
-        </CookieKeyValueRow>
-        <CookieKeyValueRow label="Domain">{cookieDomain(cookie)}</CookieKeyValueRow>
-        <CookieKeyValueRow label="Path">{cookie.path}</CookieKeyValueRow>
-        <CookieKeyValueRow label="Expires">{cookieExpires(cookie)}</CookieKeyValueRow>
-        <CookieKeyValueRow label="Size">{cookieSize(cookie)}</CookieKeyValueRow>
-        <CookieKeyValueRow label="HTTP Only">{cookie.httpOnly ? "Yes" : "No"}</CookieKeyValueRow>
-        <CookieKeyValueRow label="Secure">{cookie.secure ? "Yes" : "No"}</CookieKeyValueRow>
-        {cookie.sameSite && (
-          <CookieKeyValueRow label="Same Site">{cookie.sameSite}</CookieKeyValueRow>
-        )}
-      </KeyValueRows>
-    </div>
-  );
-}
-
-function CookieEditor({
-  cookie,
-  expiresInputValue,
-  onChange,
-  onExpiresInputChange,
-}: {
-  cookie: Cookie;
-  expiresInputValue: string;
-  onChange: (cookie: Cookie) => void;
-  onExpiresInputChange: (value: string) => void;
-}) {
-  const sessionCookie = cookie.expires === "SessionEnd";
-
-  return (
-    <div className="overflow-y-auto">
-      <KeyValueRows>
-        <CookieKeyValueRow align="middle" label="Name">
-          <CookieTextInput
-            required
-            autoFocus
-            pattern={NON_EMPTY_INPUT_PATTERN}
-            value={cookie.name}
-            onChange={(name) => onChange({ ...cookie, name })}
-          />
-        </CookieKeyValueRow>
-        <CookieKeyValueRow label="Value">
-          <CookieTextarea
-            value={cookie.value}
-            onChange={(value) => onChange({ ...cookie, value })}
-          />
-        </CookieKeyValueRow>
-        <CookieKeyValueRow align="middle" label="Domain">
-          <CookieTextInput
-            required
-            pattern={NON_EMPTY_INPUT_PATTERN}
-            value={cookieDomainInputValue(cookie)}
-            placeholder="example.com"
-            onChange={(domain) => onChange(cookieWithDomain(cookie, domain))}
-          />
-        </CookieKeyValueRow>
-        <CookieKeyValueRow align="middle" label="Path">
-          <CookieTextInput
-            value={cookie.path}
-            placeholder="/"
-            onChange={(path) => onChange({ ...cookie, path })}
-          />
-        </CookieKeyValueRow>
-        <CookieKeyValueRow label="Expires">
-          <div className="grid gap-1">
-            <Checkbox
-              checked={sessionCookie}
-              title="Session cookie"
-              onChange={(checked) => {
-                if (checked) {
-                  onChange({ ...cookie, expires: "SessionEnd" });
-                  return;
-                }
-
-                const expiresInput =
-                  cookieExpiresFromInput(expiresInputValue) == null
-                    ? defaultCookieExpiresInputValue()
-                    : expiresInputValue;
-
-                onExpiresInputChange(expiresInput);
-                onChange({
-                  ...cookie,
-                  expires: cookieExpiresFromInput(expiresInput)!,
-                });
-              }}
-            />
-            <CookieTextInput
-              value={sessionCookie ? "" : expiresInputValue}
-              disabled={sessionCookie}
-              onChange={(value) => {
-                onExpiresInputChange(value);
-
-                const expires = cookieExpiresFromInput(value);
-                if (expires != null) {
-                  onChange({ ...cookie, expires });
-                }
-              }}
-            />
-          </div>
-        </CookieKeyValueRow>
-        <CookieKeyValueRow label="Size">{cookieSize(cookie)}</CookieKeyValueRow>
-        <CookieKeyValueRow align="middle" label="HTTP Only">
-          <Checkbox
-            hideLabel
-            title="HTTP Only"
-            checked={cookie.httpOnly}
-            onChange={(httpOnly) => onChange({ ...cookie, httpOnly })}
-          />
-        </CookieKeyValueRow>
-        <CookieKeyValueRow align="middle" label="Secure">
-          <Checkbox
-            hideLabel
-            title="Secure"
-            checked={cookie.secure}
-            onChange={(secure) => onChange({ ...cookie, secure })}
-          />
-        </CookieKeyValueRow>
-        <CookieKeyValueRow align="middle" label="Same Site">
-          <Select
-            hideLabel
-            name="cookie-same-site"
-            label="Same Site"
-            value={cookie.sameSite ?? ""}
             size="xs"
-            className="w-full"
+            iconSize="sm"
-            options={[
+            title="Delete"
-              { label: "n/a", value: "" },
+            className="ml-auto"
-              { label: "Lax", value: "Lax" },
+            onClick={async () =>
-              { label: "Strict", value: "Strict" },
+              await patchModelById<"cookie_jar", CookieJar>("cookie_jar", cookieJar.id, (prev) => ({
-              { label: "None", value: "None" },
+                ...prev,
-            ]}
+                cookies: prev.cookies.filter((c2: Cookie) => c2 !== c),
-            onChange={(sameSite) =>
+              }))
-              onChange({
-                ...cookie,
-                sameSite: sameSite === "" ? null : (sameSite as Cookie["sameSite"]),
-              })
             }
           />
-        </CookieKeyValueRow>
+        </td>
-      </KeyValueRows>
+      </tr>
+    ));
+  }
+
+  return (
+    <div className="pb-2">
+      <table className="w-full text-sm mb-auto min-w-full max-w-full divide-y divide-surface-highlight">
+        <thead>
+          <tr>
+            <th className="py-2 text-left">Domain</th>
+            <th className="py-2 text-left pl-4">Cookie</th>
+            <th className="py-2 pl-4 w-10">
+              <IconButton
+                icon="plus"
+                size="xs"
+                iconSize="sm"
+                title="Add Cookie"
+                className="ml-auto"
+                onClick={onAddCookie}
+              />
+            </th>
+          </tr>
+        </thead>
+        <tbody className="divide-y divide-surface-highlight">{tableBody}</tbody>
+      </table>
     </div>
   );
-}
+};
-
-function CookieKeyValueRow({ labelClassName, ...props }: ComponentProps<typeof KeyValueRow>) {
-  return <KeyValueRow labelClassName={classNames("w-[7rem]", labelClassName)} {...props} />;
-}
-
-function CookieTextInput({
-  autoFocus,
-  disabled,
-  onChange,
-  pattern,
-  placeholder,
-  required,
-  value,
-}: {
-  autoFocus?: boolean;
-  disabled?: boolean;
-  onChange: (value: string) => void;
-  pattern?: string;
-  placeholder?: string;
-  required?: boolean;
-  value: string;
-}) {
-  return (
-    <input
-      autoFocus={autoFocus}
-      autoCapitalize="off"
-      autoCorrect="off"
-      className={cookieInputClassName}
-      disabled={disabled}
-      onChange={(event) => onChange(event.target.value)}
-      pattern={pattern}
-      placeholder={placeholder}
-      required={required}
-      type="text"
-      value={value}
-    />
-  );
-}
-
-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}
-    />
-  );
-}
-
-const NEW_COOKIE_KEY = "__new-cookie__";
-const NON_EMPTY_INPUT_PATTERN = ".*\\S.*";
-const cookieInputClassName = classNames(
-  "x-theme-input w-full min-w-0 min-h-sm rounded-md bg-transparent",
-  "border border-border-subtle outline-none",
-  "px-2 text-xs font-mono cursor-text placeholder:text-placeholder",
-  "focus:border-border-focus invalid:border-danger",
-  "disabled:opacity-disabled disabled:border-dotted",
-);
-
-function cookieSize(cookie: Cookie) {
-  const encoder = new TextEncoder();
-  return encoder.encode(cookie.name).length + encoder.encode(cookie.value).length;
-}
-
-function newCookieDraft(): Cookie {
-  return {
-    name: "",
-    value: "",
-    domain: "NotPresent",
-    expires: "SessionEnd",
-    path: "/",
-    secure: false,
-    httpOnly: false,
-    sameSite: null,
-  };
-}
-
-function normalizeCookie(cookie: Cookie): Cookie {
-  return {
-    ...cookie,
-    domain: normalizeCookieDomain(cookie.domain),
-    name: cookie.name.trim(),
-    path: cookie.path.trim() || "/",
-  };
-}
-
-function normalizeCookieDomain(domain: Cookie["domain"]): Cookie["domain"] {
-  if (domain === "NotPresent" || domain === "Empty") {
-    return domain;
-  }
-
-  if ("Suffix" in domain) {
-    return { Suffix: domain.Suffix.trim() };
-  }
-
-  return { HostOnly: domain.HostOnly.trim() };
-}
-
-function cookieDomainInputValue(cookie: Cookie) {
-  const domain = cookieDomain(cookie);
-  return domain === "n/a" ? "" : domain;
-}
-
-function cookieWithDomain(cookie: Cookie, domain: string): Cookie {
-  const trimmedDomain = domain.trim();
-  if (trimmedDomain.length === 0) {
-    return { ...cookie, domain: "NotPresent" };
-  }
-
-  if (cookie.domain !== "NotPresent" && cookie.domain !== "Empty" && "Suffix" in cookie.domain) {
-    return { ...cookie, domain: { Suffix: trimmedDomain } };
-  }
-
-  return { ...cookie, domain: { HostOnly: trimmedDomain } };
-}
-
-function cookieExpires(cookie: Cookie) {
-  if (cookie.expires === "SessionEnd") {
-    return "Session";
-  }
-
-  const expiresSeconds = Number(cookie.expires.AtUtc);
-  if (!Number.isFinite(expiresSeconds)) {
-    return cookie.expires.AtUtc;
-  }
-
-  const date = new Date(expiresSeconds * 1000);
-  return formatDate(date, "MMM d, yyyy, h:mm:ss a");
-}
-
-function cookieExpiresInputValue(cookie: Cookie) {
-  if (cookie.expires === "SessionEnd") {
-    return "";
-  }
-
-  const expiresSeconds = Number(cookie.expires.AtUtc);
-  if (!Number.isFinite(expiresSeconds)) {
-    return "";
-  }
-
-  return new Date(expiresSeconds * 1000).toISOString();
-}
-
-function defaultCookieExpiresInputValue() {
-  return new Date(Date.now() + 24 * 60 * 60 * 1000).toISOString();
-}
-
-function cookieExpiresFromInput(value: string): Cookie["expires"] | null {
-  const time = new Date(value).getTime();
-  if (!Number.isFinite(time)) {
-    return null;
-  }
-
-  return { AtUtc: `${Math.floor(time / 1000)}` };
-}
-
-function cookieMatchesFilter(cookie: Cookie, filter: string) {
-  const query = filter.trim().toLowerCase();
-  if (query.length === 0) {
-    return true;
-  }
-
-  return [cookie.name, cookie.value, cookieDomain(cookie)].some((value) =>
-    value.toLowerCase().includes(query),
-  );
-}
-
-function cookieKey(cookie: Cookie) {
-  return [cookie.name, cookieDomainKey(cookie.domain), cookie.path].join("|");
-}
-
-function cookieDomainKey(domain: Cookie["domain"]) {
-  if (typeof domain !== "string" && "HostOnly" in domain) {
-    return `HostOnly:${domain.HostOnly}`;
-  }
-
-  if (typeof domain !== "string" && "Suffix" in domain) {
-    return `Suffix:${domain.Suffix}`;
-  }
-
-  return domain;
-}

apps/yaak-client/components/CookieDropdown.tsx

@@ -4,6 +4,7 @@ import { memo, useMemo } from "react";
 import { useActiveCookieJar } from "../hooks/useActiveCookieJar";
 import { useCreateCookieJar } from "../hooks/useCreateCookieJar";
 import { deleteModelWithConfirm } from "../lib/deleteModelWithConfirm";
+import { showDialog } from "../lib/dialog";
 import { showPrompt } from "../lib/prompt";
 import { setWorkspaceSearchParams } from "../lib/setWorkspaceSearchParams";
 import { CookieDialog } from "./CookieDialog";
@@ -35,7 +36,12 @@ export const CookieDropdown = memo(function CookieDropdown() {
               leftSlot: <Icon icon="cookie" />,
               onSelect: () => {
                 if (activeCookieJar == null) return;
-                CookieDialog.show(activeCookieJar.id);
+                showDialog({
+                  id: "cookies",
+                  title: "Manage Cookies",
+                  size: "full",
+                  render: () => <CookieDialog cookieJarId={activeCookieJar.id} />,
+                });
               },
             },
             {

apps/yaak-client/components/EmptyStateText.tsx

@@ -4,12 +4,11 @@ import type { ReactNode } from "react";
 interface Props {
   children: ReactNode;
   className?: string;
-  wrapperClassName?: string;
 }
 
-export function EmptyStateText({ children, className, wrapperClassName }: Props) {
+export function EmptyStateText({ children, className }: Props) {
   return (
-    <div className={classNames("w-full h-full pb-2", wrapperClassName)}>
+    <div className="w-full h-full pb-2">
       <div
         className={classNames(
           className,

apps/yaak-client/components/FolderSettingsDialog.tsx

@@ -21,7 +21,6 @@ import { EnvironmentEditor } from "./EnvironmentEditor";
 import { HeadersEditor } from "./HeadersEditor";
 import { HttpAuthenticationEditor } from "./HttpAuthenticationEditor";
 import { MarkdownEditor } from "./MarkdownEditor";
-import { countOverriddenSettings, ModelSettingsEditor } from "./ModelSettingsEditor";
 
 interface Props {
   folderId: string | null;
@@ -30,7 +29,6 @@ interface Props {
 
 const TAB_AUTH = "auth";
 const TAB_HEADERS = "headers";
-const TAB_SETTINGS = "settings";
 const TAB_VARIABLES = "variables";
 const TAB_GENERAL = "general";
 
@@ -38,7 +36,6 @@ export type FolderSettingsTab =
   | typeof TAB_AUTH
   | typeof TAB_HEADERS
   | typeof TAB_GENERAL
-  | typeof TAB_SETTINGS
   | typeof TAB_VARIABLES;
 
 export function FolderSettingsDialog({ folderId, tab }: Props) {
@@ -54,7 +51,6 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
     (e) => e.parentModel === "folder" && e.parentId === folderId,
   );
   const numVars = (folderEnvironment?.variables ?? []).filter((v) => v.name).length;
-  const numSettingsOverrides = folder == null ? 0 : countOverriddenSettings(folder);
 
   const tabs = useMemo<TabItem[]>(() => {
     if (folder == null) return [];
@@ -64,11 +60,6 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
         value: TAB_GENERAL,
         label: "General",
       },
-      {
-        value: TAB_SETTINGS,
-        label: "Settings",
-        rightSlot: <CountBadge count={numSettingsOverrides} />,
-      },
       ...headersTab,
       ...authTab,
       {
@@ -77,7 +68,7 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
         rightSlot: numVars > 0 ? <CountBadge count={numVars} /> : null,
       },
     ];
-  }, [authTab, folder, headersTab, numSettingsOverrides, numVars]);
+  }, [authTab, folder, headersTab, numVars]);
 
   if (folder == null) return null;
 
@@ -168,9 +159,6 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
             stateKey={`headers.${folder.id}`}
           />
         </TabContent>
-        <TabContent value={TAB_SETTINGS} className="overflow-y-auto h-full px-4">
-          <ModelSettingsEditor model={folder} />
-        </TabContent>
         <TabContent value={TAB_VARIABLES} className="overflow-y-auto h-full px-4">
           {folderEnvironment == null ? (
             <EmptyStateText>

apps/yaak-client/components/GrpcRequestPane.tsx

@@ -20,7 +20,6 @@ import { GrpcEditor } from "./GrpcEditor";
 import { HeadersEditor } from "./HeadersEditor";
 import { HttpAuthenticationEditor } from "./HttpAuthenticationEditor";
 import { MarkdownEditor } from "./MarkdownEditor";
-import { countOverriddenSettings, ModelSettingsEditor } from "./ModelSettingsEditor";
 import { UrlBar } from "./UrlBar";
 
 interface Props {
@@ -48,7 +47,6 @@ interface Props {
 const TAB_MESSAGE = "message";
 const TAB_METADATA = "metadata";
 const TAB_AUTH = "auth";
-const TAB_SETTINGS = "settings";
 const TAB_DESCRIPTION = "description";
 
 export function GrpcRequestPane({
@@ -68,7 +66,6 @@ export function GrpcRequestPane({
   const authTab = useAuthTab(TAB_AUTH, activeRequest);
   const metadataTab = useHeadersTab(TAB_METADATA, activeRequest, "Metadata");
   const inheritedHeaders = useInheritedHeaders(activeRequest);
-  const numSettingsOverrides = countOverriddenSettings(activeRequest);
   const forceUpdateKey = useRequestUpdateKey(activeRequest.id ?? null);
 
   const urlContainerEl = useRef<HTMLDivElement>(null);
@@ -131,18 +128,13 @@ export function GrpcRequestPane({
       { value: TAB_MESSAGE, label: "Message" },
       ...metadataTab,
       ...authTab,
-      {
-        value: TAB_SETTINGS,
-        label: "Settings",
-        rightSlot: <CountBadge count={numSettingsOverrides} />,
-      },
       {
         value: TAB_DESCRIPTION,
         label: "Info",
         rightSlot: activeRequest.description && <CountBadge count={true} />,
       },
     ],
-    [activeRequest.description, authTab, metadataTab, numSettingsOverrides],
+    [activeRequest.description, authTab, metadataTab],
   );
 
   const handleMetadataChange = useCallback(
@@ -286,9 +278,6 @@ export function GrpcRequestPane({
             onChange={handleMetadataChange}
           />
         </TabContent>
-        <TabContent value={TAB_SETTINGS}>
-          <ModelSettingsEditor model={activeRequest} />
-        </TabContent>
         <TabContent value={TAB_DESCRIPTION}>
           <div className="grid grid-rows-[auto_minmax(0,1fr)] h-full">
             <PlainInput

apps/yaak-client/components/HttpRequestPane.tsx

@@ -51,7 +51,6 @@ import { HttpAuthenticationEditor } from "./HttpAuthenticationEditor";
 import { JsonBodyEditor } from "./JsonBodyEditor";
 import { MarkdownEditor } from "./MarkdownEditor";
 import { RequestMethodDropdown } from "./RequestMethodDropdown";
-import { countOverriddenSettings, ModelSettingsEditor } from "./ModelSettingsEditor";
 import { UrlBar } from "./UrlBar";
 import { UrlParametersEditor } from "./UrlParameterEditor";
 
@@ -70,7 +69,6 @@ const TAB_BODY = "body";
 const TAB_PARAMS = "params";
 const TAB_HEADERS = "headers";
 const TAB_AUTH = "auth";
-const TAB_SETTINGS = "settings";
 const TAB_DESCRIPTION = "description";
 const TABS_STORAGE_KEY = "http_request_tabs";
 
@@ -94,7 +92,6 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
   const authTab = useAuthTab(TAB_AUTH, activeRequest);
   const headersTab = useHeadersTab(TAB_HEADERS, activeRequest);
   const inheritedHeaders = useInheritedHeaders(activeRequest);
-  const numSettingsOverrides = countOverriddenSettings(activeRequest);
 
   // Listen for event to focus the params tab (e.g., when clicking a :param in the URL)
   useRequestEditorEvent(
@@ -237,11 +234,6 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
       },
       ...headersTab,
       ...authTab,
-      {
-        value: TAB_SETTINGS,
-        label: "Settings",
-        rightSlot: <CountBadge count={numSettingsOverrides} />,
-      },
       {
         value: TAB_DESCRIPTION,
         label: "Info",
@@ -254,7 +246,6 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
       handleContentTypeChange,
       headersTab,
       numParams,
-      numSettingsOverrides,
       urlParameterPairs.length,
     ],
   );
@@ -381,9 +372,6 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
                 onChange={(urlParameters) => patchModel(activeRequest, { urlParameters })}
               />
             </TabContent>
-            <TabContent value={TAB_SETTINGS}>
-              <ModelSettingsEditor model={activeRequest} />
-            </TabContent>
             <TabContent value={TAB_BODY}>
               <ConfirmLargeRequestBody request={activeRequest}>
                 {activeRequest.bodyType === BODY_TYPE_JSON ? (

apps/yaak-client/components/HttpResponseTimeline.tsx

@@ -1,15 +1,10 @@
 import type {
-  AnyModel,
   HttpResponse,
   HttpResponseEvent,
   HttpResponseEventData,
 } from "@yaakapp-internal/models";
-import { foldersAtom, workspacesAtom } from "@yaakapp-internal/models";
-import { useAtomValue } from "jotai";
 import { type ReactNode, useMemo, useState } from "react";
 import { useHttpResponseEvents } from "../hooks/useHttpResponseEvents";
-import { useAllRequests } from "../hooks/useAllRequests";
-import { resolvedModelName } from "../lib/resolvedModelName";
 import { Editor } from "./core/Editor/LazyEditor";
 import { type EventDetailAction, EventDetailHeader, EventViewer } from "./core/EventViewer";
 import { EventViewerRow } from "./core/EventViewerRow";
@@ -100,7 +95,6 @@ function EventDetails({
 }) {
   const { label } = getEventDisplay(event.event);
   const e = event.event;
-  const settingSourceModels = useSettingSourceModels();
 
   const actions: EventDetailAction[] = [
     {
@@ -217,9 +211,6 @@ function EventDetails({
         <KeyValueRows>
           <KeyValueRow label="Setting">{e.name}</KeyValueRow>
           <KeyValueRow label="Value">{e.value}</KeyValueRow>
-          {e.source_model != null ? (
-            <KeyValueRow label="Source">{formatSettingSource(e, settingSourceModels)}</KeyValueRow>
-          ) : null}
         </KeyValueRows>
       );
     }
@@ -324,44 +315,6 @@ function formatEventText(event: HttpResponseEventData, includePrefix: boolean):
   return includePrefix ? `${prefix} ${text}` : text;
 }
 
-function useSettingSourceModels() {
-  const requests = useAllRequests();
-  const folders = useAtomValue(foldersAtom);
-  const workspaces = useAtomValue(workspacesAtom);
-
-  return useMemo<AnyModel[]>(
-    () => [...requests, ...folders, ...workspaces],
-    [requests, folders, workspaces],
-  );
-}
-
-function formatSettingSource(
-  event: Extract<HttpResponseEventData, { type: "setting" }>,
-  models: AnyModel[],
-): string {
-  const sourceModel = event.source_model;
-  if (sourceModel == null || sourceModel === "default") {
-    return "Default";
-  }
-
-  const model =
-    event.source_id == null
-      ? null
-      : (models.find((m) => m.model === sourceModel && m.id === event.source_id) ?? null);
-  const name = model == null ? event.source_name : resolvedModelName(model);
-  const label = sourceModel.replaceAll("_", " ");
-  return name == null || name.length === 0 ? label : `${name} (${label})`;
-}
-
-function formatSettingSourceModel(event: Extract<HttpResponseEventData, { type: "setting" }>) {
-  const sourceModel = event.source_model;
-  if (sourceModel == null || sourceModel === "default" || sourceModel === "workspace") {
-    return null;
-  }
-
-  return sourceModel;
-}
-
 type EventDisplay = {
   icon: IconProps["icon"];
   color: IconProps["color"];
@@ -372,12 +325,11 @@ type EventDisplay = {
 function getEventDisplay(event: HttpResponseEventData): EventDisplay {
   switch (event.type) {
     case "setting":
-      const sourceModel = formatSettingSourceModel(event);
       return {
         icon: "settings",
         color: "secondary",
         label: "Setting",
-        summary: `${event.name} = ${event.value}${sourceModel == null ? "" : ` (${sourceModel})`}`,
+        summary: `${event.name} = ${event.value}`,
       };
     case "info":
       return {

apps/yaak-client/components/ModelSettingsEditor.tsx

@@ -1,347 +0,0 @@
-import type {
-  Folder,
-  GrpcRequest,
-  HttpRequest,
-  InheritedBoolSetting,
-  InheritedIntSetting,
-  WebsocketRequest,
-  Workspace,
-} from "@yaakapp-internal/models";
-import { patchModel } from "@yaakapp-internal/models";
-import { useModelAncestors } from "../hooks/useModelAncestors";
-import {
-  modelSupportsSetting,
-  type RequestSettingDefinition,
-  SETTING_FOLLOW_REDIRECTS,
-  SETTING_REQUEST_TIMEOUT,
-  SETTING_SEND_COOKIES,
-  SETTING_STORE_COOKIES,
-  SETTING_VALIDATE_CERTIFICATES,
-} from "../lib/requestSettings";
-import { Checkbox } from "./core/Checkbox";
-import { PlainInput } from "./core/PlainInput";
-import {
-  SettingOverrideRow,
-  SettingRowBoolean,
-  SettingRowNumber,
-  SettingsList,
-  SettingsSection,
-} from "./core/SettingRow";
-
-interface Props {
-  showSectionTitles?: boolean;
-  model: ModelWithSettings;
-}
-
-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 BooleanSetting = boolean | InheritedBoolSetting;
-type IntegerSetting = number | InheritedIntSetting;
-type CookieSettingsPatch = {
-  settingSendCookies?: ModelWithCookieSettings["settingSendCookies"];
-  settingStoreCookies?: ModelWithCookieSettings["settingStoreCookies"];
-};
-type HttpSettingsPatch = {
-  settingFollowRedirects?: ModelWithHttpSettings["settingFollowRedirects"];
-  settingRequestTimeout?: ModelWithHttpSettings["settingRequestTimeout"];
-};
-type TlsSettingsPatch = {
-  settingValidateCertificates?: ModelWithTlsSettings["settingValidateCertificates"];
-};
-
-export function ModelSettingsEditor({ model, showSectionTitles = false }: Props) {
-  const ancestors = useModelAncestors(model);
-  const supportsHttpSettings = modelSupportsHttpSettings(model);
-  const supportsCookieSettings = modelSupportsCookieSettings(model);
-  const supportsTlsSettings = modelSupportsTlsSettings(model);
-
-  return (
-    <SettingsList className="space-y-8">
-      {supportsTlsSettings && (
-        <SettingsSection title={showSectionTitles ? "Requests" : null}>
-          {supportsHttpSettings && (
-            <IntegerSettingRow
-              settingDefinition={SETTING_REQUEST_TIMEOUT}
-              setting={model.settingRequestTimeout}
-              inheritedValue={resolveInheritedValue(
-                ancestors,
-                SETTING_REQUEST_TIMEOUT.modelKey,
-                model.settingRequestTimeout,
-              )}
-              onChange={(settingRequestTimeout) =>
-                patchHttpSettings(model, {
-                  settingRequestTimeout,
-                })
-              }
-            />
-          )}
-          <BooleanSettingRow
-            settingDefinition={SETTING_VALIDATE_CERTIFICATES}
-            setting={model.settingValidateCertificates}
-            inheritedValue={resolveInheritedValue(
-              ancestors,
-              SETTING_VALIDATE_CERTIFICATES.modelKey,
-              model.settingValidateCertificates,
-            )}
-            onChange={(settingValidateCertificates) =>
-              patchTlsSettings(model, {
-                settingValidateCertificates,
-              })
-            }
-          />
-          {supportsHttpSettings && (
-            <BooleanSettingRow
-              settingDefinition={SETTING_FOLLOW_REDIRECTS}
-              setting={model.settingFollowRedirects}
-              inheritedValue={resolveInheritedValue(
-                ancestors,
-                SETTING_FOLLOW_REDIRECTS.modelKey,
-                model.settingFollowRedirects,
-              )}
-              onChange={(settingFollowRedirects) =>
-                patchHttpSettings(model, {
-                  settingFollowRedirects,
-                })
-              }
-            />
-          )}
-        </SettingsSection>
-      )}
-      {supportsCookieSettings && (
-        <SettingsSection title={supportsTlsSettings || showSectionTitles ? "Cookies" : null}>
-          <BooleanSettingRow
-            settingDefinition={SETTING_SEND_COOKIES}
-            setting={model.settingSendCookies}
-            inheritedValue={resolveInheritedValue(
-              ancestors,
-              SETTING_SEND_COOKIES.modelKey,
-              model.settingSendCookies,
-            )}
-            onChange={(settingSendCookies) =>
-              patchCookieSettings(model, {
-                settingSendCookies,
-              })
-            }
-          />
-          <BooleanSettingRow
-            settingDefinition={SETTING_STORE_COOKIES}
-            setting={model.settingStoreCookies}
-            inheritedValue={resolveInheritedValue(
-              ancestors,
-              SETTING_STORE_COOKIES.modelKey,
-              model.settingStoreCookies,
-            )}
-            onChange={(settingStoreCookies) =>
-              patchCookieSettings(model, {
-                settingStoreCookies,
-              })
-            }
-          />
-        </SettingsSection>
-      )}
-    </SettingsList>
-  );
-}
-
-export function countOverriddenSettings(model: ModelWithSettings) {
-  const settings: (BooleanSetting | IntegerSetting)[] = [];
-
-  if (modelSupportsCookieSettings(model)) {
-    settings.push(model.settingSendCookies, model.settingStoreCookies);
-  }
-
-  settings.push(model.settingValidateCertificates);
-
-  if (modelSupportsHttpSettings(model)) {
-    settings.push(model.settingFollowRedirects, model.settingRequestTimeout);
-  }
-
-  return settings.filter((setting) => isInheritedSetting(setting) && setting.enabled === true)
-    .length;
-}
-
-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>) {
-  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>) {
-  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 modelSupportsHttpSettings(model: ModelWithSettings): model is ModelWithHttpSettings {
-  return modelSupportsSetting(model, SETTING_REQUEST_TIMEOUT);
-}
-
-function modelSupportsCookieSettings(model: ModelWithSettings): model is ModelWithCookieSettings {
-  return modelSupportsSetting(model, SETTING_SEND_COOKIES);
-}
-
-function modelSupportsTlsSettings(model: ModelWithSettings): model is ModelWithTlsSettings {
-  return modelSupportsSetting(model, SETTING_VALIDATE_CERTIFICATES);
-}
-
-function BooleanSettingRow({
-  inheritedValue,
-  setting,
-  settingDefinition,
-  onChange,
-}: {
-  inheritedValue: boolean;
-  setting: BooleanSetting;
-  settingDefinition: RequestSettingDefinition;
-  onChange: (setting: BooleanSetting) => void;
-}) {
-  const inherited = isInheritedSetting(setting);
-  const overridden = inherited ? setting.enabled === true : false;
-  const value = inherited ? (overridden ? setting.value : inheritedValue) : setting;
-
-  if (!inherited) {
-    return (
-      <SettingRowBoolean
-        checked={value}
-        title={settingDefinition.title}
-        description={settingDefinition.description}
-        onChange={(value) => onChange(value)}
-      />
-    );
-  }
-
-  return (
-    <SettingOverrideRow
-      title={settingDefinition.title}
-      description={settingDefinition.description}
-      overridden={overridden}
-      onResetOverride={() => onChange({ ...setting, enabled: false })}
-    >
-      <Checkbox
-        hideLabel
-        size="md"
-        title={settingDefinition.title}
-        checked={value}
-        onChange={(value) => onChange({ ...setting, enabled: true, value })}
-      />
-    </SettingOverrideRow>
-  );
-}
-
-function IntegerSettingRow({
-  inheritedValue,
-  setting,
-  settingDefinition,
-  onChange,
-}: {
-  inheritedValue: number;
-  setting: IntegerSetting;
-  settingDefinition: RequestSettingDefinition<"settingRequestTimeout">;
-  onChange: (setting: IntegerSetting) => void;
-}) {
-  const inherited = isInheritedSetting(setting);
-  const overridden = inherited ? setting.enabled === true : false;
-  const value = inherited ? (overridden ? setting.value : inheritedValue) : setting;
-
-  if (!inherited) {
-    return (
-      <SettingRowNumber
-        name={settingDefinition.modelKey}
-        title={settingDefinition.title}
-        description={settingDefinition.description}
-        value={value}
-        placeholder={`${settingDefinition.defaultValue}`}
-        validate={(value) => value === "" || Number.parseInt(value, 10) >= 0}
-        onChange={(value) => onChange(value)}
-      />
-    );
-  }
-
-  return (
-    <SettingOverrideRow
-      title={settingDefinition.title}
-      description={settingDefinition.description}
-      overridden={overridden}
-      onResetOverride={() => onChange({ ...setting, enabled: false })}
-    >
-      <PlainInput
-        hideLabel
-        name={settingDefinition.modelKey}
-        label={settingDefinition.title}
-        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: Number.parseInt(value, 10) || 0,
-          })
-        }
-      />
-    </SettingOverrideRow>
-  );
-}
-
-function isInheritedSetting<T>(
-  setting: T | { enabled?: boolean; value: T },
-): setting is { enabled?: boolean; value: T } {
-  return typeof setting === "object" && setting != null && "value" in setting;
-}
-
-function resolveInheritedValue(
-  ancestors: (Folder | Workspace)[],
-  key: "settingRequestTimeout",
-  fallback: IntegerSetting,
-): number;
-function resolveInheritedValue(
-  ancestors: (Folder | Workspace)[],
-  key: BooleanWorkspaceSettingKey,
-  fallback: BooleanSetting,
-): boolean;
-function resolveInheritedValue(
-  ancestors: (Folder | Workspace)[],
-  key: keyof WorkspaceSettings,
-  fallback: BooleanSetting | IntegerSetting,
-) {
-  for (const ancestor of ancestors) {
-    const setting = ancestor[key] as BooleanSetting | IntegerSetting;
-    if (isInheritedSetting(setting)) {
-      if (setting.enabled === true) {
-        return setting.value;
-      }
-      continue;
-    }
-    return setting;
-  }
-
-  return isInheritedSetting(fallback) ? fallback.value : fallback;
-}
-
-type WorkspaceSettings = Pick<
-  Workspace,
-  | "settingFollowRedirects"
-  | "settingRequestTimeout"
-  | "settingSendCookies"
-  | "settingStoreCookies"
-  | "settingValidateCertificates"
->;
-
-type BooleanWorkspaceSettingKey = Exclude<keyof WorkspaceSettings, "settingRequestTimeout">;

apps/yaak-client/components/SelectFile.tsx

@@ -19,7 +19,6 @@ type Props = Omit<ButtonProps, "type"> & {
   inline?: boolean;
   noun?: string;
   help?: ReactNode;
-  hideLabel?: boolean;
   label?: ReactNode;
 };
 
@@ -37,7 +36,6 @@ export function SelectFile({
   size = "sm",
   label,
   help,
-  hideLabel,
   ...props
 }: Props) {
   const handleClick = async () => {
@@ -97,7 +95,7 @@ export function SelectFile({
   return (
     <div ref={ref} className="w-full">
       {label && (
-        <Label htmlFor={null} help={help} visuallyHidden={hideLabel}>
+        <Label htmlFor={null} help={help}>
           {label}
         </Label>
       )}

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

@@ -5,27 +5,14 @@ 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 { Checkbox } from "../core/Checkbox";
 import { IconButton } from "../core/IconButton";
-import {
+import { KeyValueRow, KeyValueRows } from "../core/KeyValueRow";
-  ModelSettingRowBoolean,
+import { PlainInput } from "../core/PlainInput";
-  ModelSettingRowNumber,
+import { Select } from "../core/Select";
-  ModelSettingSelectControl,
+import { Separator } from "../core/Separator";
-  SettingValue,
-  SettingRow,
-  SettingRowBoolean,
-  SettingRowSelect,
-  SettingsList,
-  SettingsSection,
-} from "../core/SettingRow";
 
 export function SettingsGeneral() {
   const workspace = useAtomValue(activeWorkspaceAtom);
@@ -42,159 +29,147 @@ export function SettingsGeneral() {
         <Heading>General</Heading>
         <p className="text-text-subtle">Configure general settings for update behavior and more.</p>
       </div>
-      <SettingsList className="space-y-8">
+      <CargoFeature feature="updater">
-        <CargoFeature feature="updater">
+        <div className="grid grid-cols-[minmax(0,1fr)_auto] gap-1">
-          <SettingsSection title="Updates">
+          <Select
-            <SettingRow
+            name="updateChannel"
-              title="Update Channel"
+            label="Update Channel"
-              description="Choose whether Yaak should use stable releases or beta releases."
+            labelPosition="left"
-            >
+            labelClassName="w-[14rem]"
-              <div className="grid grid-cols-[12rem_auto] gap-1">
+            size="sm"
-                <ModelSettingSelectControl
+            value={settings.updateChannel}
-                  model={settings}
+            onChange={(updateChannel) => patchModel(settings, { updateChannel })}
-                  modelKey="updateChannel"
+            options={[
-                  label="Update Channel"
+              { label: "Stable", value: "stable" },
-                  selectClassName="!w-full"
+              { label: "Beta (more frequent)", value: "beta" },
-                  options={[
+            ]}
-                    { label: "Stable", value: "stable" },
+          />
-                    { label: "Beta", value: "beta" },
+          <IconButton
-                  ]}
+            variant="border"
-                />
+            size="sm"
-                <IconButton
+            title="Check for updates"
-                  variant="border"
+            icon="refresh"
-                  size="sm"
+            spin={checkForUpdates.isPending}
-                  title="Check for updates"
+            onClick={() => checkForUpdates.mutateAsync()}
-                  icon="refresh"
+          />
-                  spin={checkForUpdates.isPending}
+        </div>
-                  onClick={() => checkForUpdates.mutateAsync()}
-                />
-              </div>
-            </SettingRow>
 
-            <SettingRowSelect
+        <Select
-              title="Update Behavior"
+          name="autoupdate"
-              description="Choose whether updates are installed automatically or manually."
+          value={settings.autoupdate ? "auto" : "manual"}
-              name="autoupdate"
+          label="Update Behavior"
-              value={settings.autoupdate ? "auto" : "manual"}
+          labelPosition="left"
-              onChange={(v) => patchModel(settings, { autoupdate: v === "auto" })}
+          size="sm"
-              options={[
+          labelClassName="w-[14rem]"
-                { label: "Automatic", value: "auto" },
+          onChange={(v) => patchModel(settings, { autoupdate: v === "auto" })}
-                { label: "Manual", value: "manual" },
+          options={[
-              ]}
+            { label: "Automatic", value: "auto" },
+            { label: "Manual", value: "manual" },
+          ]}
+        />
+        <Checkbox
+          className="pl-2 mt-1 ml-[14rem]"
+          checked={settings.autoDownloadUpdates}
+          disabled={!settings.autoupdate}
+          help="Automatically download Yaak updates (!50MB) in the background, so they will be immediately ready to install."
+          title="Automatically download updates"
+          onChange={(autoDownloadUpdates) => patchModel(settings, { autoDownloadUpdates })}
+        />
+
+        <Checkbox
+          className="pl-2 mt-1 ml-[14rem]"
+          checked={settings.checkNotifications}
+          title="Check for notifications"
+          help="Periodically ping Yaak servers to check for relevant notifications."
+          onChange={(checkNotifications) => patchModel(settings, { checkNotifications })}
+        />
+        <Checkbox
+          disabled
+          className="pl-2 mt-1 ml-[14rem]"
+          checked={false}
+          title="Send anonymous usage statistics"
+          help="Yaak is local-first and does not collect analytics or usage data 🔐"
+          onChange={(checkNotifications) => patchModel(settings, { checkNotifications })}
+        />
+      </CargoFeature>
+
+      <Separator className="my-4" />
+
+      <Heading level={2}>
+        Workspace{" "}
+        <div className="inline-block ml-1 bg-surface-highlight px-2 py-0.5 rounded text text-shrink">
+          {workspace.name}
+        </div>
+      </Heading>
+      <VStack className="mt-1 w-full" space={3}>
+        <PlainInput
+          required
+          size="sm"
+          name="requestTimeout"
+          label="Request Timeout (ms)"
+          labelClassName="w-[14rem]"
+          placeholder="0"
+          labelPosition="left"
+          defaultValue={`${workspace.settingRequestTimeout}`}
+          validate={(value) => Number.parseInt(value, 10) >= 0}
+          onChange={(v) =>
+            patchModel(workspace, { settingRequestTimeout: Number.parseInt(v, 10) || 0 })
+          }
+          type="number"
+        />
+
+        <Checkbox
+          checked={workspace.settingValidateCertificates}
+          help="When disabled, skip validation of server certificates, useful when interacting with self-signed certs."
+          title="Validate TLS certificates"
+          onChange={(settingValidateCertificates) =>
+            patchModel(workspace, { settingValidateCertificates })
+          }
+        />
+
+        <Checkbox
+          checked={workspace.settingFollowRedirects}
+          title="Follow redirects"
+          onChange={(settingFollowRedirects) =>
+            patchModel(workspace, {
+              settingFollowRedirects,
+            })
+          }
+        />
+      </VStack>
+
+      <Separator className="my-4" />
+
+      <Heading level={2}>App Info</Heading>
+      <KeyValueRows>
+        <KeyValueRow label="Version">{appInfo.version}</KeyValueRow>
+        <KeyValueRow
+          label="Data Directory"
+          rightSlot={
+            <IconButton
+              title={revealInFinderText}
+              icon="folder_open"
+              size="2xs"
+              onClick={() => revealItemInDir(appInfo.appDataDir)}
             />
-
-            <ModelSettingRowBoolean
-              model={settings}
-              modelKey="autoDownloadUpdates"
-              title="Automatically download updates"
-              description="Download Yaak updates in the background so they are ready to install."
-              disabled={!settings.autoupdate}
-            />
-
-            <ModelSettingRowBoolean
-              model={settings}
-              modelKey="checkNotifications"
-              title="Check for notifications"
-              description="Periodically ping Yaak servers to check for relevant notifications."
-            />
-
-            <SettingRowBoolean
-              title="Send anonymous usage statistics"
-              description="Yaak is local-first and does not collect analytics or usage data."
-              disabled
-              checked={false}
-              onChange={() => {}}
-            />
-          </SettingsSection>
-        </CargoFeature>
-
-        <SettingsSection
-          title={
-            <>
-              Workspace{" "}
-              <span className="inline-block bg-surface-highlight px-2 py-0.5 rounded text">
-                {workspace.name}
-              </span>
-            </>
           }
         >
-          <ModelSettingRowNumber
+          {appInfo.appDataDir}
-            model={workspace}
+        </KeyValueRow>
-            modelKey={SETTING_REQUEST_TIMEOUT.modelKey}
+        <KeyValueRow
-            title={SETTING_REQUEST_TIMEOUT.title}
+          label="Logs Directory"
-            description={SETTING_REQUEST_TIMEOUT.description}
+          rightSlot={
-            placeholder={`${SETTING_REQUEST_TIMEOUT.defaultValue}`}
+            <IconButton
-            required
+              title={revealInFinderText}
-            validate={(value) => Number.parseInt(value, 10) >= 0}
+              icon="folder_open"
-          />
+              size="2xs"
-
+              onClick={() => revealItemInDir(appInfo.appLogDir)}
-          <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.">
-            <SettingValue value={appInfo.version} />
-          </SettingRow>
-          <SettingRow
-            title="Data Directory"
-            description="Where Yaak stores application data."
-            controlClassName="min-w-0 max-w-[min(42rem,55vw)] gap-2"
-          >
-            <SettingValue
-              value={appInfo.appDataDir}
-              actions={[
-                {
-                  title: revealInFinderText,
-                  icon: "folder_open",
-                  onClick: () => revealItemInDir(appInfo.appDataDir),
-                },
-              ]}
             />
-          </SettingRow>
+          }
-          <SettingRow
+        >
-            title="Logs Directory"
+          {appInfo.appLogDir}
-            description="Where Yaak writes application logs."
+        </KeyValueRow>
-            controlClassName="min-w-0 max-w-[min(42rem,55vw)] gap-2"
+      </KeyValueRows>
-          >
-            <SettingValue
-              value={appInfo.appLogDir}
-              actions={[
-                {
-                  title: revealInFinderText,
-                  icon: "folder_open",
-                  onClick: () => revealItemInDir(appInfo.appLogDir),
-                },
-              ]}
-            />
-          </SettingRow>
-        </SettingsSection>
-      </SettingsList>
     </VStack>
   );
 }

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

@@ -3,7 +3,7 @@ import { useFonts } from "@yaakapp-internal/fonts";
 import { useLicense } from "@yaakapp-internal/license";
 import type { EditorKeymap, Settings } from "@yaakapp-internal/models";
 import { patchModel, settingsAtom } from "@yaakapp-internal/models";
-import { clamp, Heading, VStack } from "@yaakapp-internal/ui";
+import { clamp, Heading, HStack, Icon, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
 import { useState } from "react";
 import { activeWorkspaceAtom } from "../../hooks/useActiveWorkspace";
@@ -13,16 +13,7 @@ import { CargoFeature } from "../CargoFeature";
 import { Button } from "../core/Button";
 import { Checkbox } from "../core/Checkbox";
 import { Link } from "../core/Link";
-import {
+import { Select } from "../core/Select";
-  ModelSettingRowBoolean,
-  ModelSettingRowSelect,
-  SettingRow,
-  SettingRowBoolean,
-  SettingRowSelect,
-  SettingSelectControl,
-  SettingsList,
-  SettingsSection,
-} from "../core/SettingRow";
 
 const NULL_FONT_VALUE = "__NULL_FONT__";
 
@@ -47,172 +38,154 @@ export function SettingsInterface() {
   }
 
   return (
-    <VStack space={1.5} className="mb-4">
+    <VStack space={3} className="mb-4">
       <div className="mb-3">
         <Heading>Interface</Heading>
         <p className="text-text-subtle">Tweak settings related to the user interface.</p>
       </div>
-      <SettingsList className="space-y-8">
+      <Select
-        <SettingsSection title="Workspaces">
+        name="switchWorkspaceBehavior"
-          <SettingRowSelect
+        label="Open workspace behavior"
-            title="Open workspace behavior"
+        size="sm"
-            description="Choose what happens when opening another workspace."
+        help="When opening a workspace, should it open in the current window or a new window?"
-            name="switchWorkspaceBehavior"
+        value={
-            value={
+          settings.openWorkspaceNewWindow === true
-              settings.openWorkspaceNewWindow === true
+            ? "new"
-                ? "new"
+            : settings.openWorkspaceNewWindow === false
-                : settings.openWorkspaceNewWindow === false
+              ? "current"
-                  ? "current"
+              : "ask"
-                  : "ask"
+        }
-            }
+        onChange={async (v) => {
-            onChange={async (v) => {
+          if (v === "current") await patchModel(settings, { openWorkspaceNewWindow: false });
-              if (v === "current") await patchModel(settings, { openWorkspaceNewWindow: false });
+          else if (v === "new") await patchModel(settings, { openWorkspaceNewWindow: true });
-              else if (v === "new") await patchModel(settings, { openWorkspaceNewWindow: true });
+          else await patchModel(settings, { openWorkspaceNewWindow: null });
-              else await patchModel(settings, { openWorkspaceNewWindow: null });
+        }}
-            }}
+        options={[
+          { label: "Always ask", value: "ask" },
+          { label: "Open in current window", value: "current" },
+          { label: "Open in new window", value: "new" },
+        ]}
+      />
+      <HStack space={2} alignItems="end">
+        {fonts.data && (
+          <Select
+            size="sm"
+            name="uiFont"
+            label="Interface font"
+            value={settings.interfaceFont ?? NULL_FONT_VALUE}
             options={[
-              { label: "Always ask", value: "ask" },
+              { label: "System default", value: NULL_FONT_VALUE },
-              { label: "Open in current window", value: "current" },
+              ...(fonts.data.uiFonts.map((f) => ({
-              { label: "Open in new window", value: "new" },
+                label: f,
+                value: f,
+              })) ?? []),
+              // Some people like monospace fonts for the UI
+              ...(fonts.data.editorFonts.map((f) => ({
+                label: f,
+                value: f,
+              })) ?? []),
             ]}
+            onChange={async (v) => {
+              const interfaceFont = v === NULL_FONT_VALUE ? null : v;
+              await patchModel(settings, { interfaceFont });
+            }}
           />
-        </SettingsSection>
+        )}
-
+        <Select
-        <SettingsSection title="Fonts">
+          hideLabel
-          <SettingRow
+          size="sm"
-            title="Interface font"
+          name="interfaceFontSize"
-            description="Font used for Yaak interface controls."
+          label="Interface Font Size"
-            controlClassName="gap-1"
+          defaultValue="14"
-          >
+          value={`${settings.interfaceFontSize}`}
-            {fonts.data && (
+          options={fontSizeOptions}
-              <SettingSelectControl
+          onChange={(v) => patchModel(settings, { interfaceFontSize: Number.parseInt(v, 10) })}
-                name="uiFont"
+        />
-                label="Interface font"
+      </HStack>
-                selectClassName="!w-72"
+      <HStack space={2} alignItems="end">
-                value={settings.interfaceFont ?? NULL_FONT_VALUE}
+        {fonts.data && (
-                defaultValue={NULL_FONT_VALUE}
+          <Select
-                options={[
+            size="sm"
-                  { label: "System default", value: NULL_FONT_VALUE },
+            name="editorFont"
-                  ...fonts.data.uiFonts.map((f) => ({ label: f, value: f })),
+            label="Editor font"
-                  ...fonts.data.editorFonts.map((f) => ({ label: f, value: f })),
+            value={settings.editorFont ?? NULL_FONT_VALUE}
-                ]}
+            options={[
-                onChange={async (v) => {
+              { label: "System default", value: NULL_FONT_VALUE },
-                  const interfaceFont = v === NULL_FONT_VALUE ? null : v;
+              ...(fonts.data.editorFonts.map((f) => ({
-                  await patchModel(settings, { interfaceFont });
+                label: f,
-                }}
+                value: f,
-              />
+              })) ?? []),
-            )}
+            ]}
-            <SettingSelectControl
+            onChange={async (v) => {
-              name="interfaceFontSize"
+              const editorFont = v === NULL_FONT_VALUE ? null : v;
-              label="Interface Font Size"
+              await patchModel(settings, { editorFont });
-              selectClassName="!w-20"
+            }}
-              value={`${settings.interfaceFontSize}`}
-              defaultValue="14"
-              options={fontSizeOptions}
-              onChange={(v) => patchModel(settings, { interfaceFontSize: Number.parseInt(v, 10) })}
-            />
-          </SettingRow>
-
-          <SettingRow
-            title="Editor font"
-            description="Font used in request and response editors."
-            controlClassName="gap-1"
-          >
-            {fonts.data && (
-              <SettingSelectControl
-                name="editorFont"
-                label="Editor font"
-                selectClassName="!w-72"
-                value={settings.editorFont ?? NULL_FONT_VALUE}
-                defaultValue={NULL_FONT_VALUE}
-                options={[
-                  { label: "System default", value: NULL_FONT_VALUE },
-                  ...fonts.data.editorFonts.map((f) => ({ label: f, value: f })),
-                ]}
-                onChange={async (v) => {
-                  const editorFont = v === NULL_FONT_VALUE ? null : v;
-                  await patchModel(settings, { editorFont });
-                }}
-              />
-            )}
-            <SettingSelectControl
-              name="editorFontSize"
-              label="Editor Font Size"
-              selectClassName="!w-20"
-              value={`${settings.editorFontSize}`}
-              defaultValue="12"
-              options={fontSizeOptions}
-              onChange={(v) =>
-                patchModel(settings, {
-                  editorFontSize: clamp(Number.parseInt(v, 10) || 14, 8, 30),
-                })
-              }
-            />
-          </SettingRow>
-        </SettingsSection>
-
-        <SettingsSection title="Editor">
-          <ModelSettingRowSelect
-            model={settings}
-            modelKey="editorKeymap"
-            title="Editor keymap"
-            description="Keyboard shortcut preset used by text editors."
-            options={keymaps}
           />
-          <ModelSettingRowBoolean
+        )}
-            model={settings}
+        <Select
-            modelKey="editorSoftWrap"
+          hideLabel
-            title="Wrap editor lines"
+          size="sm"
-            description="Wrap long lines in request and response editors."
+          name="editorFontSize"
-          />
+          label="Editor Font Size"
-          <ModelSettingRowBoolean
+          defaultValue="12"
-            model={settings}
+          value={`${settings.editorFontSize}`}
-            modelKey="coloredMethods"
+          options={fontSizeOptions}
-            title="Colorize request methods"
+          onChange={(v) =>
-            description="Use method-specific colors for HTTP request methods."
+            patchModel(settings, { editorFontSize: clamp(Number.parseInt(v, 10) || 14, 8, 30) })
-          />
+          }
-        </SettingsSection>
+        />
+      </HStack>
+      <Select
+        leftSlot={<Icon icon="keyboard" color="secondary" />}
+        size="sm"
+        name="editorKeymap"
+        label="Editor keymap"
+        value={`${settings.editorKeymap}`}
+        options={keymaps}
+        onChange={(v) => patchModel(settings, { editorKeymap: v })}
+      />
+      <Checkbox
+        checked={settings.editorSoftWrap}
+        title="Wrap editor lines"
+        onChange={(editorSoftWrap) => patchModel(settings, { editorSoftWrap })}
+      />
+      <Checkbox
+        checked={settings.coloredMethods}
+        title="Colorize request methods"
+        onChange={(coloredMethods) => patchModel(settings, { coloredMethods })}
+      />
+      <CargoFeature feature="license">
+        <LicenseSettings settings={settings} />
+      </CargoFeature>
 
-        <SettingsSection title="Window">
+      <NativeTitlebarSetting settings={settings} />
-          <NativeTitlebarSetting settings={settings} />
-          {type() !== "macos" && (
-            <ModelSettingRowBoolean
-              model={settings}
-              modelKey="hideWindowControls"
-              title="Hide window controls"
-              description="Hide the close, maximize, and minimize controls on Windows or Linux."
-            />
-          )}
-        </SettingsSection>
 
-        <CargoFeature feature="license">
+      {type() !== "macos" && (
-          <LicenseSettings settings={settings} />
+        <Checkbox
-        </CargoFeature>
+          checked={settings.hideWindowControls}
-      </SettingsList>
+          title="Hide window controls"
+          help="Hide the close/maximize/minimize controls on Windows or Linux"
+          onChange={(hideWindowControls) => patchModel(settings, { hideWindowControls })}
+        />
+      )}
     </VStack>
   );
 }
 
 function NativeTitlebarSetting({ settings }: { settings: Settings }) {
   const [nativeTitlebar, setNativeTitlebar] = useState(settings.useNativeTitlebar);
-
   return (
-    <SettingRow
+    <div className="flex gap-1 overflow-hidden h-2xs">
-      title="Native title bar"
-      description="Use the operating system's standard title bar and window controls."
-      controlClassName="gap-2"
-    >
       <Checkbox
-        hideLabel
-        size="md"
         checked={nativeTitlebar}
         title="Native title bar"
+        help="Use the operating system's standard title bar and window controls"
         onChange={setNativeTitlebar}
       />
       {settings.useNativeTitlebar !== nativeTitlebar && (
         <Button
           color="primary"
-          size="xs"
+          size="2xs"
           onClick={async () => {
             await patchModel(settings, { useNativeTitlebar: nativeTitlebar });
             await invokeCmd("cmd_restart");
@@ -221,7 +194,7 @@ function NativeTitlebarSetting({ settings }: { settings: Settings }) {
           Apply and Restart
         </Button>
       )}
-    </SettingRow>
+    </div>
   );
 }
 
@@ -232,40 +205,37 @@ function LicenseSettings({ settings }: { settings: Settings }) {
   }
 
   return (
-    <SettingsSection title="License">
+    <Checkbox
-      <SettingRowBoolean
+      checked={settings.hideLicenseBadge}
-        checked={settings.hideLicenseBadge}
+      title="Hide personal use badge"
-        title="Hide personal use badge"
+      onChange={async (hideLicenseBadge) => {
-        description="Hide the personal-use badge from the interface."
+        if (hideLicenseBadge) {
-        onChange={async (hideLicenseBadge) => {
+          const confirmed = await showConfirm({
-          if (hideLicenseBadge) {
+            id: "hide-license-badge",
-            const confirmed = await showConfirm({
+            title: "Confirm Personal Use",
-              id: "hide-license-badge",
+            confirmText: "Confirm",
-              title: "Confirm Personal Use",
+            description: (
-              confirmText: "Confirm",
+              <VStack space={3}>
-              description: (
+                <p>Hey there 👋🏼</p>
-                <VStack space={3}>
+                <p>
-                  <p>Hey there 👋🏼</p>
+                  Yaak is free for personal projects and learning.{" "}
-                  <p>
+                  <strong>If you’re using Yaak at work, a license is required.</strong>
-                    Yaak is free for personal projects and learning.{" "}
+                </p>
-                    <strong>If you’re using Yaak at work, a license is required.</strong>
+                <p>
-                  </p>
+                  Licenses help keep Yaak independent and sustainable.{" "}
-                  <p>
+                  <Link href="https://yaak.app/pricing?s=badge">Purchase a License →</Link>
-                    Licenses help keep Yaak independent and sustainable.{" "}
+                </p>
-                    <Link href="https://yaak.app/pricing?s=badge">Purchase a License →</Link>
+              </VStack>
-                  </p>
+            ),
-                </VStack>
+            requireTyping: "Personal Use",
-              ),
+            color: "info",
-              requireTyping: "Personal Use",
+          });
-              color: "info",
+          if (!confirmed) {
-            });
+            return; // Cancel
-            if (!confirmed) {
-              return;
-            }
           }
-          await patchModel(settings, { hideLicenseBadge });
+        }
-        }}
+        await patchModel(settings, { hideLicenseBadge });
-      />
+      }}
-    </SettingsSection>
+    />
   );
 }

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

@@ -1,28 +1,13 @@
 import { patchModel, settingsAtom } from "@yaakapp-internal/models";
-import type { ProxySetting } from "@yaakapp-internal/models";
+import { Heading, HStack, InlineCode, VStack } from "@yaakapp-internal/ui";
-import { Heading, InlineCode, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
-import {
+import { Checkbox } from "../core/Checkbox";
-  SettingRowBoolean,
+import { PlainInput } from "../core/PlainInput";
-  SettingRowSelect,
+import { Select } from "../core/Select";
-  SettingRowText,
+import { Separator } from "../core/Separator";
-  SettingsList,
-  SettingsSection,
-} from "../core/SettingRow";
 
 export function SettingsProxy() {
   const settings = useAtomValue(settingsAtom);
-  const proxy = enabledProxyOrDefault(settings.proxy);
-
-  const patchProxy = async (patch: Partial<EnabledProxySetting>) => {
-    await patchModel(settings, {
-      proxy: {
-        ...proxy,
-        ...patch,
-        auth: Object.hasOwn(patch, "auth") ? (patch.auth ?? null) : proxy.auth,
-      },
-    });
-  };
 
   return (
     <VStack space={1.5} className="mb-4">
@@ -33,146 +18,188 @@ export function SettingsProxy() {
           traffic, or routing through specific infrastructure.
         </p>
       </div>
-      <SettingsList className="space-y-8">
+      <Select
-        <SettingsSection title="Proxy">
+        name="proxy"
-          <SettingRowSelect
+        label="Proxy"
-            title="Proxy"
+        hideLabel
-            description="Choose how Yaak should discover or use proxy settings."
+        size="sm"
-            name="proxy"
+        value={settings.proxy?.type ?? "automatic"}
-            value={settings.proxy?.type ?? "automatic"}
+        onChange={async (v) => {
-            onChange={async (v) => {
+          if (v === "automatic") {
-              if (v === "automatic") {
+            await patchModel(settings, { proxy: undefined });
-                await patchModel(settings, { proxy: undefined });
+          } else if (v === "enabled") {
-              } else if (v === "enabled") {
+            await patchModel(settings, {
-                await patchModel(settings, { proxy });
+              proxy: {
-              } else {
+                disabled: false,
-                await patchModel(settings, { proxy: { type: "disabled" } });
+                type: "enabled",
-              }
+                http: "",
+                https: "",
+                auth: { user: "", password: "" },
+                bypass: "",
+              },
+            });
+          } else {
+            await patchModel(settings, { proxy: { type: "disabled" } });
+          }
+        }}
+        options={[
+          { label: "Automatic proxy detection", value: "automatic" },
+          { label: "Custom proxy configuration", value: "enabled" },
+          { label: "No proxy", value: "disabled" },
+        ]}
+      />
+      {settings.proxy?.type === "enabled" && (
+        <VStack space={1.5}>
+          <Checkbox
+            className="my-3"
+            checked={!settings.proxy.disabled}
+            title="Enable proxy"
+            help="Use this to temporarily disable the proxy without losing the configuration"
+            onChange={async (enabled) => {
+              const { proxy } = settings;
+              const http = proxy?.type === "enabled" ? proxy.http : "";
+              const https = proxy?.type === "enabled" ? proxy.https : "";
+              const bypass = proxy?.type === "enabled" ? proxy.bypass : "";
+              const auth = proxy?.type === "enabled" ? proxy.auth : null;
+              const disabled = !enabled;
+              await patchModel(settings, {
+                proxy: { type: "enabled", http, https, auth, disabled, bypass },
+              });
             }}
-            options={[
-              { label: "Automatic proxy detection", value: "automatic" },
-              { label: "Custom proxy configuration", value: "enabled" },
-              { label: "No proxy", value: "disabled" },
-            ]}
-            selectClassName="!w-64"
           />
-        </SettingsSection>
+          <HStack space={1.5}>
-
+            <PlainInput
-        {settings.proxy?.type === "enabled" && (
+              size="sm"
-          <>
+              label={
-            <SettingsSection title="Custom Proxy">
-              <SettingRowBoolean
-                checked={!settings.proxy.disabled}
-                title="Enable proxy"
-                description="Temporarily disable the proxy without losing the configuration."
-                onChange={(enabled) => patchProxy({ disabled: !enabled })}
-              />
-              <SettingRowText
-                name="proxyHttp"
-                title={
-                  <>
-                    Proxy for <InlineCode>http://</InlineCode> traffic
-                  </>
-                }
-                description="Proxy host used for unencrypted HTTP traffic."
-                value={settings.proxy.http}
-                placeholder="localhost:9090"
-                onChange={(http) => patchProxy({ http })}
-              />
-              <SettingRowText
-                name="proxyHttps"
-                title={
-                  <>
-                    Proxy for <InlineCode>https://</InlineCode> traffic
-                  </>
-                }
-                description="Proxy host used for HTTPS traffic."
-                value={settings.proxy.https}
-                placeholder="localhost:9090"
-                onChange={(https) => patchProxy({ https })}
-              />
-              <SettingRowText
-                name="proxyBypass"
-                title="Proxy Bypass"
-                description="Comma-separated list of hosts that should bypass the proxy."
-                value={settings.proxy.bypass}
-                placeholder="127.0.0.1, *.example.com, localhost:3000"
-                inputWidthClassName="!w-96"
-                onChange={(bypass) => patchProxy({ bypass })}
-              />
-            </SettingsSection>
-
-            <SettingsSection title="Authentication">
-              <SettingRowBoolean
-                checked={settings.proxy.auth != null}
-                title="Enable authentication"
-                description="Send proxy credentials with proxied requests."
-                onChange={(enabled) =>
-                  patchProxy({ auth: enabled ? { user: "", password: "" } : null })
-                }
-              />
-
-              {settings.proxy.auth != null && (
                 <>
-                  <SettingRowText
+                  Proxy for <InlineCode>http://</InlineCode> traffic
-                    required
-                    name="proxyUser"
-                    title="User"
-                    description="Username for proxy authentication."
-                    value={settings.proxy.auth.user}
-                    placeholder="myUser"
-                    onChange={(user) =>
-                      patchProxy({
-                        auth: {
-                          user,
-                          password:
-                            settings.proxy?.type === "enabled"
-                              ? (settings.proxy.auth?.password ?? "")
-                              : "",
-                        },
-                      })
-                    }
-                  />
-                  <SettingRowText
-                    name="proxyPassword"
-                    title="Password"
-                    description="Password for proxy authentication."
-                    value={settings.proxy.auth.password}
-                    placeholder="s3cretPassw0rd"
-                    type="password"
-                    onChange={(password) =>
-                      patchProxy({
-                        auth: {
-                          user:
-                            settings.proxy?.type === "enabled"
-                              ? (settings.proxy.auth?.user ?? "")
-                              : "",
-                          password,
-                        },
-                      })
-                    }
-                  />
                 </>
-              )}
+              }
-            </SettingsSection>
+              placeholder="localhost:9090"
-          </>
+              defaultValue={settings.proxy?.http}
-        )}
+              onChange={async (http) => {
-      </SettingsList>
+                const { proxy } = settings;
+                const https = proxy?.type === "enabled" ? proxy.https : "";
+                const bypass = proxy?.type === "enabled" ? proxy.bypass : "";
+                const auth = proxy?.type === "enabled" ? proxy.auth : null;
+                const disabled = proxy?.type === "enabled" ? proxy.disabled : false;
+                await patchModel(settings, {
+                  proxy: {
+                    type: "enabled",
+                    http,
+                    https,
+                    auth,
+                    disabled,
+                    bypass,
+                  },
+                });
+              }}
+            />
+            <PlainInput
+              size="sm"
+              label={
+                <>
+                  Proxy for <InlineCode>https://</InlineCode> traffic
+                </>
+              }
+              placeholder="localhost:9090"
+              defaultValue={settings.proxy?.https}
+              onChange={async (https) => {
+                const { proxy } = settings;
+                const http = proxy?.type === "enabled" ? proxy.http : "";
+                const bypass = proxy?.type === "enabled" ? proxy.bypass : "";
+                const auth = proxy?.type === "enabled" ? proxy.auth : null;
+                const disabled = proxy?.type === "enabled" ? proxy.disabled : false;
+                await patchModel(settings, {
+                  proxy: { type: "enabled", http, https, auth, disabled, bypass },
+                });
+              }}
+            />
+          </HStack>
+          <Separator className="my-6" />
+          <Checkbox
+            checked={settings.proxy.auth != null}
+            title="Enable authentication"
+            onChange={async (enabled) => {
+              const { proxy } = settings;
+              const http = proxy?.type === "enabled" ? proxy.http : "";
+              const https = proxy?.type === "enabled" ? proxy.https : "";
+              const disabled = proxy?.type === "enabled" ? proxy.disabled : false;
+              const bypass = proxy?.type === "enabled" ? proxy.bypass : "";
+              const auth = enabled ? { user: "", password: "" } : null;
+              await patchModel(settings, {
+                proxy: { type: "enabled", http, https, auth, disabled, bypass },
+              });
+            }}
+          />
+
+          {settings.proxy.auth != null && (
+            <HStack space={1.5}>
+              <PlainInput
+                required
+                size="sm"
+                label="User"
+                placeholder="myUser"
+                defaultValue={settings.proxy.auth.user}
+                onChange={async (user) => {
+                  const { proxy } = settings;
+                  const http = proxy?.type === "enabled" ? proxy.http : "";
+                  const https = proxy?.type === "enabled" ? proxy.https : "";
+                  const disabled = proxy?.type === "enabled" ? proxy.disabled : false;
+                  const bypass = proxy?.type === "enabled" ? proxy.bypass : "";
+                  const password = proxy?.type === "enabled" ? (proxy.auth?.password ?? "") : "";
+                  const auth = { user, password };
+                  await patchModel(settings, {
+                    proxy: { type: "enabled", http, https, auth, disabled, bypass },
+                  });
+                }}
+              />
+              <PlainInput
+                size="sm"
+                label="Password"
+                type="password"
+                placeholder="s3cretPassw0rd"
+                defaultValue={settings.proxy.auth.password}
+                onChange={async (password) => {
+                  const { proxy } = settings;
+                  const http = proxy?.type === "enabled" ? proxy.http : "";
+                  const https = proxy?.type === "enabled" ? proxy.https : "";
+                  const disabled = proxy?.type === "enabled" ? proxy.disabled : false;
+                  const bypass = proxy?.type === "enabled" ? proxy.bypass : "";
+                  const user = proxy?.type === "enabled" ? (proxy.auth?.user ?? "") : "";
+                  const auth = { user, password };
+                  await patchModel(settings, {
+                    proxy: { type: "enabled", http, https, auth, disabled, bypass },
+                  });
+                }}
+              />
+            </HStack>
+          )}
+          {settings.proxy.type === "enabled" && (
+            <>
+              <Separator className="my-6" />
+              <PlainInput
+                label="Proxy Bypass"
+                help="Comma-separated list to bypass the proxy."
+                defaultValue={settings.proxy.bypass}
+                placeholder="127.0.0.1, *.example.com, localhost:3000"
+                onChange={async (bypass) => {
+                  const { proxy } = settings;
+                  const http = proxy?.type === "enabled" ? proxy.http : "";
+                  const https = proxy?.type === "enabled" ? proxy.https : "";
+                  const disabled = proxy?.type === "enabled" ? proxy.disabled : false;
+                  const user = proxy?.type === "enabled" ? (proxy.auth?.user ?? "") : "";
+                  const password = proxy?.type === "enabled" ? (proxy.auth?.password ?? "") : "";
+                  const auth = { user, password };
+                  await patchModel(settings, {
+                    proxy: { type: "enabled", http, https, auth, disabled, bypass },
+                  });
+                }}
+              />
+            </>
+          )}
+        </VStack>
+      )}
     </VStack>
   );
 }
-
-type EnabledProxySetting = Extract<ProxySetting, { type: "enabled" }>;
-
-function enabledProxyOrDefault(proxy: ProxySetting | null): EnabledProxySetting {
-  if (proxy?.type === "enabled") return proxy;
-
-  return {
-    disabled: false,
-    type: "enabled",
-    http: "",
-    https: "",
-    auth: { user: "", password: "" },
-    bypass: "",
-  };
-}

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

@@ -9,12 +9,7 @@ import type { ButtonProps } from "../core/Button";
 import { IconButton } from "../core/IconButton";
 import { Link } from "../core/Link";
 import type { SelectProps } from "../core/Select";
-import {
+import { Select } from "../core/Select";
-  ModelSettingRowSelect,
-  SettingRowSelect,
-  SettingsList,
-  SettingsSection,
-} from "../core/SettingRow";
 
 const Editor = lazy(() => import("../core/Editor/Editor").then((m) => ({ default: m.Editor })));
 
@@ -72,7 +67,7 @@ export function SettingsTheme() {
     }));
 
   return (
-    <VStack space={1.5} className="mb-4">
+    <VStack space={3} className="mb-4">
       <div className="mb-3">
         <Heading>Theme</Heading>
         <p className="text-text-subtle">
@@ -82,92 +77,96 @@ export function SettingsTheme() {
           </Link>
         </p>
       </div>
-      <SettingsList className="space-y-8">
+      <Select
-        <SettingsSection title="Theme">
+        name="appearance"
-          <ModelSettingRowSelect
+        label="Appearance"
-            model={settings}
+        labelPosition="top"
-            modelKey="appearance"
+        size="sm"
-            title="Appearance"
+        value={settings.appearance}
-            description="Choose whether Yaak follows your system appearance or uses a fixed mode."
+        onChange={(appearance) => patchModel(settings, { appearance })}
-            options={[
+        options={[
-              { label: "Automatic", value: "system" },
+          { label: "Automatic", value: "system" },
-              { label: "Light", value: "light" },
+          { label: "Light", value: "light" },
-              { label: "Dark", value: "dark" },
+          { label: "Dark", value: "dark" },
-            ]}
+        ]}
+      />
+      <HStack space={2}>
+        {(settings.appearance === "system" || settings.appearance === "light") && (
+          <Select
+            hideLabel
+            leftSlot={<Icon icon="sun" color="secondary" />}
+            name="lightTheme"
+            label="Light Theme"
+            size="sm"
+            className="flex-1"
+            value={activeTheme.data.light.id}
+            options={lightThemes}
+            onChange={(themeLight) => patchModel(settings, { themeLight })}
           />
-          {(settings.appearance === "system" || settings.appearance === "light") && (
+        )}
-            <SettingRowSelect
+        {(settings.appearance === "system" || settings.appearance === "dark") && (
-              name="lightTheme"
+          <Select
-              title="Light theme"
+            hideLabel
-              description="Theme used when Yaak is in light mode."
+            name="darkTheme"
-              value={activeTheme.data.light.id}
+            className="flex-1"
-              options={lightThemes}
+            label="Dark Theme"
-              onChange={(themeLight) => patchModel(settings, { themeLight })}
+            leftSlot={<Icon icon="moon" color="secondary" />}
-            />
+            size="sm"
-          )}
+            value={activeTheme.data.dark.id}
-          {(settings.appearance === "system" || settings.appearance === "dark") && (
+            options={darkThemes}
-            <SettingRowSelect
+            onChange={(themeDark) => patchModel(settings, { themeDark })}
-              name="darkTheme"
+          />
-              title="Dark theme"
+        )}
-              description="Theme used when Yaak is in dark mode."
+      </HStack>
-              value={activeTheme.data.dark.id}
-              options={darkThemes}
-              onChange={(themeDark) => patchModel(settings, { themeDark })}
-            />
-          )}
-        </SettingsSection>
 
-        <SettingsSection title="Preview">
+      <VStack
-          <VStack
+        space={3}
-            space={3}
+        className="mt-3 w-full bg-surface p-3 border border-dashed border-border-subtle rounded overflow-x-auto"
-            className="mt-4 w-full bg-surface p-3 border border-dashed border-border-subtle rounded overflow-x-auto"
+      >
-          >
+        <HStack className="text" space={1.5}>
-            <HStack className="text" space={1.5}>
+          <Icon icon={appearance === "dark" ? "moon" : "sun"} />
-              <Icon icon={appearance === "dark" ? "moon" : "sun"} />
+          <strong>{activeTheme.data.active.label}</strong>
-              <strong>{activeTheme.data.active.label}</strong>
+          <em>(preview)</em>
-              <em>(preview)</em>
+        </HStack>
-            </HStack>
+        <HStack space={1.5} className="w-full">
-            <HStack space={1.5} className="w-full">
+          {buttonColors.map((c, i) => (
-              {buttonColors.map((c, i) => (
+            <IconButton
-                <IconButton
+              key={c}
-                  key={c}
+              color={c}
-                  color={c}
+              size="2xs"
-                  size="2xs"
+              iconSize="xs"
-                  iconSize="xs"
+              icon={icons[i % icons.length] ?? "info"}
-                  icon={icons[i % icons.length] ?? "info"}
+              iconClassName="text"
-                  iconClassName="text"
+              title={`${c}`}
-                  title={`${c}`}
+            />
-                />
+          ))}
-              ))}
+          {buttonColors.map((c, i) => (
-              {buttonColors.map((c, i) => (
+            <IconButton
-                <IconButton
+              key={c}
-                  key={c}
+              color={c}
-                  color={c}
+              variant="border"
-                  variant="border"
+              size="2xs"
-                  size="2xs"
+              iconSize="xs"
-                  iconSize="xs"
+              icon={icons[i % icons.length] ?? "info"}
-                  icon={icons[i % icons.length] ?? "info"}
+              iconClassName="text"
-                  iconClassName="text"
+              title={`${c}`}
-                  title={`${c}`}
+            />
-                />
+          ))}
-              ))}
+        </HStack>
-            </HStack>
+        <Suspense>
-            <Suspense>
+          <Editor
-              <Editor
+            defaultValue={[
-                defaultValue={[
+              "let foo = { // Demo code editor",
-                  "let foo = { // Demo code editor",
+              '  foo: ("bar" || "baz" ?? \'qux\'),',
-                  '  foo: ("bar" || "baz" ?? \'qux\'),',
+              "  baz: [1, 10.2, null, false, true],",
-                  "  baz: [1, 10.2, null, false, true],",
+              "};",
-                  "};",
+            ].join("\n")}
-                ].join("\n")}
+            heightMode="auto"
-                heightMode="auto"
+            language="javascript"
-                language="javascript"
+            stateKey={null}
-                stateKey={null}
+          />
-              />
+        </Suspense>
-            </Suspense>
+      </VStack>
-          </VStack>
-        </SettingsSection>
-      </SettingsList>
     </VStack>
   );
 }

apps/yaak-client/components/Sidebar.tsx

@@ -64,9 +64,7 @@ import type { ContextMenuProps, DropdownItem } from "./core/Dropdown";
 import { ContextMenu, Dropdown } from "./core/Dropdown";
 import type { FieldDef } from "./core/Editor/filter/extension";
 import { filter } from "./core/Editor/filter/extension";
-import type { Ast } from "./core/Editor/filter/query";
 import { evaluate, parseQuery } from "./core/Editor/filter/query";
-import { formatFieldFilter } from "./core/Editor/filter/format";
 import { HttpMethodTag } from "./core/HttpMethodTag";
 import { HttpStatusTag } from "./core/HttpStatusTag";
 import {
@@ -81,7 +79,6 @@ import type { TreeNode, TreeHandle, TreeProps, TreeItemProps } from "@yaakapp-in
 import { IconButton } from "./core/IconButton";
 import type { InputHandle } from "./core/Input";
 import { Input } from "./core/Input";
-import { EmptyStateText } from "./EmptyStateText";
 import { atomWithKVStorage } from "../lib/atoms/atomWithKVStorage";
 import { GitDropdown } from "./git/GitDropdown";
 import { gitCallbacks } from "./git/callbacks";
@@ -111,7 +108,7 @@ function Sidebar({ className }: { className?: string }) {
   const activeWorkspaceId = useAtomValue(activeWorkspaceAtom)?.id;
   const treeId = `tree.${activeWorkspaceId ?? "unknown"}`;
   const filterText = useAtomValue(sidebarFilterAtom);
-  const [tree, allFields, emptyFilterSuggestions] = useAtomValue(sidebarTreeAtom) ?? [];
+  const [tree, allFields] = useAtomValue(sidebarTreeAtom) ?? [];
   const wrapperRef = useRef<HTMLElement>(null);
   const treeRef = useRef<TreeHandle>(null);
   const filterRef = useRef<InputHandle>(null);
@@ -230,7 +227,7 @@ function Sidebar({ className }: { className?: string }) {
   );
 
   const clearFilterText = useCallback(() => {
-    setSidebarFilterText("");
+    jotaiStore.set(sidebarFilterAtom, { text: "", key: `${Math.random()}` });
     requestAnimationFrame(() => {
       filterRef.current?.focus();
     });
@@ -255,13 +252,6 @@ function Sidebar({ className }: { className?: string }) {
     [],
   );
 
-  const applyFilterExample = useCallback((text: string) => {
-    setSidebarFilterText(text);
-    requestAnimationFrame(() => {
-      filterRef.current?.focus();
-    });
-  }, []);
-
   const treeHasFocus = useCallback(() => treeRef.current?.hasFocus() ?? false, []);
 
   const getSelectedTreeModels = useCallback(
@@ -664,43 +654,8 @@ function Sidebar({ className }: { className?: string }) {
         )}
       </div>
       {allHidden ? (
-        <div className="p-3 text-sm text-center">
+        <div className="italic text-text-subtle p-3 text-sm text-center">
-          {(emptyFilterSuggestions?.length ?? 0) > 0 ? (
+          No results for <InlineCode>{filterText.text}</InlineCode>
-            <EmptyStateText
-              wrapperClassName="!h-auto mb-auto"
-              className="!h-auto py-3 px-3 !text-text-subtle text-sm leading-relaxed text-center"
-            >
-              <div>
-                No results, but found matches for{" "}
-                {emptyFilterSuggestions?.map((suggestion, i) => (
-                  <span key={suggestion.field}>
-                    {i > 0 && " or "}
-                    <button
-                      type="button"
-                      className="max-w-full rounded align-middle focus-visible:outline focus-visible:outline-2 focus-visible:outline-info"
-                      onClick={() => applyFilterExample(suggestion.filterText)}
-                    >
-                      <InlineCode className="inline-block max-w-36 truncate align-middle whitespace-nowrap transition-colors hover:border-border hover:bg-surface-active hover:text-text">
-                        {suggestion.filterText}
-                      </InlineCode>
-                    </button>
-                  </span>
-                ))}
-              </div>
-            </EmptyStateText>
-          ) : (
-            <EmptyStateText
-              wrapperClassName="!h-auto mb-auto"
-              className="!h-auto py-3 px-3 !text-text-subtle text-sm leading-relaxed text-center"
-            >
-              <div>
-                No results for{" "}
-                <InlineCode className="inline-block max-w-36 truncate align-middle">
-                  {filterText.text}
-                </InlineCode>
-              </div>
-            </EmptyStateText>
-          )}
         </div>
       ) : (
         <Tree
@@ -831,48 +786,7 @@ const sidebarFilterAtom = atom<{ text: string; key: string }>({
   key: "",
 });
 
-type SidebarFilterSuggestion = {
+const sidebarTreeAtom = atom<[TreeNode<SidebarModel>, FieldDef[]] | null>((get) => {
-  field: string;
-  filterText: string;
-};
-
-function setSidebarFilterText(text: string) {
-  jotaiStore.set(sidebarFilterAtom, { text, key: `${Math.random()}` });
-}
-
-function getSidebarSuggestionValue(ast: Ast | null) {
-  if (ast == null) return null;
-
-  if (ast.type === "Term" || ast.type === "Phrase") {
-    const value = ast.value.trim();
-    return value.length > 0 ? value : null;
-  }
-
-  if (ast.type === "Field") {
-    const value = ast.value.trim();
-    return value.length > 0 ? value : null;
-  }
-
-  return null;
-}
-
-function sidebarFieldMatchesValue(fieldValue: string, filterValue: string) {
-  return fieldValue.toLowerCase().includes(filterValue.toLowerCase());
-}
-
-const sidebarSuggestionFieldOrder = [
-  "url",
-  "folder",
-  "method",
-  "type",
-  "grpc_service",
-  "grpc_method",
-  "name",
-];
-
-const sidebarTreeAtom = atom<
-  [TreeNode<SidebarModel>, FieldDef[], SidebarFilterSuggestion[]] | null
->((get) => {
   const allModels = get(memoAllPotentialChildrenAtom);
   const activeWorkspace = get(activeWorkspaceAtom);
   const filter = get(sidebarFilterAtom);
@@ -893,11 +807,9 @@ const sidebarTreeAtom = atom<
   }
 
   const queryAst = parseQuery(filter.text);
-  const suggestionValue = getSidebarSuggestionValue(queryAst);
 
   // returns true if this node OR any child matches the filter
   const allFields: Record<string, Set<string>> = {};
-  const suggestionFields = new Set<string>();
   const build = (node: TreeNode<SidebarModel>, depth: number): boolean => {
     const childItems = childrenMap[node.item.id] ?? [];
     let matchesSelf = true;
@@ -909,13 +821,6 @@ const sidebarTreeAtom = atom<
       if (!value) continue;
       allFields[field] = allFields[field] ?? new Set();
       allFields[field].add(value);
-      if (
-        isLeafNode &&
-        suggestionValue != null &&
-        sidebarFieldMatchesValue(value, suggestionValue)
-      ) {
-        suggestionFields.add(field);
-      }
     }
 
     if (queryAst != null) {
@@ -969,18 +874,7 @@ const sidebarTreeAtom = atom<
       values: Array.from(values).filter((v) => v.length < 20),
     });
   }
-  const suggestions = Array.from(suggestionFields)
+  return [root, fields] as const;
-    .sort((a, b) => {
-      const aIndex = sidebarSuggestionFieldOrder.indexOf(a);
-      const bIndex = sidebarSuggestionFieldOrder.indexOf(b);
-      if (aIndex === -1 && bIndex === -1) return a.localeCompare(b);
-      return (aIndex === -1 ? Infinity : aIndex) - (bIndex === -1 ? Infinity : bIndex);
-    })
-    .map((field) => ({
-      field,
-      filterText: formatFieldFilter(field, suggestionValue ?? ""),
-    }));
-  return [root, fields, suggestions] as const;
 });
 
 const sidebarGitStatusByModelIdAtom = atom<Record<string, GitStatus>>((get) => {

apps/yaak-client/components/SyncToFilesystemSetting.tsx

@@ -4,79 +4,20 @@ import { useState } from "react";
 import { openWorkspaceFromSyncDir } from "../commands/openWorkspaceFromSyncDir";
 import { Button } from "./core/Button";
 import { Checkbox } from "./core/Checkbox";
-import { SettingRowBoolean, SettingRowDirectory } from "./core/SettingRow";
 import { SelectFile } from "./SelectFile";
 
 export interface SyncToFilesystemSettingProps {
-  layout?: "form" | "settings";
   onChange: (args: { filePath: string | null; initGit?: boolean }) => void;
   onCreateNewWorkspace: () => void;
   value: { filePath: string | null; initGit?: boolean };
 }
 
 export function SyncToFilesystemSetting({
-  layout = "form",
   onChange,
   onCreateNewWorkspace,
   value,
 }: SyncToFilesystemSettingProps) {
   const [syncDir, setSyncDir] = useState<string | null>(null);
-
-  const handleFilePathChange = async (filePath: string | null) => {
-    if (filePath != null) {
-      const files = await readDir(filePath);
-      if (files.length > 0) {
-        setSyncDir(filePath);
-        return;
-      }
-    }
-
-    setSyncDir(null);
-    onChange({ ...value, filePath });
-  };
-
-  if (layout === "settings") {
-    return (
-      <VStack className="w-full" space={0}>
-        {syncDir && (
-          <Banner color="notice" className="mb-3 flex flex-col gap-1.5">
-            <p>Directory is not empty. Do you want to open it instead?</p>
-            <div>
-              <Button
-                variant="border"
-                color="notice"
-                size="xs"
-                type="button"
-                onClick={() => {
-                  openWorkspaceFromSyncDir.mutate(syncDir);
-                  onCreateNewWorkspace();
-                }}
-              >
-                Open Workspace
-              </Button>
-            </div>
-          </Banner>
-        )}
-
-        <SettingRowDirectory
-          title="Local directory sync"
-          description="Sync data to a folder for backup and Git integration."
-          filePath={value.filePath}
-          onChange={handleFilePathChange}
-        />
-
-        {value.filePath && typeof value.initGit === "boolean" && (
-          <SettingRowBoolean
-            checked={value.initGit}
-            title="Initialize Git Repo"
-            description="Create a Git repository in the selected sync directory."
-            onChange={(initGit) => onChange({ ...value, initGit })}
-          />
-        )}
-      </VStack>
-    );
-  }
-
   return (
     <VStack className="w-full my-2" space={3}>
       {syncDir && (
@@ -106,7 +47,18 @@ export function SyncToFilesystemSetting({
         noun="Directory"
         help="Sync data to a folder for backup and Git integration."
         filePath={value.filePath}
-        onChange={async ({ filePath }) => handleFilePathChange(filePath)}
+        onChange={async ({ filePath }) => {
+          if (filePath != null) {
+            const files = await readDir(filePath);
+            if (files.length > 0) {
+              setSyncDir(filePath);
+              return;
+            }
+          }
+
+          setSyncDir(null);
+          onChange({ ...value, filePath });
+        }}
       />
 
       {value.filePath && typeof value.initGit === "boolean" && (

apps/yaak-client/components/WebsocketRequestPane.tsx

@@ -34,7 +34,6 @@ import { setActiveTab, TabContent, Tabs } from "./core/Tabs/Tabs";
 import { HeadersEditor } from "./HeadersEditor";
 import { HttpAuthenticationEditor } from "./HttpAuthenticationEditor";
 import { MarkdownEditor } from "./MarkdownEditor";
-import { countOverriddenSettings, ModelSettingsEditor } from "./ModelSettingsEditor";
 import { UrlBar } from "./UrlBar";
 import { UrlParametersEditor } from "./UrlParameterEditor";
 
@@ -49,7 +48,6 @@ const TAB_MESSAGE = "message";
 const TAB_PARAMS = "params";
 const TAB_HEADERS = "headers";
 const TAB_AUTH = "auth";
-const TAB_SETTINGS = "settings";
 const TAB_DESCRIPTION = "description";
 const TABS_STORAGE_KEY = "websocket_request_tabs";
 
@@ -71,7 +69,6 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
   const authTab = useAuthTab(TAB_AUTH, activeRequest);
   const headersTab = useHeadersTab(TAB_HEADERS, activeRequest);
   const inheritedHeaders = useInheritedHeaders(activeRequest);
-  const numSettingsOverrides = countOverriddenSettings(activeRequest);
 
   // Listen for event to focus the params tab (e.g., when clicking a :param in the URL)
   useRequestEditorEvent(
@@ -112,17 +109,12 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
       },
       ...headersTab,
       ...authTab,
-      {
-        value: TAB_SETTINGS,
-        label: "Settings",
-        rightSlot: <CountBadge count={numSettingsOverrides} />,
-      },
       {
         value: TAB_DESCRIPTION,
         label: "Info",
       },
     ];
-  }, [authTab, headersTab, numSettingsOverrides, urlParameterPairs.length]);
+  }, [authTab, headersTab, urlParameterPairs.length]);
 
   const { activeResponse } = usePinnedHttpResponse(activeRequestId);
   const { mutate: cancelResponse } = useCancelHttpResponse(activeResponse?.id ?? null);
@@ -274,9 +266,6 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
                 stateKey={`json.${activeRequest.id}`}
               />
             </TabContent>
-            <TabContent value={TAB_SETTINGS}>
-              <ModelSettingsEditor model={activeRequest} />
-            </TabContent>
             <TabContent value={TAB_DESCRIPTION}>
               <div className="grid grid-rows-[auto_minmax(0,1fr)] h-full">
                 <PlainInput

apps/yaak-client/components/Workspace.tsx

@@ -6,7 +6,6 @@ import { useAtomValue } from "jotai";
 import * as m from "motion/react-m";
 import { useMemo, useState } from "react";
 import {
-  getActiveCookieJar,
   useEnsureActiveCookieJar,
   useSubscribeActiveCookieJarId,
 } from "../hooks/useActiveCookieJar";
@@ -34,7 +33,6 @@ import { jotaiStore } from "../lib/jotai";
 import { CreateDropdown } from "./CreateDropdown";
 import { Button } from "./core/Button";
 import { HotkeyList } from "./core/HotkeyList";
-import { CookieDialog } from "./CookieDialog";
 import { FeedbackLink } from "./core/Link";
 import { ErrorBoundary } from "./ErrorBoundary";
 import { FolderLayout } from "./FolderLayout";
@@ -220,8 +218,4 @@ function useGlobalWorkspaceHooks() {
   useHotKey("model.duplicate", () =>
     duplicateRequestOrFolderAndNavigate(jotaiStore.get(activeRequestAtom)),
   );
-
-  useHotKey("cookies_editor.show", () => CookieDialog.show(getActiveCookieJar()?.id ?? null), {
-    enable: () => getActiveCookieJar() != null,
-  });
 }

apps/yaak-client/components/WorkspaceEncryptionSetting.tsx

@@ -20,24 +20,16 @@ import { IconButton } from "./core/IconButton";
 import { IconTooltip } from "./core/IconTooltip";
 import { Label } from "./core/Label";
 import { PlainInput } from "./core/PlainInput";
-import { SettingRow } from "./core/SettingRow";
 import { EncryptionHelp } from "./EncryptionHelp";
 
 interface Props {
-  layout?: "form" | "settings";
   size?: ButtonProps["size"];
   expanded?: boolean;
   onDone?: () => void;
   onEnabledEncryption?: () => void;
 }
 
-export function WorkspaceEncryptionSetting({
+export function WorkspaceEncryptionSetting({ size, expanded, onDone, onEnabledEncryption }: Props) {
-  layout = "form",
-  size,
-  expanded,
-  onDone,
-  onEnabledEncryption,
-}: Props) {
   const [justEnabledEncryption, setJustEnabledEncryption] = useState<boolean>(false);
   const [error, setError] = useState<string | null>(null);
 
@@ -74,7 +66,7 @@ export function WorkspaceEncryptionSetting({
     key.error != null ||
     (workspace.encryptionKeyChallenge && workspaceMeta.encryptionKey == null)
   ) {
-    const enterKey = (
+    return (
       <EnterWorkspaceKey
         workspaceMeta={workspaceMeta}
         error={key.error}
@@ -87,8 +79,6 @@ export function WorkspaceEncryptionSetting({
         }}
       />
     );
-
-    return enterKey;
   }
 
   // Show the key if it exists
@@ -100,8 +90,7 @@ export function WorkspaceEncryptionSetting({
         encryptionKey={key.key}
       />
     );
-
+    return (
-    const content = (
       <VStack space={2} className="w-full">
         {justEnabledEncryption && (
           <Banner color="success" className="flex flex-col gap-2">
@@ -122,43 +111,9 @@ export function WorkspaceEncryptionSetting({
         )}
       </VStack>
     );
-
-    return content;
   }
 
   // Show button to enable encryption
-  if (layout === "settings") {
-    return (
-      <>
-        {error && (
-          <Banner color="danger" className="mb-3">
-            {error}
-          </Banner>
-        )}
-        <SettingRow
-          title="Workspace encryption"
-          description="Encrypt workspace secrets and sensitive values at rest."
-        >
-          <Button
-            color="secondary"
-            size={size}
-            onClick={async () => {
-              setError(null);
-              try {
-                await enableEncryption(workspaceMeta.workspaceId);
-                setJustEnabledEncryption(true);
-              } catch (err) {
-                setError(`Failed to enable encryption: ${String(err)}`);
-              }
-            }}
-          >
-            Enable Encryption
-          </Button>
-        </SettingRow>
-      </>
-    );
-  }
-
   return (
     <div className="mb-auto flex flex-col-reverse">
       <Button

apps/yaak-client/components/WorkspaceSettingsDialog.tsx

@@ -1,23 +1,20 @@
 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";
 import { useInheritedHeaders } from "../hooks/useInheritedHeaders";
 import { deleteModelWithConfirm } from "../lib/deleteModelWithConfirm";
-import { showDialog } from "../lib/dialog";
 import { router } from "../lib/router";
 import { CopyIconButton } from "./CopyIconButton";
 import { Button } from "./core/Button";
 import { CountBadge } from "./core/CountBadge";
 import { PlainInput } from "./core/PlainInput";
-import { SettingsList, SettingsSection } from "./core/SettingRow";
 import { TabContent, Tabs } from "./core/Tabs/Tabs";
 import { DnsOverridesEditor } from "./DnsOverridesEditor";
 import { HeadersEditor } from "./HeadersEditor";
 import { HttpAuthenticationEditor } from "./HttpAuthenticationEditor";
 import { MarkdownEditor } from "./MarkdownEditor";
-import { ModelSettingsEditor } from "./ModelSettingsEditor";
 import { SyncToFilesystemSetting } from "./SyncToFilesystemSetting";
 import { WorkspaceEncryptionSetting } from "./WorkspaceEncryptionSetting";
 
@@ -28,17 +25,17 @@ interface Props {
 }
 
 const TAB_AUTH = "auth";
+const TAB_DATA = "data";
 const TAB_DNS = "dns";
 const TAB_HEADERS = "headers";
 const TAB_GENERAL = "general";
-const TAB_SETTINGS = "settings";
 
 export type WorkspaceSettingsTab =
   | typeof TAB_AUTH
   | typeof TAB_DNS
   | typeof TAB_HEADERS
   | typeof TAB_GENERAL
-  | typeof TAB_SETTINGS;
+  | typeof TAB_DATA;
 
 const DEFAULT_TAB: WorkspaceSettingsTab = TAB_GENERAL;
 
@@ -74,8 +71,8 @@ export function WorkspaceSettingsDialog({ workspaceId, hide, tab }: Props) {
       tabs={[
         { value: TAB_GENERAL, label: "Workspace" },
         {
-          value: TAB_SETTINGS,
+          value: TAB_DATA,
-          label: "Settings",
+          label: "Storage",
         },
         ...headersTab,
         ...authTab,
@@ -103,20 +100,6 @@ export function WorkspaceSettingsDialog({ workspaceId, hide, tab }: Props) {
           stateKey={`headers.${workspace.id}`}
         />
       </TabContent>
-      <TabContent value={TAB_SETTINGS} className="overflow-y-auto h-full px-4">
-        <SettingsList className="space-y-8 pb-3">
-          <SettingsSection title={null}>
-            <SyncToFilesystemSetting
-              layout="settings"
-              value={{ filePath: workspaceMeta.settingSyncDir }}
-              onCreateNewWorkspace={hide}
-              onChange={({ filePath }) => patchModel(workspaceMeta, { settingSyncDir: filePath })}
-            />
-            <WorkspaceEncryptionSetting layout="settings" size="xs" />
-          </SettingsSection>
-          <ModelSettingsEditor model={workspace} showSectionTitles />
-        </SettingsList>
-      </TabContent>
       <TabContent value={TAB_GENERAL} className="overflow-y-auto h-full px-4">
         <div className="grid grid-rows-[auto_minmax(0,1fr)_auto] gap-4 pb-3 h-full">
           <PlainInput
@@ -169,21 +152,19 @@ export function WorkspaceSettingsDialog({ workspaceId, hide, tab }: Props) {
           </HStack>
         </div>
       </TabContent>
+      <TabContent value={TAB_DATA} className="overflow-y-auto h-full px-4">
+        <VStack space={4} alignItems="start" className="pb-3 h-full">
+          <SyncToFilesystemSetting
+            value={{ filePath: workspaceMeta.settingSyncDir }}
+            onCreateNewWorkspace={hide}
+            onChange={({ filePath }) => patchModel(workspaceMeta, { settingSyncDir: filePath })}
+          />
+          <WorkspaceEncryptionSetting size="xs" />
+        </VStack>
+      </TabContent>
       <TabContent value={TAB_DNS} className="overflow-y-auto h-full px-4">
         <DnsOverridesEditor workspace={workspace} />
       </TabContent>
     </Tabs>
   );
 }
-
-WorkspaceSettingsDialog.show = (workspaceId: string, tab?: WorkspaceSettingsTab) => {
-  showDialog({
-    id: "workspace-settings",
-    size: "lg",
-    className: "h-[calc(100vh-5rem)] !max-h-[50rem]",
-    noPadding: true,
-    render: ({ hide }) => (
-      <WorkspaceSettingsDialog workspaceId={workspaceId} hide={hide} tab={tab} />
-    ),
-  });
-};

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 {
+function lineToPair(line: string): PairWithId {
-  const [, name, value] = line.match(/^([^:]+):\s+(.*)$/) ?? [];
+  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/Checkbox.tsx

@@ -13,7 +13,6 @@ export interface CheckboxProps {
   hideLabel?: boolean;
   fullWidth?: boolean;
   help?: ReactNode;
-  size?: "sm" | "md";
 }
 
 export function Checkbox({
@@ -26,7 +25,6 @@ export function Checkbox({
   hideLabel,
   fullWidth,
   help,
-  size = "sm",
 }: CheckboxProps) {
   return (
     <HStack
@@ -39,9 +37,7 @@ export function Checkbox({
         <input
           aria-hidden
           className={classNames(
-            "appearance-none flex-shrink-0 border border-border",
+            "appearance-none w-4 h-4 flex-shrink-0 border border-border",
-            size === "sm" && "w-4 h-4",
-            size === "md" && "w-5 h-5",
             "rounded outline-none ring-0",
             !disabled && "hocus:border-border-focus hocus:bg-focus/[5%]",
             disabled && "border-dotted",
@@ -54,7 +50,7 @@ export function Checkbox({
         />
         <div className="absolute inset-0 flex items-center justify-center">
           <Icon
-            size={size}
+            size="sm"
             className={classNames(disabled && "opacity-disabled")}
             icon={checked === "indeterminate" ? "minus" : checked ? "check" : "empty"}
           />

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/filter/extension.ts

@@ -15,9 +15,8 @@ export interface FilterOptions {
   fields: FieldDef[] | null; // e.g., ['method','status','path'] or [{name:'tag', values:()=>cachedTags}]
 }
 
-const FIELD_IDENT = /[A-Za-z0-9_/]+$/;
+const IDENT = /[A-Za-z0-9_/]+$/;
-const VALUE_IDENT = /\S+$/;
+const IDENT_ONLY = /^[A-Za-z0-9_/]+$/;
-const VALUE_IDENT_ONLY = /^\S+$/;
 
 function normalizeFields(fields: FieldDef[]): {
   fieldNames: string[];
@@ -32,37 +31,14 @@ function normalizeFields(fields: FieldDef[]): {
   return { fieldNames, fieldMap };
 }
 
-function wordBefore(
+function wordBefore(doc: string, pos: number): { from: number; to: number; text: string } | null {
-  doc: string,
-  pos: number,
-  pattern: RegExp,
-): { from: number; to: number; text: string } | null {
   const upto = doc.slice(0, pos);
-  const m = upto.match(pattern);
+  const m = upto.match(IDENT);
   if (!m) return null;
   const from = pos - m[0].length;
   return { from, to: pos, text: m[0] };
 }
 
-function fieldCompletionFrom(doc: string, pos: number): { from: number; includeAt: boolean } | null {
-  const w = wordBefore(doc, pos, FIELD_IDENT);
-  const from = w?.from ?? pos;
-  const beforeToken = doc[from - 1];
-
-  if (from === 0 || (beforeToken != null && /\s/.test(beforeToken))) {
-    return { from, includeAt: true };
-  }
-
-  if (beforeToken === "@") {
-    const beforeAt = doc[from - 2];
-    if (from === 1 || (beforeAt != null && /\s/.test(beforeAt))) {
-      return { from, includeAt: false };
-    }
-  }
-
-  return null;
-}
-
 function inPhrase(ctx: CompletionContext): boolean {
   // Lezer node names from your grammar: Phrase is the quoted token
   let n: SyntaxNode | null = syntaxTree(ctx.state).resolveInner(ctx.pos, -1);
@@ -105,7 +81,7 @@ function contextInfo(stateDoc: string, pos: number) {
   if (inValue) {
     // word before the colon = field name
     const beforeColon = stateDoc.slice(0, lastColon);
-    const m = beforeColon.match(FIELD_IDENT);
+    const m = beforeColon.match(IDENT);
     fieldName = m ? m[0] : null;
 
     // nothing (or only spaces) typed after the colon?
@@ -117,16 +93,15 @@ function contextInfo(stateDoc: string, pos: number) {
 }
 
 /** Build a completion list for field names */
-function fieldNameCompletions(fieldNames: string[], includeAt: boolean): Completion[] {
+function fieldNameCompletions(fieldNames: string[]): Completion[] {
   return fieldNames.map((name) => ({
     label: name,
     type: "property",
     apply: (view, _completion, from, to) => {
-      // Leave cursor right after the field filter colon.
+      // Insert "name:" (leave cursor right after colon)
-      const insert = `${includeAt ? "@" : ""}${name}:`;
       view.dispatch({
-        changes: { from, to, insert },
+        changes: { from, to, insert: `${name}:` },
-        selection: { anchor: from + insert.length },
+        selection: { anchor: from + name.length + 1 },
       });
       startCompletion(view);
     },
@@ -140,7 +115,7 @@ function fieldValueCompletions(
   if (!def || !def.values) return null;
   const vals = Array.isArray(def.values) ? def.values : def.values();
   return vals.map((v) => ({
-    label: v.match(VALUE_IDENT_ONLY) ? v : `"${v}"`,
+    label: v.match(IDENT_ONLY) ? v : `"${v}"`,
     displayLabel: v,
     type: "constant",
   }));
@@ -157,13 +132,14 @@ function makeCompletionSource(opts: FilterOptions) {
       return null;
     }
 
+    const w = wordBefore(doc, pos);
+    const from = w?.from ?? pos;
+    const to = pos;
+
     const { inValue, fieldName, emptyAfterColon } = contextInfo(doc, pos);
 
     // In field value position
     if (inValue && fieldName) {
-      const w = wordBefore(doc, pos, VALUE_IDENT);
-      const from = w?.from ?? pos;
-      const to = pos;
       const valDefs = fieldMap[fieldName];
       const vals = fieldValueCompletions(valDefs);
 
@@ -186,11 +162,7 @@ function makeCompletionSource(opts: FilterOptions) {
     }
 
     // Not in a value: suggest field names (and maybe boolean ops)
-    const completion = fieldCompletionFrom(doc, pos);
+    const options: Completion[] = fieldNameCompletions(fieldNames);
-    if (completion == null) return null;
-    const { from, includeAt } = completion;
-    const to = pos;
-    const options: Completion[] = fieldNameCompletions(fieldNames, includeAt);
 
     return { from, to, options, filter: true };
   };

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

@@ -2,11 +2,10 @@
 
 @skip { space+ }
 @tokens {
-  space { $[ \t\r\n]+ }
+  space { std.whitespace+ }
 
   LParen { "(" }
   RParen { ")" }
-  At { "@" }
   Colon  { ":" }
   Not  { "-" | "NOT" }
 
@@ -17,10 +16,8 @@
   // "quoted phrase" with simple escapes: \" and \\
   Phrase { '"' (!["\\] | "\\" _)* '"' }
 
-  // Bare words run until filter syntax or whitespace. Leading '-' remains unary
+  // field/word characters (keep generous for URLs/paths)
-  // negation, but '-' may appear after the first character.
+  Word { $[A-Za-z0-9_]+ }
-  Word { ![ \t\r\n():"@-] ![ \t\r\n():"@]* }
-  FieldValueWord { ![ \t\r\n"] ![ \t\r\n]* }
 
   @precedence { Not, And, Or, Word }
 }
@@ -63,12 +60,12 @@ Field {
 }
 
 FieldName {
-  At? Word
+  Word
 }
 
 FieldValue {
   Phrase
-| FieldValueWord
+| Term
 }
 
 Term {

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

@@ -1,42 +0,0 @@
-import { describe, expect, test } from "vite-plus/test";
-import { parser } from "./filter";
-
-function getNodeNames(input: string): string[] {
-  const tree = parser.parse(input);
-  const nodes: string[] = [];
-  const cursor = tree.cursor();
-  do {
-    if (cursor.name !== "Query") {
-      nodes.push(cursor.name);
-    }
-  } while (cursor.next());
-  return nodes;
-}
-
-describe("filter grammar", () => {
-  test("parses URL-like field values as one value", () => {
-    const nodes = getNodeNames("@url:yaak.app/foo-bar");
-
-    expect(nodes).not.toContain("⚠");
-    expect(nodes).toContain("FieldValue");
-    expect(nodes).toContain("FieldValueWord");
-  });
-
-  test("parses punctuation-heavy field values as one value", () => {
-    const nodes = getNodeNames("@url:yaa$&#*@tsrna(*)");
-
-    expect(nodes).not.toContain("⚠");
-    expect(nodes).toContain("FieldValue");
-    expect(nodes).toContain("FieldValueWord");
-  });
-
-  test("parses operator-looking field values as one value", () => {
-    const negativeValueNodes = getNodeNames("@url:-foo");
-    const operatorWordNodes = getNodeNames("@url:AND");
-
-    expect(negativeValueNodes).not.toContain("⚠");
-    expect(negativeValueNodes).toContain("FieldValueWord");
-    expect(operatorWordNodes).not.toContain("⚠");
-    expect(operatorWordNodes).toContain("FieldValueWord");
-  });
-});

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

@@ -1,22 +1,27 @@
+/* oxlint-disable */
 // This file was generated by lezer-generator. You probably shouldn't edit it.
-import {LRParser} from "@lezer/lr"
+import { LRParser } from "@lezer/lr";
-import {highlight} from "./highlight"
+import { highlight } from "./highlight";
 export const parser = LRParser.deserialize({
   version: 14,
-  states: "%WOVQPOOPhOPOOOVQPO'#CfOmQPO'#ChO!_QPO'#ChO!dQPO'#CgOOQO'#Cc'#CcOVQPO'#CaOOQO'#Ca'#CaO!iQPO'#C`O!yQPO'#C_OOQO'#C^'#C^QOQPOOPOOO'#Cr'#CrP#UOPO)C>lO#]QPO,59QOOQO,59S,59SO#bQQO,59ROOQO,58{,58{OVQPO'#CsOOQO'#Cs'#CsO#jQPO,58zOVQPO'#CtO#zQPO,58yPOOO-E6p-E6pOOQO1G.l1G.lOOQO'#Cl'#ClOOQO1G.m1G.mOOQO,59_,59_OOQO-E6q-E6qOOQO,59`,59`OOQO-E6r-E6r",
+  states:
-  stateData: "$]~OkPQ~OUVOXQO]SO^ROaUO~Ok]O~OUcXXcX]cX^cX_[XacXdcXecXicXWcX~O^`O~O_aO~OdcOeSXiSXWSX~PVOefOiRXWRX~Ok]O~Qj]WiO~OajObjO~OdcOeSaiSaWSa~PVOefOiRaWRa~OUde^e~",
+    "%QOVQPOOPeOPOOOVQPO'#CfOjQPO'#ChO!XQPO'#CgOOQO'#Cc'#CcOVQPO'#CaOOQO'#Ca'#CaO!oQPO'#C`O!|QPO'#C_OOQO'#C^'#C^QOQPOOPOOO'#Cp'#CpP#XOPO)C>jO#`QPO,59QO#eQPO,59ROOQO,58{,58{OVQPO'#CqOOQO'#Cq'#CqO#mQPO,58zOVQPO'#CrO#zQPO,58yPOOO-E6n-E6nOOQO1G.l1G.lOOQO'#Cm'#CmOOQO'#Ck'#CkOOQO1G.m1G.mOOQO,59],59]OOQO-E6o-E6oOOQO,59^,59^OOQO-E6p-E6p",
-  goto: "#^iPPjpt{P![PP!e!e!nPPP!wPP!ePP!z#Q#WQ[OR_QTZOQSYOQRnfUXOQfQbVSdXeRlc_WOQVXcef_UOQVXcef_TOQVXcefRkaQ^PRh^QeXRmeQgYRog",
+  stateData:
-  nodeNames: "⚠ Query Expr OrExpr AndExpr Unary Not Primary RParen LParen Group Field FieldName At Word Colon FieldValue Phrase FieldValueWord Term And Or",
+    "$]~OiPQ~OUUOXQO]RO`TO~Oi[O~OUaXXaX]aX^[X`aXbaXcaXgaXWaX~O^_O~OUUOXQO]RO`TObaO~OcSXgSXWSX~P!^OcdOgRXWRX~Oi[O~Qh]WgO~O]hO`iO~OcSagSaWSa~P!^OcdOgRaWRa~OUbc]c~",
-  maxTerm: 27,
+  goto: "#hgPPhnryP!YPP!c!c!lPP!uP!xPP#U#[#bQZOR^QTYOQSXOQRmdUWOQdQ`USbWcRka_VOQUWacd_TOQUWacd_SOQUWacdRj_^TOQUWacdRi_Q]PRf]QcWRlcQeXRne",
+  nodeNames:
+    "⚠ Query Expr OrExpr AndExpr Unary Not Primary RParen LParen Group Field FieldName Word Colon FieldValue Phrase Term And Or",
+  maxTerm: 25,
   nodeProps: [
-    ["openedBy", 8,"LParen"],
+    ["openedBy", 8, "LParen"],
-    ["closedBy", 9,"RParen"]
+    ["closedBy", 9, "RParen"],
   ],
   propSources: [highlight],
-  skippedNodes: [0,22],
+  skippedNodes: [0, 20],
   repeatNodeCount: 3,
-  tokenData: "2h~RiOX!pXY$hYZ$hZ]!p]^$h^p!ppq$hqr!prs$ysx!pxy&gyz'Qz}!p}!O'k!O![!p![!](U!]!b!p!b!c(o!c!d)Y!d!p!p!p!q,q!q!r0Y!r;'S!p;'S;=`$b<%lO!pR!w^bQ^POX!pZ]!p^p!pqr!prs#ssx!pxz#sz![!p![!]#s!]!b!p!b!c#s!c;'S!p;'S;=`$b<%lO!pQ#xUbQOX#sZ]#s^p#sq;'S#s;'S;=`$[<%lO#sQ$_P;=`<%l#sR$eP;=`<%l!p~$mSk~XY$hYZ$h]^$hpq$h~$|VOr$yrs%cs#O$y#O#P%h#P;'S$y;'S;=`&a<%lO$y~%hOa~~%kRO;'S$y;'S;=`%t;=`O$y~%wWOr$yrs%cs#O$y#O#P%h#P;'S$y;'S;=`&a;=`<%l$y<%lO$y~&dP;=`<%l$yR&nUbQXPOX#sZ]#s^p#sq;'S#s;'S;=`$[<%lO#sR'XUbQWPOX#sZ]#s^p#sq;'S#s;'S;=`$[<%lO#sR'rUbQUPOX#sZ]#s^p#sq;'S#s;'S;=`$[<%lO#sR(]U_PbQOX#sZ]#s^p#sq;'S#s;'S;=`$[<%lO#sR(vU]PbQOX#sZ]#s^p#sq;'S#s;'S;=`$[<%lO#sR)a`bQ^POX!pZ]!p^p!pqr!prs#ssx!pxz#sz![!p![!]#s!]!b!p!b!c#s!c!p!p!p!q*c!q;'S!p;'S;=`$b<%lO!pR*j`bQ^POX!pZ]!p^p!pqr!prs#ssx!pxz#sz![!p![!]#s!]!b!p!b!c#s!c!f!p!f!g+l!g;'S!p;'S;=`$b<%lO!pR+u^bQdP^POX!pZ]!p^p!pqr!prs#ssx!pxz#sz![!p![!]#s!]!b!p!b!c#s!c;'S!p;'S;=`$b<%lO!pR,x`bQ^POX!pZ]!p^p!pqr!prs#ssx!pxz#sz![!p![!]#s!]!b!p!b!c#s!c!q!p!q!r-z!r;'S!p;'S;=`$b<%lO!pR.R`bQ^POX!pZ]!p^p!pqr!prs#ssx!pxz#sz![!p![!]#s!]!b!p!b!c#s!c!v!p!v!w/T!w;'S!p;'S;=`$b<%lO!pR/^^bQUP^POX!pZ]!p^p!pqr!prs#ssx!pxz#sz![!p![!]#s!]!b!p!b!c#s!c;'S!p;'S;=`$b<%lO!pR0a`bQ^POX!pZ]!p^p!pqr!prs#ssx!pxz#sz![!p![!]#s!]!b!p!b!c#s!c!t!p!t!u1c!u;'S!p;'S;=`$b<%lO!pR1l^bQeP^POX!pZ]!p^p!pqr!prs#ssx!pxz#sz![!p![!]#s!]!b!p!b!c#s!c;'S!p;'S;=`$b<%lO!p",
+  tokenData:
-  tokenizers: [0, 1],
+    ")f~RgX^!jpq!jrs#_xy${yz%Q}!O%V!Q![%[![!]%m!c!d%r!d!p%[!p!q'V!q!r(j!r!}%[#R#S%[#T#o%[#y#z!j$f$g!j#BY#BZ!j$IS$I_!j$I|$JO!j$JT$JU!j$KV$KW!j&FU&FV!j~!oYi~X^!jpq!j#y#z!j$f$g!j#BY#BZ!j$IS$I_!j$I|$JO!j$JT$JU!j$KV$KW!j&FU&FV!j~#bVOr#_rs#ws#O#_#O#P#|#P;'S#_;'S;=`$u<%lO#_~#|O`~~$PRO;'S#_;'S;=`$Y;=`O#_~$]WOr#_rs#ws#O#_#O#P#|#P;'S#_;'S;=`$u;=`<%l#_<%lO#_~$xP;=`<%l#_~%QOX~~%VOW~~%[OU~~%aS]~!Q![%[!c!}%[#R#S%[#T#o%[~%rO^~~%wU]~!Q![%[!c!p%[!p!q&Z!q!}%[#R#S%[#T#o%[~&`U]~!Q![%[!c!f%[!f!g&r!g!}%[#R#S%[#T#o%[~&ySb~]~!Q![%[!c!}%[#R#S%[#T#o%[~'[U]~!Q![%[!c!q%[!q!r'n!r!}%[#R#S%[#T#o%[~'sU]~!Q![%[!c!v%[!v!w(V!w!}%[#R#S%[#T#o%[~(^SU~]~!Q![%[!c!}%[#R#S%[#T#o%[~(oU]~!Q![%[!c!t%[!t!u)R!u!}%[#R#S%[#T#o%[~)YSc~]~!Q![%[!c!}%[#R#S%[#T#o%[",
-  topRules: {"Query":[0,1]},
+  tokenizers: [0],
-  tokenPrec: 145
+  topRules: { Query: [0, 1] },
-})
+  tokenPrec: 145,
+});

apps/yaak-client/components/core/Editor/filter/format.test.ts

@@ -1,43 +0,0 @@
-import { describe, expect, test } from "vite-plus/test";
-import { formatFieldFilter } from "./format";
-import { evaluate, parseQuery } from "./query";
-
-function matchesFormattedUrl(value: string) {
-  return evaluate(parseQuery(formatFieldFilter("url", value)), {
-    fields: { url: value },
-  });
-}
-
-describe("formatFieldFilter", () => {
-  test("keeps URL-like values bare", () => {
-    expect(formatFieldFilter("url", "yaak.app/foo-bar")).toBe("@url:yaak.app/foo-bar");
-    expect(matchesFormattedUrl("yaak.app/foo-bar")).toBe(true);
-  });
-
-  test("keeps non-syntax punctuation bare", () => {
-    expect(formatFieldFilter("url", "yaa$&#*@tsrna(*)")).toBe("@url:yaa$&#*@tsrna(*)");
-    expect(matchesFormattedUrl("yaa$&#*@tsrna(*)")).toBe(true);
-  });
-
-  test("keeps values that start with an operator token bare", () => {
-    expect(formatFieldFilter("url", "-foo")).toBe("@url:-foo");
-    expect(matchesFormattedUrl("-foo")).toBe(true);
-  });
-
-  test("keeps boolean operator words bare", () => {
-    expect(formatFieldFilter("url", "AND")).toBe("@url:AND");
-    expect(formatFieldFilter("url", "or")).toBe("@url:or");
-    expect(formatFieldFilter("url", "Not")).toBe("@url:Not");
-    expect(matchesFormattedUrl("AND")).toBe(true);
-  });
-
-  test("escapes quoted values", () => {
-    expect(formatFieldFilter("url", 'say "hi"')).toBe('@url:"say \\"hi\\""');
-    expect(matchesFormattedUrl('say "hi"')).toBe(true);
-  });
-
-  test("quotes values that start with a quote", () => {
-    expect(formatFieldFilter("url", '"hi"')).toBe('@url:"\\"hi\\""');
-    expect(matchesFormattedUrl('"hi"')).toBe(true);
-  });
-});

apps/yaak-client/components/core/Editor/filter/format.ts

@@ -1,7 +0,0 @@
-const bareFieldValue = /^[^\s"]\S*$/;
-
-export function formatFieldFilter(field: string, value: string) {
-  const escapedValue = value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-  const filterValue = bareFieldValue.test(value) ? value : `"${escapedValue}"`;
-  return `@${field}:${filterValue}`;
-}

apps/yaak-client/components/core/Editor/filter/highlight.ts

@@ -16,7 +16,6 @@ export const highlight = styleTags({
   Phrase: t.string, // "quoted string"
 
   // Fields
-  "FieldName/At": t.attributeName,
   "FieldName/Word": t.attributeName,
-  "FieldValue/FieldValueWord": t.attributeValue,
+  "FieldValue/Term/Word": t.attributeValue,
 });

apps/yaak-client/components/core/Editor/filter/query.ts

@@ -30,8 +30,7 @@ type Tok =
   | { kind: "EOF" };
 
 const isSpace = (c: string) => /\s/.test(c);
-const isWordStart = (c: string) => c !== "" && !isSpace(c) && !/[():"@-]/.test(c);
+const isIdent = (c: string) => /[A-Za-z0-9_\-./]/.test(c);
-const isWordChar = (c: string) => c !== "" && !isSpace(c) && !/[():"@]/.test(c);
 
 export function tokenize(input: string): Tok[] {
   const toks: Tok[] = [];
@@ -43,13 +42,7 @@ export function tokenize(input: string): Tok[] {
 
   const readWord = () => {
     let s = "";
-    while (i < n && isWordChar(peek())) s += advance();
+    while (i < n && isIdent(peek())) s += advance();
-    return s;
-  };
-
-  const readFieldValue = () => {
-    let s = "";
-    while (i < n && !isSpace(peek())) s += advance();
     return s;
   };
 
@@ -92,9 +85,6 @@ export function tokenize(input: string): Tok[] {
     if (c === ":") {
       toks.push({ kind: "COLON" });
       i++;
-      if (peek() && !isSpace(peek()) && peek() !== `"`) {
-        toks.push({ kind: "WORD", text: readFieldValue() });
-      }
       continue;
     }
     if (c === `"`) {
@@ -109,7 +99,7 @@ export function tokenize(input: string): Tok[] {
     }
 
     // WORD / AND / OR / NOT
-    if (isWordStart(c)) {
+    if (isIdent(c)) {
       const w = readWord();
       const upper = w.toUpperCase();
       if (upper === "AND") toks.push({ kind: "AND" });

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/EventViewer.tsx

@@ -240,13 +240,7 @@ export function EventDetailHeader({
       </HStack>
       <HStack space={2} className="items-center">
         {actions?.map((action) => (
-          <Button
+          <Button key={action.key} variant="border" size="xs" onClick={action.onClick}>
-            key={action.key}
-            type="button"
-            variant="border"
-            size="xs"
-            onClick={action.onClick}
-          >
             {action.icon}
             {action.label}
           </Button>

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

@@ -290,10 +290,10 @@ function BaseInput({
         <HStack
           className={classNames(
             inputWrapperClassName,
-            "flex-1 min-w-0 px-2",
+            "w-full min-w-0 px-2",
             fullHeight && "h-full",
-            leftSlot ? "pl-0" : null,
+            leftSlot ? "pl-0.5 -ml-2" : null,
-            rightSlot ? "pr-0" : null,
+            rightSlot ? "pr-0.5 -mr-2" : null,
           )}
         >
           <Editor

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

@@ -1,24 +1,16 @@
 import classNames from "classnames";
 import type { HTMLAttributes, ReactElement, ReactNode } from "react";
-import { CopyIconButton } from "../CopyIconButton";
 
 interface Props {
   children:
     | ReactElement<HTMLAttributes<HTMLTableColElement>>
     | (ReactElement<HTMLAttributes<HTMLTableColElement>> | null)[];
-  selectable?: boolean;
 }
 
-export function KeyValueRows({ children, selectable }: Props) {
+export function KeyValueRows({ children }: Props) {
   const childArray = Array.isArray(children) ? children.filter(Boolean) : [children];
   return (
-    <table
+    <table className="text-editor font-mono min-w-0 w-full mb-auto">
-      className={classNames(
-        "text-editor font-mono min-w-0 w-full mb-auto",
-        selectable &&
-          "[&_td]:select-auto [&_td]:cursor-auto [&_td_*]:select-auto [&_td_*]:cursor-auto",
-      )}
-    >
       <tbody className="divide-y divide-surface-highlight">
         {childArray.map((child, i) => (
           // oxlint-disable-next-line react/no-array-index-key
@@ -34,11 +26,8 @@ interface KeyValueRowProps {
   children: ReactNode;
   rightSlot?: ReactNode;
   leftSlot?: ReactNode;
-  align?: "top" | "middle";
   labelClassName?: string;
   labelColor?: "secondary" | "primary" | "info";
-  enableCopy?: boolean;
-  copyText?: string;
 }
 
 export function KeyValueRow({
@@ -46,36 +35,14 @@ export function KeyValueRow({
   children,
   rightSlot,
   leftSlot,
-  align = "top",
   labelColor = "secondary",
   labelClassName,
-  enableCopy,
-  copyText,
 }: KeyValueRowProps) {
-  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 ? (
-      <CopyIconButton
-        text={textToCopy}
-        className="text-text-subtle"
-        size="2xs"
-        title={copyTitle}
-        iconSize="sm"
-      />
-    ) : null);
-
   return (
     <>
       <td
         className={classNames(
-          "select-none py-0.5 pr-2 h-full max-w-[10rem]",
+          "select-none py-0.5 pr-2 h-full align-top max-w-[10rem]",
-          align === "top" && "align-top",
-          align === "middle" && "align-middle",
           labelClassName,
           labelColor === "primary" && "text-primary",
           labelColor === "secondary" && "text-text-subtle",
@@ -84,21 +51,11 @@ export function KeyValueRow({
       >
         <span className="select-text cursor-text">{label}</span>
       </td>
-      <td
+      <td className="select-none py-0.5 break-all align-top max-w-[15rem]">
-        className={classNames(
-          "select-none py-0.5 break-all max-w-[15rem]",
-          align === "top" && "align-top",
-          align === "middle" && "align-middle",
-        )}
-      >
         <div className="select-text cursor-text max-h-[12rem] overflow-y-auto grid grid-cols-[auto_minmax(0,1fr)_auto]">
           {leftSlot ?? <span aria-hidden />}
           {children}
-          {resolvedRightSlot ? (
+          {rightSlot ? <div className="ml-1.5">{rightSlot}</div> : <span aria-hidden />}
-            <div className="ml-1.5">{resolvedRightSlot}</div>
-          ) : (
-            <span aria-hidden />
-          )}
         </div>
       </td>
     </>

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

@@ -43,7 +43,6 @@ export const PlainInput = forwardRef<{ focus: () => void }, PlainInputProps>(fun
     className,
     containerClassName,
     defaultValue,
-    disabled,
     forceUpdateKey: forceUpdateKeyFromAbove,
     help,
     hideLabel,
@@ -164,8 +163,7 @@ export const PlainInput = forwardRef<{ focus: () => void }, PlainInputProps>(fun
           "relative w-full rounded-md text",
           "border",
           "overflow-hidden",
-          focused && !disabled ? "border-border-focus" : "border-border-subtle",
+          focused ? "border-border-focus" : "border-border-subtle",
-          disabled && "border-dotted",
           hasChanged && "has-[:invalid]:border-danger", // For built-in HTML validation
           size === "md" && "min-h-md",
           size === "sm" && "min-h-sm",
@@ -200,13 +198,12 @@ export const PlainInput = forwardRef<{ focus: () => void }, PlainInputProps>(fun
             // oxlint-disable-next-line jsx-a11y/no-autofocus
             autoFocus={autoFocus}
             defaultValue={defaultValue ?? undefined}
-            disabled={disabled}
             autoComplete="off"
             autoCapitalize="off"
             autoCorrect="off"
             onChange={(e) => handleChange(e.target.value)}
             onPaste={(e) => onPaste?.(e.clipboardData.getData("Text"))}
-            className={classNames(commonClassName, "h-full disabled:opacity-disabled")}
+            className={classNames(commonClassName, "h-full")}
             onFocus={handleFocus}
             onBlur={handleBlur}
             required={required}

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

@@ -109,15 +109,7 @@ export function Select<T extends string>({
       ) : (
         // Use custom "select" component until Tauri can be configured to have select menus not always appear in
         // light mode
-        <RadioDropdown
+        <RadioDropdown value={value} onChange={handleChange} items={options}>
-          value={value}
-          onChange={handleChange}
-          items={options.map((o) =>
-            o.type === "separator" || o.value !== defaultValue
-              ? o
-              : { ...o, label: <>{o.label} (default)</> },
-          )}
-        >
           <Button
             className="w-full text-sm font-mono"
             justify="start"

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

@@ -24,7 +24,7 @@ export function Separator({
       )}
       <div
         className={classNames(
-          "opacity-60",
+          "h-0 border-t opacity-60",
           color == null && "border-border",
           color === "primary" && "border-primary",
           color === "secondary" && "border-secondary",
@@ -34,8 +34,8 @@ export function Separator({
           color === "danger" && "border-danger",
           color === "info" && "border-info",
           dashed && "border-dashed",
-          orientation === "horizontal" && "w-full h-0 border-t",
+          orientation === "horizontal" && "w-full h-[1px]",
-          orientation === "vertical" && "h-full w-0 border-l",
+          orientation === "vertical" && "h-full w-[1px]",
         )}
       />
     </div>

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

@@ -1,514 +0,0 @@
-import type { AnyModel } from "@yaakapp-internal/models";
-import { patchModel } from "@yaakapp-internal/models";
-import classNames from "classnames";
-import type { ReactNode } from "react";
-import { CopyIconButton } from "../CopyIconButton";
-import { Checkbox } from "./Checkbox";
-import { IconButton, type IconButtonProps } from "./IconButton";
-import { PlainInput } from "./PlainInput";
-import type { RadioDropdownItem } from "./RadioDropdown";
-import { Select } from "./Select";
-import { SelectFile } from "../SelectFile";
-
-type ModelKeyOfValue<T, V> = {
-  [K in keyof T]-?: T[K] extends V ? K : never;
-}[keyof T];
-
-type SettingRowBaseProps = {
-  className?: string;
-  controlClassName?: string;
-  description?: ReactNode;
-  disabled?: boolean;
-  title: ReactNode;
-};
-
-export function SettingsList({ children, className }: { children: ReactNode; className?: string }) {
-  return <div className={classNames("w-full", className)}>{children}</div>;
-}
-
-export function SettingsSection({
-  children,
-  className,
-  description,
-  title,
-}: {
-  children: ReactNode;
-  className?: string;
-  description?: ReactNode;
-  title: ReactNode | null;
-}) {
-  const showHeader = title != null || description != null;
-
-  return (
-    <section className={classNames(className, "w-full")}>
-      {showHeader && (
-        <div className="border-b border-border-subtle pb-2">
-          {title != null && <div className="text-text-subtle">{title}</div>}
-          {description != null && <p className="mt-1 text-sm text-text-subtlest">{description}</p>}
-        </div>
-      )}
-      <div className="[&>*:last-child]:border-b-0">{children}</div>
-    </section>
-  );
-}
-
-export function SettingRow({
-  children,
-  className,
-  controlClassName,
-  description,
-  disabled,
-  title,
-}: {
-  children: ReactNode;
-} & SettingRowBaseProps) {
-  return (
-    <div
-      aria-disabled={disabled || undefined}
-      className={classNames(
-        className,
-        "@container border-b border-border-subtle py-4",
-        disabled && "opacity-disabled",
-      )}
-    >
-      <div
-        className={classNames(
-          "grid grid-cols-1 gap-2",
-          "@[30rem]:grid-cols-[minmax(0,1fr)_auto] items-center",
-        )}
-      >
-        <div className="min-w-0">
-          <div className="text text-text">{title}</div>
-          {description != null && (
-            <div className="mt-1 max-w-2xl text-sm text-text-subtle">{description}</div>
-          )}
-        </div>
-        <div
-          className={classNames(
-            "flex min-w-0 items-center justify-start @[40rem]:justify-end",
-            controlClassName,
-          )}
-        >
-          {children}
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export function SettingValue({
-  actions,
-  className,
-  copyText,
-  enableCopy = true,
-  value,
-}: {
-  actions?: SettingValueAction[];
-  className?: string;
-  copyText?: string;
-  enableCopy?: boolean;
-  value: ReactNode;
-}) {
-  const textValue = typeof value === "string" || typeof value === "number" ? `${value}` : null;
-  const textToCopy = copyText ?? textValue;
-
-  return (
-    <>
-      <span
-        className={classNames(
-          className,
-          "cursor-text select-text truncate font-mono text-editor text-text-subtle pr-1.5",
-        )}
-      >
-        {value}
-      </span>
-      {actions?.map((action) => (
-        <IconButton
-          key={action.title}
-          icon={action.icon}
-          title={action.title}
-          size="2xs"
-          iconSize="sm"
-          onClick={action.onClick}
-        />
-      ))}
-      {enableCopy && textToCopy != null && (
-        <CopyIconButton size="2xs" text={textToCopy} title="Copy value" />
-      )}
-    </>
-  );
-}
-
-type SettingValueAction = {
-  icon: IconButtonProps["icon"];
-  onClick: () => void;
-  title: string;
-};
-
-export function SettingRowBoolean({
-  checked,
-  checkboxSize = "md",
-  onChange,
-  title,
-  ...props
-}: {
-  checked: boolean;
-  checkboxSize?: "sm" | "md";
-  onChange: (checked: boolean) => void;
-} & SettingRowBaseProps) {
-  return (
-    <SettingRow title={title} {...props}>
-      <Checkbox
-        hideLabel
-        size={checkboxSize}
-        checked={checked}
-        disabled={props.disabled}
-        title={title}
-        onChange={onChange}
-      />
-    </SettingRow>
-  );
-}
-
-export function ModelSettingRowBoolean<M extends AnyModel, K extends ModelKeyOfValue<M, boolean>>({
-  model,
-  modelKey,
-  ...props
-}: {
-  model: M;
-  modelKey: K;
-} & Omit<Parameters<typeof SettingRowBoolean>[0], "checked" | "onChange">) {
-  return (
-    <SettingRowBoolean
-      checked={model[modelKey] as boolean}
-      onChange={(value) => patchModel(model, { [modelKey]: value } as Partial<M>)}
-      {...props}
-    />
-  );
-}
-
-export function SettingRowNumber({
-  inputClassName,
-  inputWidthClassName = "!w-48",
-  name,
-  onChange,
-  placeholder,
-  required,
-  title,
-  type = "number",
-  validate,
-  value,
-  ...props
-}: {
-  inputClassName?: string;
-  inputWidthClassName?: string;
-  name: string;
-  onChange: (value: number) => void;
-  placeholder?: string;
-  required?: boolean;
-  type?: "number";
-  validate?: (value: string) => boolean;
-  value: number;
-} & SettingRowBaseProps) {
-  return (
-    <SettingRow title={title} {...props}>
-      <PlainInput
-        required={required}
-        hideLabel
-        size="sm"
-        name={name}
-        label={typeof title === "string" ? title : name}
-        placeholder={placeholder}
-        defaultValue={`${value}`}
-        validate={validate}
-        onChange={(value) => onChange(Number.parseInt(value, 10) || 0)}
-        type={type}
-        className={inputClassName}
-        containerClassName={inputWidthClassName}
-        disabled={props.disabled}
-      />
-    </SettingRow>
-  );
-}
-
-export function ModelSettingRowNumber<M extends AnyModel, K extends ModelKeyOfValue<M, number>>({
-  model,
-  modelKey,
-  ...props
-}: {
-  model: M;
-  modelKey: K;
-} & Omit<Parameters<typeof SettingRowNumber>[0], "name" | "onChange" | "value">) {
-  return (
-    <SettingRowNumber
-      name={String(modelKey)}
-      value={model[modelKey] as number}
-      onChange={(value) => patchModel(model, { [modelKey]: value } as Partial<M>)}
-      {...props}
-    />
-  );
-}
-
-export function SettingRowText({
-  inputClassName,
-  inputWidthClassName = "!w-80",
-  name,
-  onChange,
-  placeholder,
-  required,
-  title,
-  type = "text",
-  value,
-  ...props
-}: {
-  inputClassName?: string;
-  inputWidthClassName?: string;
-  name: string;
-  onChange: (value: string) => void;
-  placeholder?: string;
-  required?: boolean;
-  type?: "text" | "password";
-  value: string;
-} & SettingRowBaseProps) {
-  return (
-    <SettingRow title={title} {...props}>
-      <PlainInput
-        required={required}
-        hideLabel
-        size="sm"
-        name={name}
-        label={typeof title === "string" ? title : name}
-        placeholder={placeholder}
-        defaultValue={value}
-        onChange={onChange}
-        type={type}
-        className={inputClassName}
-        containerClassName={inputWidthClassName}
-        disabled={props.disabled}
-      />
-    </SettingRow>
-  );
-}
-
-export function ModelSettingRowText<M extends AnyModel, K extends ModelKeyOfValue<M, string>>({
-  model,
-  modelKey,
-  ...props
-}: {
-  model: M;
-  modelKey: K;
-} & Omit<Parameters<typeof SettingRowText>[0], "name" | "onChange" | "value">) {
-  return (
-    <SettingRowText
-      name={String(modelKey)}
-      value={model[modelKey] as string}
-      onChange={(value) => patchModel(model, { [modelKey]: value } as Partial<M>)}
-      {...props}
-    />
-  );
-}
-
-export function SettingRowFile({
-  buttonClassName,
-  controlClassName = "min-w-0 max-w-[min(32rem,45vw)]",
-  directory,
-  filePath,
-  nameOverride,
-  noun,
-  onChange,
-  size = "xs",
-  title,
-  ...props
-}: {
-  buttonClassName?: string;
-  directory?: boolean;
-  filePath: string | null;
-  nameOverride?: string | null;
-  noun?: string;
-  onChange: (filePath: string | null) => void | Promise<void>;
-  size?: Parameters<typeof SelectFile>[0]["size"];
-} & SettingRowBaseProps) {
-  return (
-    <SettingRow title={title} controlClassName={controlClassName} {...props}>
-      <SelectFile
-        directory={directory}
-        inline
-        hideLabel
-        label={typeof title === "string" ? title : noun}
-        size={size}
-        noun={noun}
-        nameOverride={nameOverride}
-        filePath={filePath}
-        className={buttonClassName}
-        onChange={({ filePath }) => onChange(filePath)}
-      />
-    </SettingRow>
-  );
-}
-
-export function SettingRowDirectory({
-  noun = "Directory",
-  ...props
-}: Omit<Parameters<typeof SettingRowFile>[0], "directory">) {
-  return <SettingRowFile directory noun={noun} {...props} />;
-}
-
-export function SettingRowSelect<T extends string>({
-  defaultValue,
-  name,
-  onChange,
-  options,
-  selectClassName = "!w-48",
-  title,
-  value,
-  ...props
-}: {
-  defaultValue?: T;
-  name: string;
-  onChange: (value: T) => void;
-  options: RadioDropdownItem<T>[];
-  selectClassName?: string;
-  value: T;
-} & SettingRowBaseProps) {
-  return (
-    <SettingRow title={title} {...props}>
-      <SettingSelectControl
-        name={name}
-        label={typeof title === "string" ? title : name}
-        value={value}
-        defaultValue={defaultValue}
-        selectClassName={selectClassName}
-        disabled={props.disabled}
-        onChange={onChange}
-        options={options}
-      />
-    </SettingRow>
-  );
-}
-
-export function SettingSelectControl<T extends string>({
-  defaultValue,
-  disabled,
-  label,
-  name,
-  onChange,
-  options,
-  selectClassName = "!w-48",
-  value,
-}: {
-  defaultValue?: T;
-  disabled?: boolean;
-  label: string;
-  name: string;
-  onChange: (value: T) => void;
-  options: RadioDropdownItem<T>[];
-  selectClassName?: string;
-  value: T;
-}) {
-  return (
-    <Select
-      hideLabel
-      name={name}
-      value={value}
-      defaultValue={defaultValue}
-      label={label}
-      size="sm"
-      className={selectClassName}
-      disabled={disabled}
-      onChange={onChange}
-      options={options}
-    />
-  );
-}
-
-export function ModelSettingSelectControl<
-  M extends AnyModel,
-  K extends ModelKeyOfValue<M, string>,
-  V extends M[K] & string,
->({
-  model,
-  modelKey,
-  ...props
-}: {
-  model: M;
-  modelKey: K;
-} & Omit<Parameters<typeof SettingSelectControl<V>>[0], "name" | "onChange" | "value">) {
-  return (
-    <SettingSelectControl
-      name={String(modelKey)}
-      value={model[modelKey] as V}
-      onChange={(value) => patchModel(model, { [modelKey]: value } as Partial<M>)}
-      {...props}
-    />
-  );
-}
-
-export function ModelSettingRowSelect<
-  M extends AnyModel,
-  K extends ModelKeyOfValue<M, string>,
-  V extends M[K] & string,
->({
-  model,
-  modelKey,
-  ...props
-}: {
-  model: M;
-  modelKey: K;
-} & Omit<Parameters<typeof SettingRowSelect<V>>[0], "name" | "onChange" | "value">) {
-  return (
-    <SettingRowSelect
-      name={String(modelKey)}
-      value={model[modelKey] as V}
-      onChange={(value) => patchModel(model, { [modelKey]: value } as Partial<M>)}
-      {...props}
-    />
-  );
-}
-
-export function SettingOverrideRow({
-  children,
-  className,
-  controlClassName,
-  description,
-  disabled,
-  onResetOverride,
-  overridden,
-  resetTitle = "Reset override",
-  title,
-}: {
-  children: ReactNode;
-  className?: string;
-  controlClassName?: string;
-  description?: ReactNode;
-  disabled?: boolean;
-  onResetOverride: () => void;
-  overridden: boolean;
-  resetTitle?: string;
-  title: ReactNode;
-}) {
-  return (
-    <SettingRow
-      className={className}
-      controlClassName={controlClassName}
-      description={description}
-      disabled={disabled}
-      title={
-        <span className="inline-flex items-center gap-1.5">
-          {title}
-          {overridden && (
-            <IconButton
-              icon="undo_2"
-              size="2xs"
-              iconSize="sm"
-              title={resetTitle}
-              className="text-text-subtle"
-              onClick={onResetOverride}
-            />
-          )}
-        </span>
-      }
-    >
-      {children}
-    </SettingRow>
-  );
-}

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";

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

@@ -596,7 +596,7 @@ function SetupSyncDropdown({ workspaceMeta }: { workspaceMeta: WorkspaceMeta })
           color: "success",
           label: "Open Workspace Settings",
           leftSlot: <Icon icon="settings" />,
-          onSelect: () => openWorkspaceSettings("settings"),
+          onSelect: () => openWorkspaceSettings("data"),
         },
         { type: "separator" },
         {

apps/yaak-client/components/responseViewers/HTMLOrTextViewer.tsx

@@ -69,7 +69,6 @@ function HttpTextViewer({ response, text, language, pretty, className }: HttpTex
       text={text}
       language={language}
       stateKey={`response.body.${response.id}`}
-      filterStateKey={`response.body.${response.requestId}`}
       pretty={pretty}
       className={className}
       onFilter={filterCallback}

apps/yaak-client/components/responseViewers/TextViewer.tsx

@@ -16,7 +16,6 @@ interface Props {
   text: string;
   language: EditorProps["language"];
   stateKey: string | null;
-  filterStateKey?: string | null;
   pretty?: boolean;
   className?: string;
   onFilter?: (filter: string) => {
@@ -28,25 +27,16 @@ interface Props {
 
 const useFilterText = createGlobalState<Record<string, string | null>>({});
 
-export function TextViewer({
+export function TextViewer({ language, text, stateKey, pretty, className, onFilter }: Props) {
-  language,
-  text,
-  stateKey,
-  filterStateKey,
-  pretty,
-  className,
-  onFilter,
-}: Props) {
-  const filterKey = filterStateKey ?? stateKey;
   const [filterTextMap, setFilterTextMap] = useFilterText();
-  const filterText = filterKey ? (filterTextMap[filterKey] ?? null) : null;
+  const filterText = stateKey ? (filterTextMap[stateKey] ?? null) : null;
   const debouncedFilterText = useDebouncedValue(filterText);
   const setFilterText = useCallback(
     (v: string | null) => {
-      if (!filterKey) return;
+      if (!stateKey) return;
-      setFilterTextMap((m) => ({ ...m, [filterKey]: v }));
+      setFilterTextMap((m) => ({ ...m, [stateKey]: v }));
     },
-    [filterKey, setFilterTextMap],
+    [setFilterTextMap, stateKey],
   );
 
   const isSearching = filterText != null;
@@ -74,7 +64,7 @@ export function TextViewer({
       nodes.push(
         <div key="input" className="w-full !opacity-100">
           <Input
-            key={filterKey ?? "filter"}
+            key={stateKey ?? "filter"}
             validate={!filteredResponse.error}
             hideLabel
             autoFocus
@@ -86,7 +76,7 @@ export function TextViewer({
             defaultValue={filterText}
             onKeyDown={(e) => e.key === "Escape" && toggleSearch()}
             onChange={setFilterText}
-            stateKey={filterKey ? `filter.${filterKey}` : null}
+            stateKey={stateKey ? `filter.${stateKey}` : null}
           />
         </div>,
       );
@@ -107,12 +97,12 @@ export function TextViewer({
     return nodes;
   }, [
     canFilter,
-    filterKey,
     filterText,
     filteredResponse.error,
     filteredResponse.isPending,
     isSearching,
     language,
+    stateKey,
     setFilterText,
     toggleSearch,
   ]);

apps/yaak-client/hooks/useAuthTab.tsx

@@ -43,7 +43,7 @@ export function useAuthTab<T extends string>(tabValue: T, model: AuthenticatedMo
                   {authentication.find((a) => a.name === inheritedAuth.authenticationType)
                     ?.shortLabel ?? "UNKNOWN"}
                   <IconTooltip
-                    icon="zap_off"
+                    icon="magic_wand"
                     iconSize="xs"
                     content="Authentication was inherited from an ancestor"
                   />

apps/yaak-client/hooks/useHotKey.ts

@@ -14,7 +14,6 @@ export type HotkeyAction =
   | "app.zoom_out"
   | "app.zoom_reset"
   | "command_palette.toggle"
-  | "cookies_editor.show"
   | "editor.autocomplete"
   | "environment_editor.toggle"
   | "hotkeys.showHelp"
@@ -44,7 +43,6 @@ const defaultHotkeysMac: Record<HotkeyAction, string[]> = {
   "app.zoom_out": ["Meta+Minus"],
   "app.zoom_reset": ["Meta+0"],
   "command_palette.toggle": ["Meta+k"],
-  "cookies_editor.show": ["Meta+Shift+k"],
   "editor.autocomplete": ["Control+Space"],
   "environment_editor.toggle": ["Meta+Shift+e"],
   "request.rename": ["Control+Shift+r"],
@@ -75,7 +73,6 @@ const defaultHotkeysOther: Record<HotkeyAction, string[]> = {
   "app.zoom_out": ["Control+Minus"],
   "app.zoom_reset": ["Control+0"],
   "command_palette.toggle": ["Control+k"],
-  "cookies_editor.show": ["Control+Shift+k"],
   "editor.autocomplete": ["Control+Space"],
   "environment_editor.toggle": ["Control+Shift+e"],
   "request.rename": ["F2"],
@@ -131,7 +128,6 @@ const hotkeyLabels: Record<HotkeyAction, string> = {
   "app.zoom_out": "Zoom Out",
   "app.zoom_reset": "Zoom to Actual Size",
   "command_palette.toggle": "Toggle Command Palette",
-  "cookies_editor.show": "Show Cookies",
   "editor.autocomplete": "Trigger Autocomplete",
   "environment_editor.toggle": "Edit Environments",
   "hotkeys.showHelp": "Show Keyboard Shortcuts",

apps/yaak-client/hooks/usePreferredAppearance.ts

@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
-import type { Appearance } from "@yaakapp-internal/theme";
+import type { Appearance } from "../lib/theme/appearance";
-import { getCSSAppearance, subscribeToPreferredAppearance } from "@yaakapp-internal/theme";
+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/deleteModelWithConfirm.tsx

@@ -35,15 +35,10 @@ export async function deleteModelWithConfirm(
           <>
             the following?
             <Prose className="mt-2">
-              <ul className="space-y-1">
+              <ul>
                 {models.map((m) => (
                   <li key={m.id}>
-                    <InlineCode
+                    <InlineCode>{resolvedModelName(m)}</InlineCode>
-                      className="inline-block truncate align-bottom max-w-full"
-                      title={resolvedModelName(m)}
-                    >
-                      {resolvedModelName(m)}
-                    </InlineCode>
                   </li>
                 ))}
               </ul>

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/requestSettings.ts

@@ -1,81 +0,0 @@
-import type { AnyModel, Workspace } from "@yaakapp-internal/models";
-
-type ModelType = AnyModel["model"];
-
-type WorkspaceRequestSettings = Pick<
-  Workspace,
-  | "settingFollowRedirects"
-  | "settingRequestTimeout"
-  | "settingSendCookies"
-  | "settingStoreCookies"
-  | "settingValidateCertificates"
->;
-
-type ModelForType<T extends ModelType> = Extract<AnyModel, { model: T }>;
-
-type ModelTypeWithSetting<K extends RequestSettingKey> = {
-  [M in ModelType]: K extends keyof ModelForType<M> ? M : never;
-}[ModelType];
-
-export type RequestSettingDefinition<K extends RequestSettingKey = RequestSettingKey> = {
-  defaultValue: WorkspaceRequestSettings[K];
-  description: string;
-  modelKey: K;
-  models: readonly ModelTypeWithSetting<K>[];
-  title: string;
-};
-
-export type RequestSettingKey = keyof WorkspaceRequestSettings;
-
-function defineRequestSetting<const K extends RequestSettingKey>(
-  setting: RequestSettingDefinition<K>,
-) {
-  return setting;
-}
-
-export const SETTING_REQUEST_TIMEOUT = defineRequestSetting({
-  defaultValue: 0,
-  description: "Maximum request duration in milliseconds. Set to 0 to disable.",
-  modelKey: "settingRequestTimeout",
-  models: ["workspace", "folder", "http_request"],
-  title: "Request Timeout",
-});
-
-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"],
-  title: "Validate TLS certificates",
-});
-
-export const SETTING_FOLLOW_REDIRECTS = defineRequestSetting({
-  defaultValue: true,
-  description: "Follow HTTP redirects automatically.",
-  modelKey: "settingFollowRedirects",
-  models: ["workspace", "folder", "http_request"],
-  title: "Follow redirects",
-});
-
-export const SETTING_SEND_COOKIES = defineRequestSetting({
-  defaultValue: true,
-  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",
-});
-
-export const SETTING_STORE_COOKIES = defineRequestSetting({
-  defaultValue: true,
-  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",
-});
-
-export function modelSupportsSetting<K extends RequestSettingKey>(
-  model: Pick<AnyModel, "model">,
-  setting: RequestSettingDefinition<K>,
-) {
-  return setting.models.some((modelType) => modelType === model.model);
-}

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 {
+import { defaultDarkTheme, defaultLightTheme } from "@yaakapp-internal/theme";
-  defaultDarkTheme,
+import { invokeCmd } from "../tauri";
-  defaultLightTheme,
+import type { Appearance } from "./appearance";
-  resolveAppearance,
+import { resolveAppearance } from "./appearance";
-  type Appearance,
+
-} from "@yaakapp-internal/theme";
+export { defaultDarkTheme, defaultLightTheme } from "@yaakapp-internal/theme";
-import { invokeCmd } from "./tauri";
 
 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

@@ -98,7 +98,7 @@
     "babel-plugin-react-compiler": "^1.0.0",
     "decompress": "^4.2.1",
     "internal-ip": "^8.0.0",
-    "postcss": "^8.5.14",
+    "postcss": "^8.5.6",
     "postcss-nesting": "^13.0.2",
     "rollup": "^4.60.3",
     "tailwindcss": "^3.4.17",

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

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(_)) => {
+                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::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 super::create_publish_archive;
-    use serde_json::Value;
     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/src/plugin_events.rs

@@ -473,7 +473,7 @@ async fn build_plugin_reply(
                 let names = cookie_jar
                     .cookies
                     .into_iter()
-                    .map(|c| c.name)
+                    .filter_map(|c| parse_cookie_name_value(&c.raw_cookie).map(|(name, _)| name))
                     .collect();
 
                 Some(InternalEventPayload::ListCookieNamesResponse(ListCookieNamesResponse {
@@ -531,6 +531,12 @@ async fn render_json_value_for_cli<T: TemplateCallback>(
     render_json_value_raw(value, vars, cb, opt).await
 }
 
+fn parse_cookie_name_value(raw_cookie: &str) -> Option<(String, String)> {
+    let first_part = raw_cookie.split(';').next()?.trim();
+    let (name, value) = first_part.split_once('=')?;
+    Some((name.trim().to_string(), value.to_string()))
+}
+
 fn copy_text_to_clipboard(text: &str) -> Result<(), String> {
     let mut clipboard = Clipboard::new().map_err(|e| e.to_string())?;
     clipboard.set_text(text.to_string()).map_err(|e| e.to_string())

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-cli/yaak-cli/tests/send_commands.rs

@@ -7,6 +7,34 @@ use tempfile::TempDir;
 use yaak_models::models::HttpRequest;
 use yaak_models::util::UpdateSource;
 
+#[test]
+fn top_level_send_workspace_sends_http_requests_and_prints_summary() {
+    let temp_dir = TempDir::new().expect("Failed to create temp dir");
+    let data_dir = temp_dir.path();
+    seed_workspace(data_dir, "wk_test");
+
+    let server = TestHttpServer::spawn_ok("workspace bulk send");
+    let request = HttpRequest {
+        id: "rq_workspace_send".to_string(),
+        workspace_id: "wk_test".to_string(),
+        name: "Workspace Send".to_string(),
+        method: "GET".to_string(),
+        url: server.url.clone(),
+        ..Default::default()
+    };
+    query_manager(data_dir)
+        .connect()
+        .upsert_http_request(&request, &UpdateSource::Sync)
+        .expect("Failed to seed workspace request");
+
+    cli_cmd(data_dir)
+        .args(["send", "wk_test"])
+        .assert()
+        .success()
+        .stdout(contains("workspace bulk send"))
+        .stdout(contains("Send summary: 1 succeeded, 0 failed"));
+}
+
 #[test]
 fn top_level_send_folder_sends_http_requests_and_prints_summary() {
     let temp_dir = TempDir::new().expect("Failed to create temp dir");

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 file_contents = file.as_str();
-    let workspace_context = WorkspaceContext {
+    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 {
+    let resources = import_result.resources;
-        query_manager: &query_manager,
+
-        plugin_manager: &plugin_manager,
+    let workspaces: Vec<Workspace> = resources
-        plugin_context: &plugin_context,
+        .workspaces
-        workspace_context,
+        .into_iter()
-        contents: &file,
+        .map(|mut v| {
-    })
+            v.id = maybe_gen_id::<Workspace>(&ctx, v.id.as_str(), &mut id_map);
-    .await?)
+            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,7 +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 workspace = app_handle.db().get_workspace(&unrendered_request.workspace_id)?;
 
     let plugin_manager = Arc::new((*app_handle.state::<PluginManager>()).clone());
     let encryption_manager = Arc::new((*app_handle.state::<EncryptionManager>()).clone());
@@ -330,7 +330,7 @@ async fn cmd_grpc_reflect<R: Runtime>(
             &uri,
             &proto_files,
             &metadata,
-            resolved_settings.validate_certificates.value,
+            workspace.setting_validate_certificates,
             client_certificate,
         )
         .await
@@ -353,7 +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 workspace = app_handle.db().get_workspace(&unrendered_request.workspace_id)?;
 
     let plugin_manager = Arc::new((*app_handle.state::<PluginManager>()).clone());
     let encryption_manager = Arc::new((*app_handle.state::<EncryptionManager>()).clone());
@@ -423,7 +423,7 @@ async fn cmd_grpc_go<R: Runtime>(
             uri.as_str(),
             &proto_files.iter().map(|p| PathBuf::from_str(p).unwrap()).collect(),
             &metadata,
-            resolved_settings.validate_certificates.value,
+            workspace.setting_validate_certificates,
             client_cert.clone(),
         )
         .await;
@@ -1384,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 {
+    let export_data =
-        query_manager: &app_handle.db_manager(),
+        get_workspace_export_resources(&db, &version, workspace_ids, include_private_environments)?;
-        yaak_version: &version,
+    let f = File::options()
-        export_path: Path::new(export_path),
+        .create(true)
-        workspace_ids,
+        .truncate(true)
-        include_private_environments,
+        .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]
@@ -1415,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 {
@@ -1501,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
-    {
+        .ok_or(GenericError("Failed to find plugin for info".to_string()))?
-        return Ok(plugin_handle.info());
+        .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,
-    }
 }
 
 #[tauri::command]

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

@@ -8,6 +8,7 @@ use crate::{
     workspace_from_window,
 };
 use chrono::Utc;
+use cookie::Cookie;
 use log::error;
 use std::sync::Arc;
 use tauri::{AppHandle, Emitter, Listener, Manager, Runtime};
@@ -408,7 +409,11 @@ async fn handle_host_plugin_request<R: Runtime>(
             let window = get_window_from_plugin_context(app_handle, plugin_context)?;
             let names = match cookie_jar_from_window(&window) {
                 None => Vec::new(),
-                Some(j) => j.cookies.into_iter().map(|c| c.name).collect(),
+                Some(j) => j
+                    .cookies
+                    .into_iter()
+                    .filter_map(|c| Cookie::parse(c.raw_cookie).ok().map(|c| c.name().to_string()))
+                    .collect(),
             };
             Ok(Some(InternalEventPayload::ListCookieNamesResponse(ListCookieNamesResponse {
                 names,

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

@@ -134,8 +134,7 @@ pub async fn cmd_ws_connect<R: Runtime>(
         unrendered_request.folder_id.as_deref(),
         environment_id,
     )?;
-    let resolved_settings =
+    let workspace = app_handle.db().get_workspace(&unrendered_request.workspace_id)?;
-        app_handle.db().resolve_settings_for_websocket_request(&unrendered_request)?;
     let settings = app_handle.db().get_settings();
     let (resolved_request, auth_context_id) =
         resolve_websocket_request(&window, &unrendered_request)?;
@@ -248,18 +247,11 @@ pub async fn cmd_ws_connect<R: Runtime>(
         }
     }
 
-    let mut cookie_jar = match (
-        resolved_settings.send_cookies.value || resolved_settings.store_cookies.value,
-        cookie_jar_id,
-    ) {
-        (true, Some(id)) => Some(app_handle.db().get_cookie_jar(id)?),
-        _ => None,
-    };
-    let cookie_store =
-        cookie_jar.as_ref().map(|jar| CookieStore::from_cookies(jar.cookies.clone()));
-
     // Add cookies to WS HTTP Upgrade
-    if let (true, Some(store)) = (resolved_settings.send_cookies.value, cookie_store.as_ref()) {
+    if let Some(id) = cookie_jar_id {
+        let cookie_jar = app_handle.db().get_cookie_jar(&id)?;
+        let store = CookieStore::from_cookies(cookie_jar.cookies);
+
         // Convert WS URL -> HTTP URL because our cookie store matches based on
         // Path/HttpOnly/Secure attributes even though WS upgrades are HTTP requests
         let http_url = convert_ws_url_to_http(&url);
@@ -297,7 +289,7 @@ pub async fn cmd_ws_connect<R: Runtime>(
             url.as_str(),
             headers,
             receive_tx,
-            resolved_settings.validate_certificates.value,
+            workspace.setting_validate_certificates,
             client_cert,
         )
         .await
@@ -336,23 +328,6 @@ pub async fn cmd_ws_connect<R: Runtime>(
         })
         .collect::<Vec<HttpResponseHeader>>();
 
-    if let (true, Some(cookie_jar), Some(store)) =
-        (resolved_settings.store_cookies.value, cookie_jar.as_mut(), cookie_store.as_ref())
-    {
-        let set_cookie_headers = response
-            .headers()
-            .into_iter()
-            .filter(|(name, _)| name.as_str().eq_ignore_ascii_case("set-cookie"))
-            .filter_map(|(_, value)| value.to_str().ok().map(ToString::to_string))
-            .collect::<Vec<_>>();
-
-        if !set_cookie_headers.is_empty() {
-            store.store_cookies_from_response(&convert_ws_url_to_http(&url), &set_cookie_headers);
-            cookie_jar.cookies = store.get_all_cookies();
-            app_handle.db().upsert_cookie_jar(cookie_jar, &UpdateSource::Background)?;
-        }
-    }
-
     let connection = app_handle.db().upsert_websocket_connection(
         &WebsocketConnection {
             state: WebsocketConnectionState::Connected,

crates/yaak-git/bindings/gen_models.ts

@@ -1,168 +1,45 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type DnsOverride = {
+export type DnsOverride = { hostname: string, ipv4: Array<string>, ipv6: Array<string>, enabled?: boolean, };
-  hostname: string;
-  ipv4: Array<string>;
-  ipv6: Array<string>;
-  enabled?: boolean;
-};
 
-export type Environment = {
+export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, parentModel: string, parentId: string | null, 
-  model: "environment";
+/**
-  id: string;
+ * Variables defined in this environment scope.
-  workspaceId: string;
+ * Child environments override parent variables by name.
-  createdAt: string;
+ */
-  updatedAt: string;
+variables: Array<EnvironmentVariable>, color: string | null, sortPriority: number, };
-  name: string;
-  public: boolean;
-  parentModel: string;
-  parentId: string | null;
-  /**
-   * Variables defined in this environment scope.
-   * Child environments override parent variables by name.
-   */
-  variables: Array<EnvironmentVariable>;
-  color: string | null;
-  sortPriority: number;
-};
 
-export type EnvironmentVariable = { enabled?: boolean; name: string; value: string; id?: string };
+export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, id?: string, };
 
-export type Folder = {
+export type Folder = { model: "folder", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, sortPriority: number, };
-  model: "folder";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  folderId: string | null;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  name: string;
-  sortPriority: number;
-  settingSendCookies: InheritedBoolSetting;
-  settingStoreCookies: InheritedBoolSetting;
-  settingValidateCertificates: InheritedBoolSetting;
-  settingFollowRedirects: InheritedBoolSetting;
-  settingRequestTimeout: InheritedIntSetting;
-};
 
-export type GrpcRequest = {
+export type GrpcRequest = { model: "grpc_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authenticationType: string | null, authentication: Record<string, any>, description: string, message: string, metadata: Array<HttpRequestHeader>, method: string | null, name: string, service: string | null, sortPriority: number, 
-  model: "grpc_request";
+/**
-  id: string;
+ * Server URL (http for plaintext or https for secure)
-  createdAt: string;
+ */
-  updatedAt: string;
+url: string, };
-  workspaceId: string;
-  folderId: string | null;
-  authenticationType: string | null;
-  authentication: Record<string, any>;
-  description: string;
-  message: string;
-  metadata: Array<HttpRequestHeader>;
-  method: string | null;
-  name: string;
-  service: string | null;
-  sortPriority: number;
-  /**
-   * Server URL (http for plaintext or https for secure)
-   */
-  url: string;
-  settingValidateCertificates: InheritedBoolSetting;
-};
 
-export type HttpRequest = {
+export type HttpRequest = { model: "http_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, body: Record<string, any>, bodyType: string | null, description: string, headers: Array<HttpRequestHeader>, method: string, name: string, sortPriority: number, url: string, 
-  model: "http_request";
+/**
-  id: string;
+ * URL parameters used for both path placeholders (`:id`) and query string entries.
-  createdAt: string;
+ */
-  updatedAt: string;
+urlParameters: Array<HttpUrlParameter>, };
-  workspaceId: string;
-  folderId: string | null;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  body: Record<string, any>;
-  bodyType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  method: string;
-  name: string;
-  sortPriority: number;
-  url: string;
-  /**
-   * URL parameters used for both path placeholders (`:id`) and query string entries.
-   */
-  urlParameters: Array<HttpUrlParameter>;
-  settingSendCookies: InheritedBoolSetting;
-  settingStoreCookies: InheritedBoolSetting;
-  settingValidateCertificates: InheritedBoolSetting;
-  settingFollowRedirects: InheritedBoolSetting;
-  settingRequestTimeout: InheritedIntSetting;
-};
 
-export type HttpRequestHeader = { enabled?: boolean; name: string; value: string; id?: string };
+export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, id?: string, };
 
-export type HttpUrlParameter = {
+export type HttpUrlParameter = { enabled?: boolean, 
-  enabled?: boolean;
+/**
-  /**
+ * Colon-prefixed parameters are treated as path parameters if they match, like `/users/:id`
-   * Colon-prefixed parameters are treated as path parameters if they match, like `/users/:id`
+ * Other entries are appended as query parameters
-   * Other entries are appended as query parameters
+ */
-   */
+name: string, value: string, id?: string, };
-  name: string;
-  value: string;
-  id?: string;
-};
 
-export type InheritedBoolSetting = { enabled?: boolean; value: boolean };
+export type SyncModel = { "type": "workspace" } & Workspace | { "type": "environment" } & Environment | { "type": "folder" } & Folder | { "type": "http_request" } & HttpRequest | { "type": "grpc_request" } & GrpcRequest | { "type": "websocket_request" } & WebsocketRequest;
 
-export type InheritedIntSetting = { enabled?: boolean; value: number };
+export type WebsocketRequest = { model: "websocket_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, message: string, name: string, sortPriority: number, url: string, 
+/**
+ * URL parameters used for both path placeholders (`:id`) and query string entries.
+ */
+urlParameters: Array<HttpUrlParameter>, };
 
-export type SyncModel =
+export type Workspace = { model: "workspace", id: string, createdAt: string, updatedAt: string, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, encryptionKeyChallenge: string | null, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, settingDnsOverrides: Array<DnsOverride>, };
-  | ({ type: "workspace" } & Workspace)
-  | ({ type: "environment" } & Environment)
-  | ({ type: "folder" } & Folder)
-  | ({ type: "http_request" } & HttpRequest)
-  | ({ type: "grpc_request" } & GrpcRequest)
-  | ({ type: "websocket_request" } & WebsocketRequest);
-
-export type WebsocketRequest = {
-  model: "websocket_request";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  folderId: string | null;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  message: string;
-  name: string;
-  sortPriority: number;
-  url: string;
-  /**
-   * URL parameters used for both path placeholders (`:id`) and query string entries.
-   */
-  urlParameters: Array<HttpUrlParameter>;
-  settingSendCookies: InheritedBoolSetting;
-  settingStoreCookies: InheritedBoolSetting;
-  settingValidateCertificates: InheritedBoolSetting;
-};
-
-export type Workspace = {
-  model: "workspace";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  name: string;
-  encryptionKeyChallenge: string | null;
-  settingValidateCertificates: boolean;
-  settingFollowRedirects: boolean;
-  settingRequestTimeout: number;
-  settingDnsOverrides: Array<DnsOverride>;
-  settingSendCookies: boolean;
-  settingStoreCookies: boolean;
-};

crates/yaak-http/src/cookies.rs

@@ -7,7 +7,7 @@ use log::debug;
 use std::sync::{Arc, Mutex};
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 use url::Url;
-use yaak_models::models::{Cookie, CookieDomain, CookieExpires, CookieSameSite};
+use yaak_models::models::{Cookie, CookieDomain, CookieExpires};
 
 /// A thread-safe cookie store that can be shared across requests
 #[derive(Debug, Clone)]
@@ -45,7 +45,10 @@ impl CookieStore {
         let matching_cookies: Vec<_> = cookies
             .iter()
             .filter(|cookie| self.cookie_matches(cookie, url, &now))
-            .map(|cookie| (cookie.name.clone(), cookie.value.clone()))
+            .filter_map(|cookie| {
+                // Parse the raw cookie to get name=value
+                parse_cookie_name_value(&cookie.raw_cookie)
+            })
             .collect();
 
         if matching_cookies.is_empty() {
@@ -69,7 +72,13 @@ impl CookieStore {
             if let Some(cookie) = parse_set_cookie(header_value, url) {
                 // Remove any existing cookie with the same name and domain
                 cookies.retain(|existing| !cookies_match(existing, &cookie));
-                debug!("Storing cookie: {} for domain {:?}", cookie.name, cookie.domain);
+                debug!(
+                    "Storing cookie: {} for domain {:?}",
+                    parse_cookie_name_value(&cookie.raw_cookie)
+                        .map(|(n, _)| n)
+                        .unwrap_or_else(|| "unknown".to_string()),
+                    cookie.domain
+                );
                 cookies.push(cookie);
             }
         }
@@ -108,9 +117,10 @@ impl CookieStore {
         }
 
         // Check path
+        let (cookie_path, _) = &cookie.path;
         let url_path = url.path();
 
-        path_matches(url_path, &cookie.path)
+        path_matches(url_path, cookie_path)
     }
 }
 
@@ -123,7 +133,8 @@ pub fn get_cookie_value_from_jar(
     let domain = domain.and_then(normalize_cookie_domain_filter);
 
     cookies.into_iter().find_map(|cookie| {
-        if cookie.name != name {
+        let (cookie_name, value) = parse_cookie_name_value(&cookie.raw_cookie)?;
+        if cookie_name != name {
             return None;
         }
 
@@ -133,12 +144,11 @@ pub fn get_cookie_value_from_jar(
             }
         }
 
-        Some(cookie.value)
+        Some(value)
     })
 }
 
 /// Parse name=value from a cookie string (raw_cookie format)
-#[cfg(test)]
 fn parse_cookie_name_value(raw_cookie: &str) -> Option<(String, String)> {
     // The raw_cookie typically looks like "name=value" or "name=value; attr1; attr2=..."
     let first_part = raw_cookie.split(';').next()?;
@@ -167,6 +177,8 @@ fn cookie_domain_matches_filter(cookie_domain: &CookieDomain, domain: &str) -> b
 fn parse_set_cookie(header_value: &str, request_url: &Url) -> Option<Cookie> {
     let parsed = cookie::Cookie::parse(header_value).ok()?;
 
+    let raw_cookie = format!("{}={}", parsed.name(), parsed.value());
+
     // Determine domain
     let domain = if let Some(domain_attr) = parsed.domain() {
         // Domain attribute present - this is a suffix match
@@ -204,28 +216,14 @@ fn parse_set_cookie(header_value: &str, request_url: &Url) -> Option<Cookie> {
 
     // Determine path
     let path = if let Some(path_attr) = parsed.path() {
-        path_attr.to_string()
+        (path_attr.to_string(), true)
     } else {
         // Default path is the directory of the request URI
-        default_cookie_path(request_url.path())
+        let default_path = default_cookie_path(request_url.path());
+        (default_path, false)
     };
 
-    let same_site = parsed.same_site().map(|same_site| match same_site {
+    Some(Cookie { raw_cookie, domain, expires, path })
-        cookie::SameSite::Strict => CookieSameSite::Strict,
-        cookie::SameSite::Lax => CookieSameSite::Lax,
-        cookie::SameSite::None => CookieSameSite::None,
-    });
-
-    Some(Cookie {
-        name: parsed.name().to_string(),
-        value: parsed.value().to_string(),
-        domain,
-        expires,
-        path,
-        secure: parsed.secure().unwrap_or(false),
-        http_only: parsed.http_only().unwrap_or(false),
-        same_site,
-    })
 }
 
 /// Get the default cookie path from a request path (RFC 6265 Section 5.1.4)
@@ -263,7 +261,10 @@ fn path_matches(request_path: &str, cookie_path: &str) -> bool {
 
 /// Check if two cookies match (same name and domain)
 fn cookies_match(a: &Cookie, b: &Cookie) -> bool {
-    if a.name != b.name {
+    let name_a = parse_cookie_name_value(&a.raw_cookie).map(|(n, _)| n);
+    let name_b = parse_cookie_name_value(&b.raw_cookie).map(|(n, _)| n);
+
+    if name_a != name_b {
         return false;
     }
 
@@ -316,16 +317,11 @@ mod tests {
     use super::*;
 
     fn cookie(raw_cookie: &str, domain: CookieDomain) -> Cookie {
-        let (name, value) = parse_cookie_name_value(raw_cookie).unwrap();
         Cookie {
-            name,
+            raw_cookie: raw_cookie.to_string(),
-            value,
             domain,
             expires: CookieExpires::SessionEnd,
-            path: "/".to_string(),
+            path: ("/".to_string(), false),
-            secure: false,
-            http_only: false,
-            same_site: None,
         }
     }
 

crates/yaak-http/src/sender.rs

@@ -24,13 +24,7 @@ pub enum RedirectBehavior {
 
 #[derive(Debug, Clone)]
 pub enum HttpResponseEvent {
-    Setting {
+    Setting(String, String),
-        name: String,
-        value: String,
-        source_model: Option<String>,
-        source_id: Option<String>,
-        source_name: Option<String>,
-    },
     Info(String),
     Redirect {
         url: String,
@@ -73,9 +67,7 @@ pub enum HttpResponseEvent {
 impl Display for HttpResponseEvent {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            HttpResponseEvent::Setting { name, value, .. } => {
+            HttpResponseEvent::Setting(name, value) => write!(f, "* Setting {}={}", name, value),
-                write!(f, "* Setting {}={}", name, value)
-            }
             HttpResponseEvent::Info(s) => write!(f, "* {}", s),
             HttpResponseEvent::Redirect {
                 url,
@@ -154,9 +146,7 @@ impl From<HttpResponseEvent> for yaak_models::models::HttpResponseEventData {
     fn from(event: HttpResponseEvent) -> Self {
         use yaak_models::models::HttpResponseEventData as D;
         match event {
-            HttpResponseEvent::Setting { name, value, source_model, source_id, source_name } => {
+            HttpResponseEvent::Setting(name, value) => D::Setting { name, value },
-                D::Setting { name, value, source_model, source_id, source_name }
-            }
             HttpResponseEvent::Info(message) => D::Info { message },
             HttpResponseEvent::Redirect {
                 url,
@@ -493,6 +483,15 @@ impl HttpSender for ReqwestSender {
 
         // Send the request
         let sendable_req = req_builder.build()?;
+        send_event(HttpResponseEvent::Setting(
+            "timeout".to_string(),
+            if request.options.timeout.unwrap_or_default().is_zero() {
+                "Infinity".to_string()
+            } else {
+                format!("{:?}", request.options.timeout)
+            },
+        ));
+
         send_event(HttpResponseEvent::SendUrl {
             method: sendable_req.method().to_string(),
             scheme: sendable_req.url().scheme().to_string(),

crates/yaak-http/src/transaction.rs

@@ -12,58 +12,22 @@ pub struct HttpTransaction<S: HttpSender> {
     sender: S,
     max_redirects: usize,
     cookie_store: Option<CookieStore>,
-    send_cookies: bool,
-    store_cookies: bool,
 }
 
 impl<S: HttpSender> HttpTransaction<S> {
     /// Create a new transaction with default settings
     pub fn new(sender: S) -> Self {
-        Self {
+        Self { sender, max_redirects: 10, cookie_store: None }
-            sender,
-            max_redirects: 10,
-            cookie_store: None,
-            send_cookies: false,
-            store_cookies: false,
-        }
     }
 
     /// Create a new transaction with custom max redirects
     pub fn with_max_redirects(sender: S, max_redirects: usize) -> Self {
-        Self {
+        Self { sender, max_redirects, cookie_store: None }
-            sender,
-            max_redirects,
-            cookie_store: None,
-            send_cookies: false,
-            store_cookies: false,
-        }
     }
 
     /// Create a new transaction with a cookie store
     pub fn with_cookie_store(sender: S, cookie_store: CookieStore) -> Self {
-        Self {
+        Self { sender, max_redirects: 10, cookie_store: Some(cookie_store) }
-            sender,
-            max_redirects: 10,
-            cookie_store: Some(cookie_store),
-            send_cookies: true,
-            store_cookies: true,
-        }
-    }
-
-    /// Create a new transaction with a cookie store and explicit send/store behavior
-    pub fn with_cookie_behavior(
-        sender: S,
-        cookie_store: CookieStore,
-        send_cookies: bool,
-        store_cookies: bool,
-    ) -> Self {
-        Self {
-            sender,
-            max_redirects: 10,
-            cookie_store: Some(cookie_store),
-            send_cookies,
-            store_cookies,
-        }
     }
 
     /// Create a new transaction with custom max redirects and a cookie store
@@ -72,13 +36,7 @@ impl<S: HttpSender> HttpTransaction<S> {
         max_redirects: usize,
         cookie_store: Option<CookieStore>,
     ) -> Self {
-        Self {
+        Self { sender, max_redirects, cookie_store }
-            sender,
-            max_redirects,
-            send_cookies: cookie_store.is_some(),
-            store_cookies: cookie_store.is_some(),
-            cookie_store,
-        }
     }
 
     /// Execute the request with cancellation support.
@@ -108,11 +66,9 @@ impl<S: HttpSender> HttpTransaction<S> {
             }
 
             // Inject cookies into headers if we have a cookie store
-            let headers_with_cookies = if self.send_cookies {
+            let headers_with_cookies = if let Some(cookie_store) = &self.cookie_store {
                 let mut headers = current_headers.clone();
-                if let (Some(cookie_store), Ok(url)) =
+                if let Ok(url) = Url::parse(&current_url) {
-                    (&self.cookie_store, Url::parse(&current_url))
-                {
                     if let Some(cookie_header) = cookie_store.get_cookie_header(&url) {
                         debug!("Injecting Cookie header: {}", cookie_header);
                         // Check if there's already a Cookie header and merge if so
@@ -144,6 +100,12 @@ impl<S: HttpSender> HttpTransaction<S> {
                 options: request.options.clone(),
             };
 
+            // Send the request
+            send_event(HttpResponseEvent::Setting(
+                "redirects".to_string(),
+                request.options.follow_redirects.to_string(),
+            ));
+
             // Execute with cancellation support
             let response = tokio::select! {
                 result = self.sender.send(req, event_tx.clone()) => result?,
@@ -153,10 +115,8 @@ impl<S: HttpSender> HttpTransaction<S> {
             };
 
             // Parse Set-Cookie headers and store cookies
-            if self.store_cookies {
+            if let Some(cookie_store) = &self.cookie_store {
-                if let (Some(cookie_store), Ok(url)) =
+                if let Ok(url) = Url::parse(&current_url) {
-                    (&self.cookie_store, Url::parse(&current_url))
-                {
                     let set_cookie_headers: Vec<String> = response
                         .headers
                         .iter()
@@ -619,14 +579,10 @@ mod tests {
 
         // Create a cookie store with a test cookie
         let cookie = Cookie {
-            name: "session".to_string(),
+            raw_cookie: "session=abc123".to_string(),
-            value: "abc123".to_string(),
             domain: CookieDomain::HostOnly("example.com".to_string()),
             expires: CookieExpires::SessionEnd,
-            path: "/".to_string(),
+            path: ("/".to_string(), false),
-            secure: false,
-            http_only: false,
-            same_site: None,
         };
         let cookie_store = CookieStore::from_cookies(vec![cookie]);
 
@@ -646,67 +602,6 @@ mod tests {
         assert!(result.is_ok());
     }
 
-    #[tokio::test]
-    async fn test_cookie_injection_can_be_disabled() {
-        struct CookieRejectingSender;
-
-        #[async_trait]
-        impl HttpSender for CookieRejectingSender {
-            async fn send(
-                &self,
-                request: SendableHttpRequest,
-                _event_tx: mpsc::Sender<HttpResponseEvent>,
-            ) -> Result<HttpResponse> {
-                let cookie_header =
-                    request.headers.iter().find(|(k, _)| k.eq_ignore_ascii_case("cookie"));
-                assert!(cookie_header.is_none(), "Cookie header should not be present");
-
-                let body_stream: Pin<Box<dyn AsyncRead + Send>> =
-                    Box::pin(std::io::Cursor::new(vec![]));
-                Ok(HttpResponse::new(
-                    200,
-                    None,
-                    Vec::new(),
-                    Vec::new(),
-                    None,
-                    "https://example.com".to_string(),
-                    None,
-                    Some("HTTP/1.1".to_string()),
-                    body_stream,
-                    ContentEncoding::Identity,
-                ))
-            }
-        }
-
-        use yaak_models::models::{Cookie, CookieDomain, CookieExpires};
-
-        let cookie = Cookie {
-            name: "session".to_string(),
-            value: "abc123".to_string(),
-            domain: CookieDomain::HostOnly("example.com".to_string()),
-            expires: CookieExpires::SessionEnd,
-            path: "/".to_string(),
-            secure: false,
-            http_only: false,
-            same_site: None,
-        };
-        let cookie_store = CookieStore::from_cookies(vec![cookie]);
-        let transaction =
-            HttpTransaction::with_cookie_behavior(CookieRejectingSender, cookie_store, false, true);
-
-        let request = SendableHttpRequest {
-            url: "https://example.com/api".to_string(),
-            method: "GET".to_string(),
-            headers: vec![],
-            ..Default::default()
-        };
-
-        let (_tx, rx) = tokio::sync::watch::channel(false);
-        let (event_tx, _event_rx) = mpsc::channel(100);
-        let result = transaction.execute_with_cancellation(request, rx, event_tx).await;
-        assert!(result.is_ok());
-    }
-
     #[tokio::test]
     async fn test_set_cookie_parsing() {
         // Create a cookie store
@@ -760,62 +655,7 @@ mod tests {
         // Verify the cookie was stored
         let cookies = cookie_store.get_all_cookies();
         assert_eq!(cookies.len(), 1);
-        assert_eq!(cookies[0].name, "session");
+        assert!(cookies[0].raw_cookie.contains("session=xyz789"));
-        assert_eq!(cookies[0].value, "xyz789");
-    }
-
-    #[tokio::test]
-    async fn test_set_cookie_storage_can_be_disabled() {
-        let cookie_store = CookieStore::new();
-
-        struct SetCookieSender;
-
-        #[async_trait]
-        impl HttpSender for SetCookieSender {
-            async fn send(
-                &self,
-                _request: SendableHttpRequest,
-                _event_tx: mpsc::Sender<HttpResponseEvent>,
-            ) -> Result<HttpResponse> {
-                let headers =
-                    vec![("set-cookie".to_string(), "session=xyz789; Path=/".to_string())];
-
-                let body_stream: Pin<Box<dyn AsyncRead + Send>> =
-                    Box::pin(std::io::Cursor::new(vec![]));
-                Ok(HttpResponse::new(
-                    200,
-                    None,
-                    headers,
-                    Vec::new(),
-                    None,
-                    "https://example.com".to_string(),
-                    None,
-                    Some("HTTP/1.1".to_string()),
-                    body_stream,
-                    ContentEncoding::Identity,
-                ))
-            }
-        }
-
-        let transaction = HttpTransaction::with_cookie_behavior(
-            SetCookieSender,
-            cookie_store.clone(),
-            true,
-            false,
-        );
-
-        let request = SendableHttpRequest {
-            url: "https://example.com/login".to_string(),
-            method: "POST".to_string(),
-            headers: vec![],
-            ..Default::default()
-        };
-
-        let (_tx, rx) = tokio::sync::watch::channel(false);
-        let (event_tx, _event_rx) = mpsc::channel(100);
-        let result = transaction.execute_with_cancellation(request, rx, event_tx).await;
-        assert!(result.is_ok());
-        assert!(cookie_store.get_all_cookies().is_empty());
     }
 
     #[tokio::test]
@@ -879,15 +719,17 @@ mod tests {
         let cookies = cookie_store.get_all_cookies();
         assert_eq!(cookies.len(), 3, "All three Set-Cookie headers should be parsed and stored");
 
-        let cookie_values: Vec<_> =
+        let cookie_values: Vec<&str> = cookies.iter().map(|c| c.raw_cookie.as_str()).collect();
-            cookies.iter().map(|c| format!("{}={}", c.name, c.value)).collect();
         assert!(
-            cookie_values.iter().any(|c| c == "session=abc123"),
+            cookie_values.iter().any(|c| c.contains("session=abc123")),
             "session cookie should be stored"
         );
-        assert!(cookie_values.iter().any(|c| c == "user_id=42"), "user_id cookie should be stored");
         assert!(
-            cookie_values.iter().any(|c| c == "preferences=dark"),
+            cookie_values.iter().any(|c| c.contains("user_id=42")),
+            "user_id cookie should be stored"
+        );
+        assert!(
+            cookie_values.iter().any(|c| c.contains("preferences=dark")),
             "preferences cookie should be stored"
         );
     }

crates/yaak-models/bindings/gen_models.ts

@@ -1,514 +1,121 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ModelChangeEvent } from "./ModelChangeEvent";
 
-export type AnyModel =
+export type AnyModel = CookieJar | Environment | Folder | GraphQlIntrospection | GrpcConnection | GrpcEvent | GrpcRequest | HttpRequest | HttpResponse | HttpResponseEvent | KeyValue | Plugin | Settings | SyncState | WebsocketConnection | WebsocketEvent | WebsocketRequest | Workspace | WorkspaceMeta;
-  | CookieJar
-  | Environment
-  | Folder
-  | GraphQlIntrospection
-  | GrpcConnection
-  | GrpcEvent
-  | GrpcRequest
-  | HttpRequest
-  | HttpResponse
-  | HttpResponseEvent
-  | KeyValue
-  | Plugin
-  | Settings
-  | SyncState
-  | WebsocketConnection
-  | WebsocketEvent
-  | WebsocketRequest
-  | Workspace
-  | WorkspaceMeta;
 
-export type ClientCertificate = {
+export type ClientCertificate = { host: string, port: number | null, crtFile: string | null, keyFile: string | null, pfxFile: string | null, passphrase: string | null, enabled?: boolean, };
-  host: string;
-  port: number | null;
-  crtFile: string | null;
-  keyFile: string | null;
-  pfxFile: string | null;
-  passphrase: string | null;
-  enabled?: boolean;
-};
 
-export type Cookie = {
+export type Cookie = { raw_cookie: string, domain: CookieDomain, expires: CookieExpires, path: [string, boolean], };
-  name: string;
-  value: string;
-  domain: CookieDomain;
-  expires: CookieExpires;
-  path: string;
-  secure: boolean;
-  httpOnly: boolean;
-  sameSite: CookieSameSite | null;
-};
 
-export type CookieDomain = { HostOnly: string } | { Suffix: string } | "NotPresent" | "Empty";
+export type CookieDomain = { "HostOnly": string } | { "Suffix": string } | "NotPresent" | "Empty";
 
-export type CookieExpires = { AtUtc: string } | "SessionEnd";
+export type CookieExpires = { "AtUtc": string } | "SessionEnd";
 
-export type CookieJar = {
+export type CookieJar = { model: "cookie_jar", id: string, createdAt: string, updatedAt: string, workspaceId: string, cookies: Array<Cookie>, name: string, };
-  model: "cookie_jar";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  cookies: Array<Cookie>;
-  name: string;
-};
 
-export type CookieSameSite = "Strict" | "Lax" | "None";
+export type DnsOverride = { hostname: string, ipv4: Array<string>, ipv6: Array<string>, enabled?: boolean, };
-
-export type DnsOverride = {
-  hostname: string;
-  ipv4: Array<string>;
-  ipv6: Array<string>;
-  enabled?: boolean;
-};
 
 export type EditorKeymap = "default" | "vim" | "vscode" | "emacs";
 
-export type EncryptedKey = { encryptedKey: string };
+export type EncryptedKey = { encryptedKey: string, };
 
-export type Environment = {
+export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, parentModel: string, parentId: string | null, 
-  model: "environment";
+/**
-  id: string;
+ * Variables defined in this environment scope.
-  workspaceId: string;
+ * Child environments override parent variables by name.
-  createdAt: string;
+ */
-  updatedAt: string;
+variables: Array<EnvironmentVariable>, color: string | null, sortPriority: number, };
-  name: string;
-  public: boolean;
-  parentModel: string;
-  parentId: string | null;
-  /**
-   * Variables defined in this environment scope.
-   * Child environments override parent variables by name.
-   */
-  variables: Array<EnvironmentVariable>;
-  color: string | null;
-  sortPriority: number;
-};
 
-export type EnvironmentVariable = { enabled?: boolean; name: string; value: string; id?: string };
+export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, id?: string, };
 
-export type Folder = {
+export type Folder = { model: "folder", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, sortPriority: number, };
-  model: "folder";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  folderId: string | null;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  name: string;
-  sortPriority: number;
-  settingSendCookies: InheritedBoolSetting;
-  settingStoreCookies: InheritedBoolSetting;
-  settingValidateCertificates: InheritedBoolSetting;
-  settingFollowRedirects: InheritedBoolSetting;
-  settingRequestTimeout: InheritedIntSetting;
-};
 
-export type GraphQlIntrospection = {
+export type GraphQlIntrospection = { model: "graphql_introspection", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, content: string | null, };
-  model: "graphql_introspection";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  requestId: string;
-  content: string | null;
-};
 
-export type GrpcConnection = {
+export type GrpcConnection = { model: "grpc_connection", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, elapsed: number, error: string | null, method: string, service: string, status: number, state: GrpcConnectionState, trailers: { [key in string]?: string }, url: string, };
-  model: "grpc_connection";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  requestId: string;
-  elapsed: number;
-  error: string | null;
-  method: string;
-  service: string;
-  status: number;
-  state: GrpcConnectionState;
-  trailers: { [key in string]?: string };
-  url: string;
-};
 
 export type GrpcConnectionState = "initialized" | "connected" | "closed";
 
-export type GrpcEvent = {
+export type GrpcEvent = { model: "grpc_event", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, connectionId: string, content: string, error: string | null, eventType: GrpcEventType, metadata: { [key in string]?: string }, status: number | null, };
-  model: "grpc_event";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  requestId: string;
-  connectionId: string;
-  content: string;
-  error: string | null;
-  eventType: GrpcEventType;
-  metadata: { [key in string]?: string };
-  status: number | null;
-};
 
-export type GrpcEventType =
+export type GrpcEventType = "info" | "error" | "client_message" | "server_message" | "connection_start" | "connection_end";
-  | "info"
-  | "error"
-  | "client_message"
-  | "server_message"
-  | "connection_start"
-  | "connection_end";
 
-export type GrpcRequest = {
+export type GrpcRequest = { model: "grpc_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authenticationType: string | null, authentication: Record<string, any>, description: string, message: string, metadata: Array<HttpRequestHeader>, method: string | null, name: string, service: string | null, sortPriority: number, 
-  model: "grpc_request";
+/**
-  id: string;
+ * Server URL (http for plaintext or https for secure)
-  createdAt: string;
+ */
-  updatedAt: string;
+url: string, };
-  workspaceId: string;
-  folderId: string | null;
-  authenticationType: string | null;
-  authentication: Record<string, any>;
-  description: string;
-  message: string;
-  metadata: Array<HttpRequestHeader>;
-  method: string | null;
-  name: string;
-  service: string | null;
-  sortPriority: number;
-  /**
-   * Server URL (http for plaintext or https for secure)
-   */
-  url: string;
-  settingValidateCertificates: InheritedBoolSetting;
-};
 
-export type HttpRequest = {
+export type HttpRequest = { model: "http_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, body: Record<string, any>, bodyType: string | null, description: string, headers: Array<HttpRequestHeader>, method: string, name: string, sortPriority: number, url: string, 
-  model: "http_request";
+/**
-  id: string;
+ * URL parameters used for both path placeholders (`:id`) and query string entries.
-  createdAt: string;
+ */
-  updatedAt: string;
+urlParameters: Array<HttpUrlParameter>, };
-  workspaceId: string;
-  folderId: string | null;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  body: Record<string, any>;
-  bodyType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  method: string;
-  name: string;
-  sortPriority: number;
-  url: string;
-  /**
-   * URL parameters used for both path placeholders (`:id`) and query string entries.
-   */
-  urlParameters: Array<HttpUrlParameter>;
-  settingSendCookies: InheritedBoolSetting;
-  settingStoreCookies: InheritedBoolSetting;
-  settingValidateCertificates: InheritedBoolSetting;
-  settingFollowRedirects: InheritedBoolSetting;
-  settingRequestTimeout: InheritedIntSetting;
-};
 
-export type HttpRequestHeader = { enabled?: boolean; name: string; value: string; id?: string };
+export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, id?: string, };
 
-export type HttpResponse = {
+export type HttpResponse = { model: "http_response", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, bodyPath: string | null, contentLength: number | null, contentLengthCompressed: number | null, elapsed: number, elapsedHeaders: number, elapsedDns: number, error: string | null, headers: Array<HttpResponseHeader>, remoteAddr: string | null, requestContentLength: number | null, requestHeaders: Array<HttpResponseHeader>, status: number, statusReason: string | null, state: HttpResponseState, url: string, version: string | null, };
-  model: "http_response";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  requestId: string;
-  bodyPath: string | null;
-  contentLength: number | null;
-  contentLengthCompressed: number | null;
-  elapsed: number;
-  elapsedHeaders: number;
-  elapsedDns: number;
-  error: string | null;
-  headers: Array<HttpResponseHeader>;
-  remoteAddr: string | null;
-  requestContentLength: number | null;
-  requestHeaders: Array<HttpResponseHeader>;
-  status: number;
-  statusReason: string | null;
-  state: HttpResponseState;
-  url: string;
-  version: string | null;
-};
 
-export type HttpResponseEvent = {
+export type HttpResponseEvent = { model: "http_response_event", id: string, createdAt: string, updatedAt: string, workspaceId: string, responseId: string, event: HttpResponseEventData, };
-  model: "http_response_event";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  responseId: string;
-  event: HttpResponseEventData;
-};
 
 /**
  * Serializable representation of HTTP response events for DB storage.
  * This mirrors `yaak_http::sender::HttpResponseEvent` but with serde support.
  * The `From` impl is in yaak-http to avoid circular dependencies.
  */
-export type HttpResponseEventData =
+export type HttpResponseEventData = { "type": "setting", name: string, value: string, } | { "type": "info", message: string, } | { "type": "redirect", url: string, status: number, behavior: string, dropped_body: boolean, dropped_headers: Array<string>, } | { "type": "send_url", method: string, scheme: string, username: string, password: string, host: string, port: number, path: string, query: string, fragment: string, } | { "type": "receive_url", version: string, status: string, } | { "type": "header_up", name: string, value: string, } | { "type": "header_down", name: string, value: string, } | { "type": "chunk_sent", bytes: number, } | { "type": "chunk_received", bytes: number, } | { "type": "dns_resolved", hostname: string, addresses: Array<string>, duration: bigint, overridden: boolean, };
-  | {
-      type: "setting";
-      name: string;
-      value: string;
-      source_model?: string;
-      source_id?: string;
-      source_name?: string;
-    }
-  | { type: "info"; message: string }
-  | {
-      type: "redirect";
-      url: string;
-      status: number;
-      behavior: string;
-      dropped_body: boolean;
-      dropped_headers: Array<string>;
-    }
-  | {
-      type: "send_url";
-      method: string;
-      scheme: string;
-      username: string;
-      password: string;
-      host: string;
-      port: number;
-      path: string;
-      query: string;
-      fragment: string;
-    }
-  | { type: "receive_url"; version: string; status: string }
-  | { type: "header_up"; name: string; value: string }
-  | { type: "header_down"; name: string; value: string }
-  | { type: "chunk_sent"; bytes: number }
-  | { type: "chunk_received"; bytes: number }
-  | {
-      type: "dns_resolved";
-      hostname: string;
-      addresses: Array<string>;
-      duration: bigint;
-      overridden: boolean;
-    };
 
-export type HttpResponseHeader = { name: string; value: string };
+export type HttpResponseHeader = { name: string, value: string, };
 
 export type HttpResponseState = "initialized" | "connected" | "closed";
 
-export type HttpUrlParameter = {
+export type HttpUrlParameter = { enabled?: boolean, 
-  enabled?: boolean;
+/**
-  /**
+ * Colon-prefixed parameters are treated as path parameters if they match, like `/users/:id`
-   * Colon-prefixed parameters are treated as path parameters if they match, like `/users/:id`
+ * Other entries are appended as query parameters
-   * Other entries are appended as query parameters
+ */
-   */
+name: string, value: string, id?: string, };
-  name: string;
-  value: string;
-  id?: string;
-};
 
-export type InheritedBoolSetting = { enabled?: boolean; value: boolean };
+export type KeyValue = { model: "key_value", id: string, createdAt: string, updatedAt: string, key: string, namespace: string, value: string, };
 
-export type InheritedIntSetting = { enabled?: boolean; value: number };
+export type ModelPayload = { model: AnyModel, updateSource: UpdateSource, change: ModelChangeEvent, };
 
-export type KeyValue = {
+export type ParentAuthentication = { authentication: Record<string, any>, authenticationType: string | null, };
-  model: "key_value";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  key: string;
-  namespace: string;
-  value: string;
-};
 
-export type ModelPayload = {
+export type ParentHeaders = { headers: Array<HttpRequestHeader>, };
-  model: AnyModel;
-  updateSource: UpdateSource;
-  change: ModelChangeEvent;
-};
 
-export type ParentAuthentication = {
+export type Plugin = { model: "plugin", id: string, createdAt: string, updatedAt: string, checkedAt: string | null, directory: string, enabled: boolean, url: string | null, source: PluginSource, };
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-};
 
-export type ParentHeaders = { headers: Array<HttpRequestHeader> };
+export type PluginKeyValue = { model: "plugin_key_value", createdAt: string, updatedAt: string, pluginName: string, key: string, value: string, };
-
-export type Plugin = {
-  model: "plugin";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  checkedAt: string | null;
-  directory: string;
-  enabled: boolean;
-  url: string | null;
-  source: PluginSource;
-};
-
-export type PluginKeyValue = {
-  model: "plugin_key_value";
-  createdAt: string;
-  updatedAt: string;
-  pluginName: string;
-  key: string;
-  value: string;
-};
 
 export type PluginSource = "bundled" | "filesystem" | "registry";
 
-export type ProxySetting =
+export type ProxySetting = { "type": "enabled", http: string, https: string, auth: ProxySettingAuth | null, bypass: string, disabled: boolean, } | { "type": "disabled" };
-  | {
-      type: "enabled";
-      http: string;
-      https: string;
-      auth: ProxySettingAuth | null;
-      bypass: string;
-      disabled: boolean;
-    }
-  | { type: "disabled" };
 
-export type ProxySettingAuth = { user: string; password: string };
+export type ProxySettingAuth = { user: string, password: string, };
 
-export type Settings = {
+export type Settings = { model: "settings", id: string, createdAt: string, updatedAt: string, appearance: string, clientCertificates: Array<ClientCertificate>, coloredMethods: boolean, editorFont: string | null, editorFontSize: number, editorKeymap: EditorKeymap, editorSoftWrap: boolean, hideWindowControls: boolean, useNativeTitlebar: boolean, interfaceFont: string | null, interfaceFontSize: number, interfaceScale: number, openWorkspaceNewWindow: boolean | null, proxy: ProxySetting | null, themeDark: string, themeLight: string, updateChannel: string, hideLicenseBadge: boolean, autoupdate: boolean, autoDownloadUpdates: boolean, checkNotifications: boolean, hotkeys: { [key in string]?: Array<string> }, };
-  model: "settings";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  appearance: string;
-  clientCertificates: Array<ClientCertificate>;
-  coloredMethods: boolean;
-  editorFont: string | null;
-  editorFontSize: number;
-  editorKeymap: EditorKeymap;
-  editorSoftWrap: boolean;
-  hideWindowControls: boolean;
-  useNativeTitlebar: boolean;
-  interfaceFont: string | null;
-  interfaceFontSize: number;
-  interfaceScale: number;
-  openWorkspaceNewWindow: boolean | null;
-  proxy: ProxySetting | null;
-  themeDark: string;
-  themeLight: string;
-  updateChannel: string;
-  hideLicenseBadge: boolean;
-  autoupdate: boolean;
-  autoDownloadUpdates: boolean;
-  checkNotifications: boolean;
-  hotkeys: { [key in string]?: Array<string> };
-};
 
-export type SyncState = {
+export type SyncState = { model: "sync_state", id: string, workspaceId: string, createdAt: string, updatedAt: string, flushedAt: string, modelId: string, checksum: string, relPath: string, syncDir: string, };
-  model: "sync_state";
-  id: string;
-  workspaceId: string;
-  createdAt: string;
-  updatedAt: string;
-  flushedAt: string;
-  modelId: string;
-  checksum: string;
-  relPath: string;
-  syncDir: string;
-};
 
-export type UpdateSource =
+export type UpdateSource = { "type": "background" } | { "type": "import" } | { "type": "plugin" } | { "type": "sync" } | { "type": "window", label: string, };
-  | { type: "background" }
-  | { type: "import" }
-  | { type: "plugin" }
-  | { type: "sync" }
-  | { type: "window"; label: string };
 
-export type WebsocketConnection = {
+export type WebsocketConnection = { model: "websocket_connection", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, elapsed: number, error: string | null, headers: Array<HttpResponseHeader>, state: WebsocketConnectionState, status: number, url: string, };
-  model: "websocket_connection";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  requestId: string;
-  elapsed: number;
-  error: string | null;
-  headers: Array<HttpResponseHeader>;
-  state: WebsocketConnectionState;
-  status: number;
-  url: string;
-};
 
 export type WebsocketConnectionState = "initialized" | "connected" | "closing" | "closed";
 
-export type WebsocketEvent = {
+export type WebsocketEvent = { model: "websocket_event", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, connectionId: string, isServer: boolean, message: Array<number>, messageType: WebsocketEventType, };
-  model: "websocket_event";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  requestId: string;
-  connectionId: string;
-  isServer: boolean;
-  message: Array<number>;
-  messageType: WebsocketEventType;
-};
 
 export type WebsocketEventType = "binary" | "close" | "frame" | "open" | "ping" | "pong" | "text";
 
 export type WebsocketMessageType = "text" | "binary";
 
-export type WebsocketRequest = {
+export type WebsocketRequest = { model: "websocket_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, message: string, name: string, sortPriority: number, url: string, 
-  model: "websocket_request";
+/**
-  id: string;
+ * URL parameters used for both path placeholders (`:id`) and query string entries.
-  createdAt: string;
+ */
-  updatedAt: string;
+urlParameters: Array<HttpUrlParameter>, };
-  workspaceId: string;
-  folderId: string | null;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  message: string;
-  name: string;
-  sortPriority: number;
-  url: string;
-  /**
-   * URL parameters used for both path placeholders (`:id`) and query string entries.
-   */
-  urlParameters: Array<HttpUrlParameter>;
-  settingSendCookies: InheritedBoolSetting;
-  settingStoreCookies: InheritedBoolSetting;
-  settingValidateCertificates: InheritedBoolSetting;
-};
 
-export type Workspace = {
+export type Workspace = { model: "workspace", id: string, createdAt: string, updatedAt: string, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, encryptionKeyChallenge: string | null, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, settingDnsOverrides: Array<DnsOverride>, };
-  model: "workspace";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  name: string;
-  encryptionKeyChallenge: string | null;
-  settingValidateCertificates: boolean;
-  settingFollowRedirects: boolean;
-  settingRequestTimeout: number;
-  settingDnsOverrides: Array<DnsOverride>;
-  settingSendCookies: boolean;
-  settingStoreCookies: boolean;
-};
 
-export type WorkspaceMeta = {
+export type WorkspaceMeta = { model: "workspace_meta", id: string, workspaceId: string, createdAt: string, updatedAt: string, encryptionKey: EncryptedKey | null, settingSyncDir: string | null, };
-  model: "workspace_meta";
-  id: string;
-  workspaceId: string;
-  createdAt: string;
-  updatedAt: string;
-  encryptionKey: EncryptedKey | null;
-  settingSyncDir: string | null;
-};

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/20260302000000_inherited-request-settings.sql

@@ -1,17 +0,0 @@
-ALTER TABLE workspaces ADD COLUMN setting_send_cookies BOOLEAN DEFAULT TRUE NOT NULL;
-ALTER TABLE workspaces ADD COLUMN setting_store_cookies BOOLEAN DEFAULT TRUE NOT NULL;
-
-ALTER TABLE folders ADD COLUMN setting_send_cookies TEXT DEFAULT '{"enabled":false,"value":true}' NOT NULL;
-ALTER TABLE folders ADD COLUMN setting_store_cookies TEXT DEFAULT '{"enabled":false,"value":true}' NOT NULL;
-ALTER TABLE folders ADD COLUMN setting_request_timeout TEXT DEFAULT '{"enabled":false,"value":0}' NOT NULL;
-ALTER TABLE folders ADD COLUMN setting_validate_certificates TEXT DEFAULT '{"enabled":false,"value":true}' NOT NULL;
-ALTER TABLE folders ADD COLUMN setting_follow_redirects TEXT DEFAULT '{"enabled":false,"value":true}' NOT NULL;
-
-ALTER TABLE http_requests ADD COLUMN setting_send_cookies TEXT DEFAULT '{"enabled":false,"value":true}' NOT NULL;
-ALTER TABLE http_requests ADD COLUMN setting_store_cookies TEXT DEFAULT '{"enabled":false,"value":true}' NOT NULL;
-ALTER TABLE http_requests ADD COLUMN setting_request_timeout TEXT DEFAULT '{"enabled":false,"value":0}' NOT NULL;
-ALTER TABLE http_requests ADD COLUMN setting_validate_certificates TEXT DEFAULT '{"enabled":false,"value":true}' NOT NULL;
-ALTER TABLE http_requests ADD COLUMN setting_follow_redirects TEXT DEFAULT '{"enabled":false,"value":true}' NOT NULL;
-
-ALTER TABLE websocket_requests ADD COLUMN setting_send_cookies TEXT DEFAULT '{"enabled":false,"value":true}' NOT NULL;
-ALTER TABLE websocket_requests ADD COLUMN setting_store_cookies TEXT DEFAULT '{"enabled":false,"value":true}' NOT NULL;

crates/yaak-models/migrations/20260303000000_protocol-tls-settings.sql

@@ -1,3 +0,0 @@
-ALTER TABLE websocket_requests ADD COLUMN setting_validate_certificates TEXT DEFAULT '{"enabled":false,"value":true}' NOT NULL;
-
-ALTER TABLE grpc_requests ADD COLUMN setting_validate_certificates TEXT DEFAULT '{"enabled":false,"value":true}' NOT NULL;

crates/yaak-models/src/models.rs

@@ -1,9 +1,7 @@
 use crate::error::Result;
 use crate::models::HttpRequestIden::{
     Authentication, AuthenticationType, Body, BodyType, CreatedAt, Description, FolderId, Headers,
-    Method, Name, SettingFollowRedirects, SettingRequestTimeout, SettingSendCookies,
+    Method, Name, SortPriority, UpdatedAt, Url, UrlParameters, WorkspaceId,
-    SettingStoreCookies, SettingValidateCertificates, SortPriority, UpdatedAt, Url, UrlParameters,
-    WorkspaceId,
 };
 use crate::util::generate_prefixed_id;
 use chrono::{NaiveDateTime, Utc};
@@ -92,84 +90,6 @@ pub struct DnsOverride {
     pub enabled: bool,
 }
 
-#[derive(Debug, Clone, PartialEq, Default)]
-pub struct ResolvedSetting<T> {
-    pub value: T,
-    pub source_model: String,
-    pub source_id: Option<String>,
-    pub source_name: Option<String>,
-}
-
-impl<T> ResolvedSetting<T> {
-    pub fn from_model(value: T, model: AnyModel) -> Self {
-        Self {
-            value,
-            source_model: model.model().to_string(),
-            source_id: Some(model.id().to_string()),
-            source_name: Some(model.resolved_name()),
-        }
-    }
-
-    pub fn default_source(value: T) -> Self {
-        Self { value, source_model: "default".to_string(), source_id: None, source_name: None }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct ResolvedHttpRequestSettings {
-    pub validate_certificates: ResolvedSetting<bool>,
-    pub follow_redirects: ResolvedSetting<bool>,
-    pub request_timeout: ResolvedSetting<i32>,
-    pub send_cookies: ResolvedSetting<bool>,
-    pub store_cookies: ResolvedSetting<bool>,
-}
-
-impl Default for ResolvedHttpRequestSettings {
-    fn default() -> Self {
-        Self {
-            validate_certificates: ResolvedSetting::default_source(true),
-            follow_redirects: ResolvedSetting::default_source(true),
-            request_timeout: ResolvedSetting::default_source(0),
-            send_cookies: ResolvedSetting::default_source(true),
-            store_cookies: ResolvedSetting::default_source(true),
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema, TS)]
-#[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "gen_models.ts")]
-pub struct InheritedBoolSetting {
-    #[serde(default)]
-    #[ts(optional, as = "Option<bool>")]
-    pub enabled: bool,
-    #[serde(default = "default_true")]
-    pub value: bool,
-}
-
-impl Default for InheritedBoolSetting {
-    fn default() -> Self {
-        Self { enabled: false, value: true }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema, TS)]
-#[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "gen_models.ts")]
-pub struct InheritedIntSetting {
-    #[serde(default)]
-    #[ts(optional, as = "Option<bool>")]
-    pub enabled: bool,
-    #[serde(default)]
-    pub value: i32,
-}
-
-impl Default for InheritedIntSetting {
-    fn default() -> Self {
-        Self { enabled: false, value: 0 }
-    }
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[serde(rename_all = "snake_case")]
 #[ts(export, export_to = "gen_models.ts")]
@@ -402,10 +322,6 @@ pub struct Workspace {
     pub setting_request_timeout: i32,
     #[serde(default)]
     pub setting_dns_overrides: Vec<DnsOverride>,
-    #[serde(default = "default_true")]
-    pub setting_send_cookies: bool,
-    #[serde(default = "default_true")]
-    pub setting_store_cookies: bool,
 }
 
 impl UpsertModelInfo for Workspace {
@@ -447,8 +363,6 @@ impl UpsertModelInfo for Workspace {
             (SettingRequestTimeout, self.setting_request_timeout.into()),
             (SettingValidateCertificates, self.setting_validate_certificates.into()),
             (SettingDnsOverrides, serde_json::to_string(&self.setting_dns_overrides)?.into()),
-            (SettingSendCookies, self.setting_send_cookies.into()),
-            (SettingStoreCookies, self.setting_store_cookies.into()),
         ])
     }
 
@@ -466,8 +380,6 @@ impl UpsertModelInfo for Workspace {
             WorkspaceIden::SettingRequestTimeout,
             WorkspaceIden::SettingValidateCertificates,
             WorkspaceIden::SettingDnsOverrides,
-            WorkspaceIden::SettingSendCookies,
-            WorkspaceIden::SettingStoreCookies,
         ]
     }
 
@@ -493,8 +405,6 @@ impl UpsertModelInfo for Workspace {
             setting_request_timeout: row.get("setting_request_timeout")?,
             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")?,
-            setting_store_cookies: row.get("setting_store_cookies")?,
         })
     }
 }
@@ -599,127 +509,11 @@ pub enum CookieExpires {
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[ts(export, export_to = "gen_models.ts")]
-pub enum CookieSameSite {
-    Strict,
-    Lax,
-    None,
-}
-
-#[derive(Debug, Clone, Serialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export, export_to = "gen_models.ts")]
 pub struct Cookie {
-    pub name: String,
+    pub raw_cookie: String,
-    pub value: String,
     pub domain: CookieDomain,
     pub expires: CookieExpires,
-    pub path: String,
+    pub path: (String, bool),
-    pub secure: bool,
-    pub http_only: bool,
-    pub same_site: Option<CookieSameSite>,
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct CookieFields {
-    name: String,
-    value: String,
-    domain: CookieDomain,
-    expires: CookieExpires,
-    path: String,
-    #[serde(default)]
-    secure: bool,
-    #[serde(default)]
-    http_only: bool,
-    #[serde(default)]
-    same_site: Option<CookieSameSite>,
-}
-
-#[derive(Deserialize)]
-struct LegacyCookie {
-    raw_cookie: String,
-    domain: CookieDomain,
-    expires: CookieExpires,
-    path: (String, bool),
-}
-
-#[derive(Deserialize)]
-#[serde(untagged)]
-enum CookieCompat {
-    New(CookieFields),
-    Legacy(LegacyCookie),
-}
-
-impl<'de> Deserialize<'de> for Cookie {
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        Ok(match CookieCompat::deserialize(deserializer)? {
-            CookieCompat::New(cookie) => Self {
-                name: cookie.name,
-                value: cookie.value,
-                domain: cookie.domain,
-                expires: cookie.expires,
-                path: cookie.path,
-                secure: cookie.secure,
-                http_only: cookie.http_only,
-                same_site: cookie.same_site,
-            },
-            CookieCompat::Legacy(cookie) => {
-                let (name, value, secure, http_only, same_site) =
-                    parse_legacy_cookie_parts(&cookie.raw_cookie);
-                Self {
-                    name,
-                    value,
-                    domain: cookie.domain,
-                    expires: cookie.expires,
-                    path: cookie.path.0,
-                    secure,
-                    http_only,
-                    same_site,
-                }
-            }
-        })
-    }
-}
-
-fn parse_legacy_cookie_parts(
-    raw_cookie: &str,
-) -> (String, String, bool, bool, Option<CookieSameSite>) {
-    let mut parts = raw_cookie.split(';').map(str::trim);
-    let (name, value) = parts
-        .next()
-        .and_then(|part| {
-            let mut nv = part.splitn(2, '=');
-            Some((nv.next()?.trim().to_string(), nv.next().unwrap_or("").trim().to_string()))
-        })
-        .unwrap_or_default();
-
-    let mut secure = false;
-    let mut http_only = false;
-    let mut same_site = None;
-
-    for part in parts {
-        let mut attr = part.splitn(2, '=');
-        let key = attr.next().unwrap_or("").trim().to_lowercase();
-        let value = attr.next().unwrap_or("").trim().to_lowercase();
-        match key.as_str() {
-            "secure" => secure = true,
-            "httponly" => http_only = true,
-            "samesite" => {
-                same_site = match value.as_str() {
-                    "strict" => Some(CookieSameSite::Strict),
-                    "lax" => Some(CookieSameSite::Lax),
-                    "none" => Some(CookieSameSite::None),
-                    _ => same_site,
-                };
-            }
-            _ => {}
-        }
-    }
-
-    (name, value, secure, http_only, same_site)
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
@@ -957,11 +751,6 @@ pub struct Folder {
     pub headers: Vec<HttpRequestHeader>,
     pub name: String,
     pub sort_priority: f64,
-    pub setting_send_cookies: InheritedBoolSetting,
-    pub setting_store_cookies: InheritedBoolSetting,
-    pub setting_validate_certificates: InheritedBoolSetting,
-    pub setting_follow_redirects: InheritedBoolSetting,
-    pub setting_request_timeout: InheritedIntSetting,
 }
 
 impl UpsertModelInfo for Folder {
@@ -1001,14 +790,6 @@ impl UpsertModelInfo for Folder {
             (Description, self.description.into()),
             (Name, self.name.trim().into()),
             (SortPriority, self.sort_priority.into()),
-            (SettingSendCookies, serde_json::to_string(&self.setting_send_cookies)?.into()),
-            (SettingStoreCookies, serde_json::to_string(&self.setting_store_cookies)?.into()),
-            (
-                SettingValidateCertificates,
-                serde_json::to_string(&self.setting_validate_certificates)?.into(),
-            ),
-            (SettingFollowRedirects, serde_json::to_string(&self.setting_follow_redirects)?.into()),
-            (SettingRequestTimeout, serde_json::to_string(&self.setting_request_timeout)?.into()),
         ])
     }
 
@@ -1022,11 +803,6 @@ impl UpsertModelInfo for Folder {
             FolderIden::Description,
             FolderIden::FolderId,
             FolderIden::SortPriority,
-            FolderIden::SettingSendCookies,
-            FolderIden::SettingStoreCookies,
-            FolderIden::SettingValidateCertificates,
-            FolderIden::SettingFollowRedirects,
-            FolderIden::SettingRequestTimeout,
         ]
     }
 
@@ -1036,11 +812,6 @@ impl UpsertModelInfo for Folder {
     {
         let headers: String = row.get("headers")?;
         let authentication: String = row.get("authentication")?;
-        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_follow_redirects: String = row.get("setting_follow_redirects")?;
-        let setting_request_timeout: String = row.get("setting_request_timeout")?;
         Ok(Self {
             id: row.get("id")?,
             model: row.get("model")?,
@@ -1054,14 +825,6 @@ impl UpsertModelInfo for Folder {
             headers: serde_json::from_str(&headers).unwrap_or_default(),
             authentication_type: row.get("authentication_type")?,
             authentication: serde_json::from_str(&authentication).unwrap_or_default(),
-            setting_send_cookies: serde_json::from_str(&setting_send_cookies).unwrap_or_default(),
-            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_follow_redirects: serde_json::from_str(&setting_follow_redirects)
-                .unwrap_or_default(),
-            setting_request_timeout: serde_json::from_str(&setting_request_timeout)
-                .unwrap_or_default(),
         })
     }
 }
@@ -1122,11 +885,6 @@ pub struct HttpRequest {
     pub url: String,
     /// URL parameters used for both path placeholders (`:id`) and query string entries.
     pub url_parameters: Vec<HttpUrlParameter>,
-    pub setting_send_cookies: InheritedBoolSetting,
-    pub setting_store_cookies: InheritedBoolSetting,
-    pub setting_validate_certificates: InheritedBoolSetting,
-    pub setting_follow_redirects: InheritedBoolSetting,
-    pub setting_request_timeout: InheritedIntSetting,
 }
 
 impl UpsertModelInfo for HttpRequest {
@@ -1170,14 +928,6 @@ impl UpsertModelInfo for HttpRequest {
             (AuthenticationType, self.authentication_type.into()),
             (Headers, serde_json::to_string(&self.headers)?.into()),
             (SortPriority, self.sort_priority.into()),
-            (SettingSendCookies, serde_json::to_string(&self.setting_send_cookies)?.into()),
-            (SettingStoreCookies, serde_json::to_string(&self.setting_store_cookies)?.into()),
-            (
-                SettingValidateCertificates,
-                serde_json::to_string(&self.setting_validate_certificates)?.into(),
-            ),
-            (SettingFollowRedirects, serde_json::to_string(&self.setting_follow_redirects)?.into()),
-            (SettingRequestTimeout, serde_json::to_string(&self.setting_request_timeout)?.into()),
         ])
     }
 
@@ -1197,11 +947,6 @@ impl UpsertModelInfo for HttpRequest {
             Url,
             UrlParameters,
             SortPriority,
-            SettingSendCookies,
-            SettingStoreCookies,
-            SettingValidateCertificates,
-            SettingFollowRedirects,
-            SettingRequestTimeout,
         ]
     }
 
@@ -1210,11 +955,6 @@ impl UpsertModelInfo for HttpRequest {
         let body: String = row.get("body")?;
         let authentication: String = row.get("authentication")?;
         let headers: String = row.get("headers")?;
-        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_follow_redirects: String = row.get("setting_follow_redirects")?;
-        let setting_request_timeout: String = row.get("setting_request_timeout")?;
         Ok(Self {
             id: row.get("id")?,
             model: row.get("model")?,
@@ -1233,14 +973,6 @@ impl UpsertModelInfo for HttpRequest {
             sort_priority: row.get("sort_priority")?,
             url: row.get("url")?,
             url_parameters: serde_json::from_str(url_parameters.as_str()).unwrap_or_default(),
-            setting_send_cookies: serde_json::from_str(&setting_send_cookies).unwrap_or_default(),
-            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_follow_redirects: serde_json::from_str(&setting_follow_redirects)
-                .unwrap_or_default(),
-            setting_request_timeout: serde_json::from_str(&setting_request_timeout)
-                .unwrap_or_default(),
         })
     }
 }
@@ -1395,9 +1127,6 @@ pub struct WebsocketRequest {
     pub url: String,
     /// URL parameters used for both path placeholders (`:id`) and query string entries.
     pub url_parameters: Vec<HttpUrlParameter>,
-    pub setting_send_cookies: InheritedBoolSetting,
-    pub setting_store_cookies: InheritedBoolSetting,
-    pub setting_validate_certificates: InheritedBoolSetting,
 }
 
 impl UpsertModelInfo for WebsocketRequest {
@@ -1440,12 +1169,6 @@ impl UpsertModelInfo for WebsocketRequest {
             (SortPriority, self.sort_priority.into()),
             (Url, self.url.into()),
             (UrlParameters, serde_json::to_string(&self.url_parameters)?.into()),
-            (SettingSendCookies, serde_json::to_string(&self.setting_send_cookies)?.into()),
-            (SettingStoreCookies, serde_json::to_string(&self.setting_store_cookies)?.into()),
-            (
-                SettingValidateCertificates,
-                serde_json::to_string(&self.setting_validate_certificates)?.into(),
-            ),
         ])
     }
 
@@ -1463,9 +1186,6 @@ impl UpsertModelInfo for WebsocketRequest {
             WebsocketRequestIden::SortPriority,
             WebsocketRequestIden::Url,
             WebsocketRequestIden::UrlParameters,
-            WebsocketRequestIden::SettingSendCookies,
-            WebsocketRequestIden::SettingStoreCookies,
-            WebsocketRequestIden::SettingValidateCertificates,
         ]
     }
 
@@ -1476,9 +1196,6 @@ impl UpsertModelInfo for WebsocketRequest {
         let url_parameters: String = row.get("url_parameters")?;
         let authentication: String = row.get("authentication")?;
         let headers: String = row.get("headers")?;
-        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")?;
         Ok(Self {
             id: row.get("id")?,
             model: row.get("model")?,
@@ -1495,10 +1212,6 @@ impl UpsertModelInfo for WebsocketRequest {
             headers: serde_json::from_str(headers.as_str()).unwrap_or_default(),
             folder_id: row.get("folder_id")?,
             name: row.get("name")?,
-            setting_send_cookies: serde_json::from_str(&setting_send_cookies).unwrap_or_default(),
-            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(),
         })
     }
 }
@@ -1780,15 +1493,6 @@ pub enum HttpResponseEventData {
     Setting {
         name: String,
         value: String,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        #[ts(optional, as = "Option<String>")]
-        source_model: Option<String>,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        #[ts(optional, as = "Option<String>")]
-        source_id: Option<String>,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        #[ts(optional, as = "Option<String>")]
-        source_name: Option<String>,
     },
     Info {
         message: String,
@@ -2038,7 +1742,6 @@ pub struct GrpcRequest {
     pub sort_priority: f64,
     /// Server URL (http for plaintext or https for secure)
     pub url: String,
-    pub setting_validate_certificates: InheritedBoolSetting,
 }
 
 impl UpsertModelInfo for GrpcRequest {
@@ -2082,10 +1785,6 @@ impl UpsertModelInfo for GrpcRequest {
             (AuthenticationType, self.authentication_type.into()),
             (Authentication, serde_json::to_string(&self.authentication)?.into()),
             (Metadata, serde_json::to_string(&self.metadata)?.into()),
-            (
-                SettingValidateCertificates,
-                serde_json::to_string(&self.setting_validate_certificates)?.into(),
-            ),
         ])
     }
 
@@ -2104,7 +1803,6 @@ impl UpsertModelInfo for GrpcRequest {
             GrpcRequestIden::AuthenticationType,
             GrpcRequestIden::Authentication,
             GrpcRequestIden::Metadata,
-            GrpcRequestIden::SettingValidateCertificates,
         ]
     }
 
@@ -2114,7 +1812,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")?;
         Ok(Self {
             id: row.get("id")?,
             model: row.get("model")?,
@@ -2132,8 +1829,6 @@ impl UpsertModelInfo for GrpcRequest {
             url: row.get("url")?,
             sort_priority: row.get("sort_priority")?,
             metadata: serde_json::from_str(metadata.as_str()).unwrap_or_default(),
-            setting_validate_certificates: serde_json::from_str(&setting_validate_certificates)
-                .unwrap_or_default(),
         })
     }
 }

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

@@ -2,9 +2,8 @@ use crate::client_db::ClientDb;
 use crate::connection_or_tx::ConnectionOrTx;
 use crate::error::Result;
 use crate::models::{
-    AnyModel, Environment, EnvironmentIden, Folder, FolderIden, GrpcRequest, GrpcRequestIden,
+    Environment, EnvironmentIden, Folder, FolderIden, GrpcRequest, GrpcRequestIden, HttpRequest,
-    HttpRequest, HttpRequestHeader, HttpRequestIden, ResolvedHttpRequestSettings, ResolvedSetting,
+    HttpRequestHeader, HttpRequestIden, WebsocketRequest, WebsocketRequestIden,
-    WebsocketRequest, WebsocketRequestIden,
 };
 use crate::util::UpdateSource;
 use serde_json::Value;
@@ -142,60 +141,4 @@ impl<'a> ClientDb<'a> {
 
         Ok(headers)
     }
-
-    pub fn resolve_settings_for_folder(
-        &self,
-        folder: &Folder,
-    ) -> Result<ResolvedHttpRequestSettings> {
-        let parent = if let Some(folder_id) = folder.folder_id.clone() {
-            let parent_folder = self.get_folder(&folder_id)?;
-            self.resolve_settings_for_folder(&parent_folder)?
-        } else {
-            let workspace = self.get_workspace(&folder.workspace_id)?;
-            self.resolve_settings_for_workspace(&workspace)
-        };
-
-        Ok(ResolvedHttpRequestSettings {
-            validate_certificates: if folder.setting_validate_certificates.enabled {
-                ResolvedSetting::from_model(
-                    folder.setting_validate_certificates.value,
-                    AnyModel::Folder(folder.clone()),
-                )
-            } else {
-                parent.validate_certificates
-            },
-            follow_redirects: if folder.setting_follow_redirects.enabled {
-                ResolvedSetting::from_model(
-                    folder.setting_follow_redirects.value,
-                    AnyModel::Folder(folder.clone()),
-                )
-            } else {
-                parent.follow_redirects
-            },
-            request_timeout: if folder.setting_request_timeout.enabled {
-                ResolvedSetting::from_model(
-                    folder.setting_request_timeout.value,
-                    AnyModel::Folder(folder.clone()),
-                )
-            } else {
-                parent.request_timeout
-            },
-            send_cookies: if folder.setting_send_cookies.enabled {
-                ResolvedSetting::from_model(
-                    folder.setting_send_cookies.value,
-                    AnyModel::Folder(folder.clone()),
-                )
-            } else {
-                parent.send_cookies
-            },
-            store_cookies: if folder.setting_store_cookies.enabled {
-                ResolvedSetting::from_model(
-                    folder.setting_store_cookies.value,
-                    AnyModel::Folder(folder.clone()),
-                )
-            } else {
-                parent.store_cookies
-            },
-        })
-    }
 }

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

@@ -1,10 +1,7 @@
 use super::dedupe_headers;
 use crate::client_db::ClientDb;
 use crate::error::Result;
-use crate::models::{
+use crate::models::{Folder, FolderIden, GrpcRequest, GrpcRequestIden, HttpRequestHeader};
-    AnyModel, Folder, FolderIden, GrpcRequest, GrpcRequestIden, HttpRequestHeader,
-    ResolvedHttpRequestSettings, ResolvedSetting,
-};
 use crate::util::UpdateSource;
 use serde_json::Value;
 use std::collections::BTreeMap;
@@ -107,29 +104,4 @@ impl<'a> ClientDb<'a> {
 
         Ok(dedupe_headers(metadata))
     }
-
-    pub fn resolve_settings_for_grpc_request(
-        &self,
-        grpc_request: &GrpcRequest,
-    ) -> Result<ResolvedHttpRequestSettings> {
-        let parent = if let Some(folder_id) = grpc_request.folder_id.clone() {
-            let folder = self.get_folder(&folder_id)?;
-            self.resolve_settings_for_folder(&folder)?
-        } else {
-            let workspace = self.get_workspace(&grpc_request.workspace_id)?;
-            self.resolve_settings_for_workspace(&workspace)
-        };
-
-        Ok(ResolvedHttpRequestSettings {
-            validate_certificates: if grpc_request.setting_validate_certificates.enabled {
-                ResolvedSetting::from_model(
-                    grpc_request.setting_validate_certificates.value,
-                    AnyModel::GrpcRequest(grpc_request.clone()),
-                )
-            } else {
-                parent.validate_certificates
-            },
-            ..parent
-        })
-    }
 }

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

@@ -1,10 +1,7 @@
 use super::dedupe_headers;
 use crate::client_db::ClientDb;
 use crate::error::Result;
-use crate::models::{
+use crate::models::{Folder, FolderIden, HttpRequest, HttpRequestHeader, HttpRequestIden};
-    AnyModel, Folder, FolderIden, HttpRequest, HttpRequestHeader, HttpRequestIden,
-    ResolvedHttpRequestSettings, ResolvedSetting,
-};
 use crate::util::UpdateSource;
 use serde_json::Value;
 use std::collections::BTreeMap;
@@ -94,62 +91,6 @@ impl<'a> ClientDb<'a> {
         Ok(dedupe_headers(headers))
     }
 
-    pub fn resolve_settings_for_http_request(
-        &self,
-        http_request: &HttpRequest,
-    ) -> Result<ResolvedHttpRequestSettings> {
-        let parent = if let Some(folder_id) = http_request.folder_id.clone() {
-            let folder = self.get_folder(&folder_id)?;
-            self.resolve_settings_for_folder(&folder)?
-        } else {
-            let workspace = self.get_workspace(&http_request.workspace_id)?;
-            self.resolve_settings_for_workspace(&workspace)
-        };
-
-        Ok(ResolvedHttpRequestSettings {
-            validate_certificates: if http_request.setting_validate_certificates.enabled {
-                ResolvedSetting::from_model(
-                    http_request.setting_validate_certificates.value,
-                    AnyModel::HttpRequest(http_request.clone()),
-                )
-            } else {
-                parent.validate_certificates
-            },
-            follow_redirects: if http_request.setting_follow_redirects.enabled {
-                ResolvedSetting::from_model(
-                    http_request.setting_follow_redirects.value,
-                    AnyModel::HttpRequest(http_request.clone()),
-                )
-            } else {
-                parent.follow_redirects
-            },
-            request_timeout: if http_request.setting_request_timeout.enabled {
-                ResolvedSetting::from_model(
-                    http_request.setting_request_timeout.value,
-                    AnyModel::HttpRequest(http_request.clone()),
-                )
-            } else {
-                parent.request_timeout
-            },
-            send_cookies: if http_request.setting_send_cookies.enabled {
-                ResolvedSetting::from_model(
-                    http_request.setting_send_cookies.value,
-                    AnyModel::HttpRequest(http_request.clone()),
-                )
-            } else {
-                parent.send_cookies
-            },
-            store_cookies: if http_request.setting_store_cookies.enabled {
-                ResolvedSetting::from_model(
-                    http_request.setting_store_cookies.value,
-                    AnyModel::HttpRequest(http_request.clone()),
-                )
-            } else {
-                parent.store_cookies
-            },
-        })
-    }
-
     pub fn list_http_requests_for_folder_recursive(
         &self,
         folder_id: &str,

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

@@ -2,8 +2,7 @@ use super::dedupe_headers;
 use crate::client_db::ClientDb;
 use crate::error::Result;
 use crate::models::{
-    AnyModel, Folder, FolderIden, HttpRequestHeader, ResolvedHttpRequestSettings, ResolvedSetting,
+    Folder, FolderIden, HttpRequestHeader, WebsocketRequest, WebsocketRequestIden,
-    WebsocketRequest, WebsocketRequestIden,
 };
 use crate::util::UpdateSource;
 use serde_json::Value;
@@ -117,45 +116,4 @@ impl<'a> ClientDb<'a> {
 
         Ok(dedupe_headers(headers))
     }
-
-    pub fn resolve_settings_for_websocket_request(
-        &self,
-        websocket_request: &WebsocketRequest,
-    ) -> Result<ResolvedHttpRequestSettings> {
-        let parent = if let Some(folder_id) = websocket_request.folder_id.clone() {
-            let folder = self.get_folder(&folder_id)?;
-            self.resolve_settings_for_folder(&folder)?
-        } else {
-            let workspace = self.get_workspace(&websocket_request.workspace_id)?;
-            self.resolve_settings_for_workspace(&workspace)
-        };
-
-        Ok(ResolvedHttpRequestSettings {
-            validate_certificates: if websocket_request.setting_validate_certificates.enabled {
-                ResolvedSetting::from_model(
-                    websocket_request.setting_validate_certificates.value,
-                    AnyModel::WebsocketRequest(websocket_request.clone()),
-                )
-            } else {
-                parent.validate_certificates
-            },
-            send_cookies: if websocket_request.setting_send_cookies.enabled {
-                ResolvedSetting::from_model(
-                    websocket_request.setting_send_cookies.value,
-                    AnyModel::WebsocketRequest(websocket_request.clone()),
-                )
-            } else {
-                parent.send_cookies
-            },
-            store_cookies: if websocket_request.setting_store_cookies.enabled {
-                ResolvedSetting::from_model(
-                    websocket_request.setting_store_cookies.value,
-                    AnyModel::WebsocketRequest(websocket_request.clone()),
-                )
-            } else {
-                parent.store_cookies
-            },
-            ..parent
-        })
-    }
 }

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

@@ -1,8 +1,8 @@
 use crate::client_db::ClientDb;
 use crate::error::Result;
 use crate::models::{
-    AnyModel, EnvironmentIden, FolderIden, GrpcRequestIden, HttpRequestHeader, HttpRequestIden,
+    EnvironmentIden, FolderIden, GrpcRequestIden, HttpRequestHeader, HttpRequestIden,
-    ResolvedHttpRequestSettings, ResolvedSetting, WebsocketRequestIden, Workspace, WorkspaceIden,
+    WebsocketRequestIden, Workspace, WorkspaceIden,
 };
 use crate::util::UpdateSource;
 use serde_json::Value;
@@ -84,34 +84,6 @@ impl<'a> ClientDb<'a> {
         headers.extend(workspace.headers.clone());
         headers
     }
-
-    pub fn resolve_settings_for_workspace(
-        &self,
-        workspace: &Workspace,
-    ) -> ResolvedHttpRequestSettings {
-        ResolvedHttpRequestSettings {
-            validate_certificates: ResolvedSetting::from_model(
-                workspace.setting_validate_certificates,
-                AnyModel::Workspace(workspace.clone()),
-            ),
-            follow_redirects: ResolvedSetting::from_model(
-                workspace.setting_follow_redirects,
-                AnyModel::Workspace(workspace.clone()),
-            ),
-            request_timeout: ResolvedSetting::from_model(
-                workspace.setting_request_timeout,
-                AnyModel::Workspace(workspace.clone()),
-            ),
-            send_cookies: ResolvedSetting::from_model(
-                workspace.setting_send_cookies,
-                AnyModel::Workspace(workspace.clone()),
-            ),
-            store_cookies: ResolvedSetting::from_model(
-                workspace.setting_store_cookies,
-                AnyModel::Workspace(workspace.clone()),
-            ),
-        }
-    }
 }
 
 /// Global default headers that are always sent with requests unless overridden.

crates/yaak-plugins/bindings/gen_models.ts

@@ -1,482 +1,108 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type AnyModel =
+export type AnyModel = CookieJar | Environment | Folder | GraphQlIntrospection | GrpcConnection | GrpcEvent | GrpcRequest | HttpRequest | HttpResponse | HttpResponseEvent | KeyValue | Plugin | Settings | SyncState | WebsocketConnection | WebsocketEvent | WebsocketRequest | Workspace | WorkspaceMeta;
-  | CookieJar
-  | Environment
-  | Folder
-  | GraphQlIntrospection
-  | GrpcConnection
-  | GrpcEvent
-  | GrpcRequest
-  | HttpRequest
-  | HttpResponse
-  | HttpResponseEvent
-  | KeyValue
-  | Plugin
-  | Settings
-  | SyncState
-  | WebsocketConnection
-  | WebsocketEvent
-  | WebsocketRequest
-  | Workspace
-  | WorkspaceMeta;
 
-export type ClientCertificate = {
+export type ClientCertificate = { host: string, port: number | null, crtFile: string | null, keyFile: string | null, pfxFile: string | null, passphrase: string | null, enabled?: boolean, };
-  host: string;
-  port: number | null;
-  crtFile: string | null;
-  keyFile: string | null;
-  pfxFile: string | null;
-  passphrase: string | null;
-  enabled?: boolean;
-};
 
-export type Cookie = {
+export type Cookie = { raw_cookie: string, domain: CookieDomain, expires: CookieExpires, path: [string, boolean], };
-  name: string;
-  value: string;
-  domain: CookieDomain;
-  expires: CookieExpires;
-  path: string;
-  secure: boolean;
-  httpOnly: boolean;
-  sameSite: CookieSameSite | null;
-};
 
-export type CookieDomain = { HostOnly: string } | { Suffix: string } | "NotPresent" | "Empty";
+export type CookieDomain = { "HostOnly": string } | { "Suffix": string } | "NotPresent" | "Empty";
 
-export type CookieExpires = { AtUtc: string } | "SessionEnd";
+export type CookieExpires = { "AtUtc": string } | "SessionEnd";
 
-export type CookieJar = {
+export type CookieJar = { model: "cookie_jar", id: string, createdAt: string, updatedAt: string, workspaceId: string, cookies: Array<Cookie>, name: string, };
-  model: "cookie_jar";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  cookies: Array<Cookie>;
-  name: string;
-};
 
-export type CookieSameSite = "Strict" | "Lax" | "None";
+export type DnsOverride = { hostname: string, ipv4: Array<string>, ipv6: Array<string>, enabled?: boolean, };
-
-export type DnsOverride = {
-  hostname: string;
-  ipv4: Array<string>;
-  ipv6: Array<string>;
-  enabled?: boolean;
-};
 
 export type EditorKeymap = "default" | "vim" | "vscode" | "emacs";
 
-export type EncryptedKey = { encryptedKey: string };
+export type EncryptedKey = { encryptedKey: string, };
 
-export type Environment = {
+export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, parentModel: string, parentId: string | null, 
-  model: "environment";
+/**
-  id: string;
+ * Variables defined in this environment scope.
-  workspaceId: string;
+ * Child environments override parent variables by name.
-  createdAt: string;
+ */
-  updatedAt: string;
+variables: Array<EnvironmentVariable>, color: string | null, sortPriority: number, };
-  name: string;
-  public: boolean;
-  parentModel: string;
-  parentId: string | null;
-  /**
-   * Variables defined in this environment scope.
-   * Child environments override parent variables by name.
-   */
-  variables: Array<EnvironmentVariable>;
-  color: string | null;
-  sortPriority: number;
-};
 
-export type EnvironmentVariable = { enabled?: boolean; name: string; value: string; id?: string };
+export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, id?: string, };
 
-export type Folder = {
+export type Folder = { model: "folder", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, sortPriority: number, };
-  model: "folder";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  folderId: string | null;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  name: string;
-  sortPriority: number;
-  settingSendCookies: InheritedBoolSetting;
-  settingStoreCookies: InheritedBoolSetting;
-  settingValidateCertificates: InheritedBoolSetting;
-  settingFollowRedirects: InheritedBoolSetting;
-  settingRequestTimeout: InheritedIntSetting;
-};
 
-export type GraphQlIntrospection = {
+export type GraphQlIntrospection = { model: "graphql_introspection", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, content: string | null, };
-  model: "graphql_introspection";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  requestId: string;
-  content: string | null;
-};
 
-export type GrpcConnection = {
+export type GrpcConnection = { model: "grpc_connection", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, elapsed: number, error: string | null, method: string, service: string, status: number, state: GrpcConnectionState, trailers: { [key in string]?: string }, url: string, };
-  model: "grpc_connection";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  requestId: string;
-  elapsed: number;
-  error: string | null;
-  method: string;
-  service: string;
-  status: number;
-  state: GrpcConnectionState;
-  trailers: { [key in string]?: string };
-  url: string;
-};
 
 export type GrpcConnectionState = "initialized" | "connected" | "closed";
 
-export type GrpcEvent = {
+export type GrpcEvent = { model: "grpc_event", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, connectionId: string, content: string, error: string | null, eventType: GrpcEventType, metadata: { [key in string]?: string }, status: number | null, };
-  model: "grpc_event";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  requestId: string;
-  connectionId: string;
-  content: string;
-  error: string | null;
-  eventType: GrpcEventType;
-  metadata: { [key in string]?: string };
-  status: number | null;
-};
 
-export type GrpcEventType =
+export type GrpcEventType = "info" | "error" | "client_message" | "server_message" | "connection_start" | "connection_end";
-  | "info"
-  | "error"
-  | "client_message"
-  | "server_message"
-  | "connection_start"
-  | "connection_end";
 
-export type GrpcRequest = {
+export type GrpcRequest = { model: "grpc_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authenticationType: string | null, authentication: Record<string, any>, description: string, message: string, metadata: Array<HttpRequestHeader>, method: string | null, name: string, service: string | null, sortPriority: number, 
-  model: "grpc_request";
+/**
-  id: string;
+ * Server URL (http for plaintext or https for secure)
-  createdAt: string;
+ */
-  updatedAt: string;
+url: string, };
-  workspaceId: string;
-  folderId: string | null;
-  authenticationType: string | null;
-  authentication: Record<string, any>;
-  description: string;
-  message: string;
-  metadata: Array<HttpRequestHeader>;
-  method: string | null;
-  name: string;
-  service: string | null;
-  sortPriority: number;
-  /**
-   * Server URL (http for plaintext or https for secure)
-   */
-  url: string;
-  settingValidateCertificates: InheritedBoolSetting;
-};
 
-export type HttpRequest = {
+export type HttpRequest = { model: "http_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, body: Record<string, any>, bodyType: string | null, description: string, headers: Array<HttpRequestHeader>, method: string, name: string, sortPriority: number, url: string, 
-  model: "http_request";
+/**
-  id: string;
+ * URL parameters used for both path placeholders (`:id`) and query string entries.
-  createdAt: string;
+ */
-  updatedAt: string;
+urlParameters: Array<HttpUrlParameter>, };
-  workspaceId: string;
-  folderId: string | null;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  body: Record<string, any>;
-  bodyType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  method: string;
-  name: string;
-  sortPriority: number;
-  url: string;
-  /**
-   * URL parameters used for both path placeholders (`:id`) and query string entries.
-   */
-  urlParameters: Array<HttpUrlParameter>;
-  settingSendCookies: InheritedBoolSetting;
-  settingStoreCookies: InheritedBoolSetting;
-  settingValidateCertificates: InheritedBoolSetting;
-  settingFollowRedirects: InheritedBoolSetting;
-  settingRequestTimeout: InheritedIntSetting;
-};
 
-export type HttpRequestHeader = { enabled?: boolean; name: string; value: string; id?: string };
+export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, id?: string, };
 
-export type HttpResponse = {
+export type HttpResponse = { model: "http_response", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, bodyPath: string | null, contentLength: number | null, contentLengthCompressed: number | null, elapsed: number, elapsedHeaders: number, elapsedDns: number, error: string | null, headers: Array<HttpResponseHeader>, remoteAddr: string | null, requestContentLength: number | null, requestHeaders: Array<HttpResponseHeader>, status: number, statusReason: string | null, state: HttpResponseState, url: string, version: string | null, };
-  model: "http_response";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  requestId: string;
-  bodyPath: string | null;
-  contentLength: number | null;
-  contentLengthCompressed: number | null;
-  elapsed: number;
-  elapsedHeaders: number;
-  elapsedDns: number;
-  error: string | null;
-  headers: Array<HttpResponseHeader>;
-  remoteAddr: string | null;
-  requestContentLength: number | null;
-  requestHeaders: Array<HttpResponseHeader>;
-  status: number;
-  statusReason: string | null;
-  state: HttpResponseState;
-  url: string;
-  version: string | null;
-};
 
-export type HttpResponseEvent = {
+export type HttpResponseEvent = { model: "http_response_event", id: string, createdAt: string, updatedAt: string, workspaceId: string, responseId: string, event: HttpResponseEventData, };
-  model: "http_response_event";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  responseId: string;
-  event: HttpResponseEventData;
-};
 
 /**
  * Serializable representation of HTTP response events for DB storage.
  * This mirrors `yaak_http::sender::HttpResponseEvent` but with serde support.
  * The `From` impl is in yaak-http to avoid circular dependencies.
  */
-export type HttpResponseEventData =
+export type HttpResponseEventData = { "type": "setting", name: string, value: string, } | { "type": "info", message: string, } | { "type": "redirect", url: string, status: number, behavior: string, dropped_body: boolean, dropped_headers: Array<string>, } | { "type": "send_url", method: string, scheme: string, username: string, password: string, host: string, port: number, path: string, query: string, fragment: string, } | { "type": "receive_url", version: string, status: string, } | { "type": "header_up", name: string, value: string, } | { "type": "header_down", name: string, value: string, } | { "type": "chunk_sent", bytes: number, } | { "type": "chunk_received", bytes: number, } | { "type": "dns_resolved", hostname: string, addresses: Array<string>, duration: bigint, overridden: boolean, };
-  | {
-      type: "setting";
-      name: string;
-      value: string;
-      source_model?: string;
-      source_id?: string;
-      source_name?: string;
-    }
-  | { type: "info"; message: string }
-  | {
-      type: "redirect";
-      url: string;
-      status: number;
-      behavior: string;
-      dropped_body: boolean;
-      dropped_headers: Array<string>;
-    }
-  | {
-      type: "send_url";
-      method: string;
-      scheme: string;
-      username: string;
-      password: string;
-      host: string;
-      port: number;
-      path: string;
-      query: string;
-      fragment: string;
-    }
-  | { type: "receive_url"; version: string; status: string }
-  | { type: "header_up"; name: string; value: string }
-  | { type: "header_down"; name: string; value: string }
-  | { type: "chunk_sent"; bytes: number }
-  | { type: "chunk_received"; bytes: number }
-  | {
-      type: "dns_resolved";
-      hostname: string;
-      addresses: Array<string>;
-      duration: bigint;
-      overridden: boolean;
-    };
 
-export type HttpResponseHeader = { name: string; value: string };
+export type HttpResponseHeader = { name: string, value: string, };
 
 export type HttpResponseState = "initialized" | "connected" | "closed";
 
-export type HttpUrlParameter = {
+export type HttpUrlParameter = { enabled?: boolean, 
-  enabled?: boolean;
+/**
-  /**
+ * Colon-prefixed parameters are treated as path parameters if they match, like `/users/:id`
-   * Colon-prefixed parameters are treated as path parameters if they match, like `/users/:id`
+ * Other entries are appended as query parameters
-   * Other entries are appended as query parameters
+ */
-   */
+name: string, value: string, id?: string, };
-  name: string;
-  value: string;
-  id?: string;
-};
 
-export type InheritedBoolSetting = { enabled?: boolean; value: boolean };
+export type KeyValue = { model: "key_value", id: string, createdAt: string, updatedAt: string, key: string, namespace: string, value: string, };
 
-export type InheritedIntSetting = { enabled?: boolean; value: number };
+export type Plugin = { model: "plugin", id: string, createdAt: string, updatedAt: string, checkedAt: string | null, directory: string, enabled: boolean, url: string | null, source: PluginSource, };
-
-export type KeyValue = {
-  model: "key_value";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  key: string;
-  namespace: string;
-  value: string;
-};
-
-export type Plugin = {
-  model: "plugin";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  checkedAt: string | null;
-  directory: string;
-  enabled: boolean;
-  url: string | null;
-  source: PluginSource;
-};
 
 export type PluginSource = "bundled" | "filesystem" | "registry";
 
-export type ProxySetting =
+export type ProxySetting = { "type": "enabled", http: string, https: string, auth: ProxySettingAuth | null, bypass: string, disabled: boolean, } | { "type": "disabled" };
-  | {
-      type: "enabled";
-      http: string;
-      https: string;
-      auth: ProxySettingAuth | null;
-      bypass: string;
-      disabled: boolean;
-    }
-  | { type: "disabled" };
 
-export type ProxySettingAuth = { user: string; password: string };
+export type ProxySettingAuth = { user: string, password: string, };
 
-export type Settings = {
+export type Settings = { model: "settings", id: string, createdAt: string, updatedAt: string, appearance: string, clientCertificates: Array<ClientCertificate>, coloredMethods: boolean, editorFont: string | null, editorFontSize: number, editorKeymap: EditorKeymap, editorSoftWrap: boolean, hideWindowControls: boolean, useNativeTitlebar: boolean, interfaceFont: string | null, interfaceFontSize: number, interfaceScale: number, openWorkspaceNewWindow: boolean | null, proxy: ProxySetting | null, themeDark: string, themeLight: string, updateChannel: string, hideLicenseBadge: boolean, autoupdate: boolean, autoDownloadUpdates: boolean, checkNotifications: boolean, hotkeys: { [key in string]?: Array<string> }, };
-  model: "settings";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  appearance: string;
-  clientCertificates: Array<ClientCertificate>;
-  coloredMethods: boolean;
-  editorFont: string | null;
-  editorFontSize: number;
-  editorKeymap: EditorKeymap;
-  editorSoftWrap: boolean;
-  hideWindowControls: boolean;
-  useNativeTitlebar: boolean;
-  interfaceFont: string | null;
-  interfaceFontSize: number;
-  interfaceScale: number;
-  openWorkspaceNewWindow: boolean | null;
-  proxy: ProxySetting | null;
-  themeDark: string;
-  themeLight: string;
-  updateChannel: string;
-  hideLicenseBadge: boolean;
-  autoupdate: boolean;
-  autoDownloadUpdates: boolean;
-  checkNotifications: boolean;
-  hotkeys: { [key in string]?: Array<string> };
-};
 
-export type SyncState = {
+export type SyncState = { model: "sync_state", id: string, workspaceId: string, createdAt: string, updatedAt: string, flushedAt: string, modelId: string, checksum: string, relPath: string, syncDir: string, };
-  model: "sync_state";
-  id: string;
-  workspaceId: string;
-  createdAt: string;
-  updatedAt: string;
-  flushedAt: string;
-  modelId: string;
-  checksum: string;
-  relPath: string;
-  syncDir: string;
-};
 
-export type WebsocketConnection = {
+export type WebsocketConnection = { model: "websocket_connection", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, elapsed: number, error: string | null, headers: Array<HttpResponseHeader>, state: WebsocketConnectionState, status: number, url: string, };
-  model: "websocket_connection";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  requestId: string;
-  elapsed: number;
-  error: string | null;
-  headers: Array<HttpResponseHeader>;
-  state: WebsocketConnectionState;
-  status: number;
-  url: string;
-};
 
 export type WebsocketConnectionState = "initialized" | "connected" | "closing" | "closed";
 
-export type WebsocketEvent = {
+export type WebsocketEvent = { model: "websocket_event", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, connectionId: string, isServer: boolean, message: Array<number>, messageType: WebsocketEventType, };
-  model: "websocket_event";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  requestId: string;
-  connectionId: string;
-  isServer: boolean;
-  message: Array<number>;
-  messageType: WebsocketEventType;
-};
 
 export type WebsocketEventType = "binary" | "close" | "frame" | "open" | "ping" | "pong" | "text";
 
-export type WebsocketRequest = {
+export type WebsocketRequest = { model: "websocket_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, message: string, name: string, sortPriority: number, url: string, 
-  model: "websocket_request";
+/**
-  id: string;
+ * URL parameters used for both path placeholders (`:id`) and query string entries.
-  createdAt: string;
+ */
-  updatedAt: string;
+urlParameters: Array<HttpUrlParameter>, };
-  workspaceId: string;
-  folderId: string | null;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  message: string;
-  name: string;
-  sortPriority: number;
-  url: string;
-  /**
-   * URL parameters used for both path placeholders (`:id`) and query string entries.
-   */
-  urlParameters: Array<HttpUrlParameter>;
-  settingSendCookies: InheritedBoolSetting;
-  settingStoreCookies: InheritedBoolSetting;
-  settingValidateCertificates: InheritedBoolSetting;
-};
 
-export type Workspace = {
+export type Workspace = { model: "workspace", id: string, createdAt: string, updatedAt: string, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, encryptionKeyChallenge: string | null, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, settingDnsOverrides: Array<DnsOverride>, };
-  model: "workspace";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  name: string;
-  encryptionKeyChallenge: string | null;
-  settingValidateCertificates: boolean;
-  settingFollowRedirects: boolean;
-  settingRequestTimeout: number;
-  settingDnsOverrides: Array<DnsOverride>;
-  settingSendCookies: boolean;
-  settingStoreCookies: boolean;
-};
 
-export type WorkspaceMeta = {
+export type WorkspaceMeta = { model: "workspace_meta", id: string, workspaceId: string, createdAt: string, updatedAt: string, encryptionKey: EncryptedKey | null, settingSyncDir: string | null, };
-  model: "workspace_meta";
-  id: string;
-  workspaceId: string;
-  createdAt: string;
-  updatedAt: string;
-  encryptionKey: EncryptedKey | null;
-  settingSyncDir: string | null;
-};

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
+    plugin_manager.uninstall(plugin_context, plugin.directory.as_str()).await?;
-        .uninstall(plugin_context, plugin.directory.as_str())
-        .await
-    {
-        if !matches!(err, PluginNotFoundErr(_)) {
-            return Err(err);
-        }
-    }
     Ok(plugin)
 }
 

crates/yaak-sync/bindings/gen_models.ts

@@ -1,181 +1,47 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type DnsOverride = {
+export type DnsOverride = { hostname: string, ipv4: Array<string>, ipv6: Array<string>, enabled?: boolean, };
-  hostname: string;
-  ipv4: Array<string>;
-  ipv6: Array<string>;
-  enabled?: boolean;
-};
 
-export type Environment = {
+export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, parentModel: string, parentId: string | null, 
-  model: "environment";
+/**
-  id: string;
+ * Variables defined in this environment scope.
-  workspaceId: string;
+ * Child environments override parent variables by name.
-  createdAt: string;
+ */
-  updatedAt: string;
+variables: Array<EnvironmentVariable>, color: string | null, sortPriority: number, };
-  name: string;
-  public: boolean;
-  parentModel: string;
-  parentId: string | null;
-  /**
-   * Variables defined in this environment scope.
-   * Child environments override parent variables by name.
-   */
-  variables: Array<EnvironmentVariable>;
-  color: string | null;
-  sortPriority: number;
-};
 
-export type EnvironmentVariable = { enabled?: boolean; name: string; value: string; id?: string };
+export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, id?: string, };
 
-export type Folder = {
+export type Folder = { model: "folder", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, sortPriority: number, };
-  model: "folder";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  folderId: string | null;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  name: string;
-  sortPriority: number;
-  settingSendCookies: InheritedBoolSetting;
-  settingStoreCookies: InheritedBoolSetting;
-  settingValidateCertificates: InheritedBoolSetting;
-  settingFollowRedirects: InheritedBoolSetting;
-  settingRequestTimeout: InheritedIntSetting;
-};
 
-export type GrpcRequest = {
+export type GrpcRequest = { model: "grpc_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authenticationType: string | null, authentication: Record<string, any>, description: string, message: string, metadata: Array<HttpRequestHeader>, method: string | null, name: string, service: string | null, sortPriority: number, 
-  model: "grpc_request";
+/**
-  id: string;
+ * Server URL (http for plaintext or https for secure)
-  createdAt: string;
+ */
-  updatedAt: string;
+url: string, };
-  workspaceId: string;
-  folderId: string | null;
-  authenticationType: string | null;
-  authentication: Record<string, any>;
-  description: string;
-  message: string;
-  metadata: Array<HttpRequestHeader>;
-  method: string | null;
-  name: string;
-  service: string | null;
-  sortPriority: number;
-  /**
-   * Server URL (http for plaintext or https for secure)
-   */
-  url: string;
-  settingValidateCertificates: InheritedBoolSetting;
-};
 
-export type HttpRequest = {
+export type HttpRequest = { model: "http_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, body: Record<string, any>, bodyType: string | null, description: string, headers: Array<HttpRequestHeader>, method: string, name: string, sortPriority: number, url: string, 
-  model: "http_request";
+/**
-  id: string;
+ * URL parameters used for both path placeholders (`:id`) and query string entries.
-  createdAt: string;
+ */
-  updatedAt: string;
+urlParameters: Array<HttpUrlParameter>, };
-  workspaceId: string;
-  folderId: string | null;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  body: Record<string, any>;
-  bodyType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  method: string;
-  name: string;
-  sortPriority: number;
-  url: string;
-  /**
-   * URL parameters used for both path placeholders (`:id`) and query string entries.
-   */
-  urlParameters: Array<HttpUrlParameter>;
-  settingSendCookies: InheritedBoolSetting;
-  settingStoreCookies: InheritedBoolSetting;
-  settingValidateCertificates: InheritedBoolSetting;
-  settingFollowRedirects: InheritedBoolSetting;
-  settingRequestTimeout: InheritedIntSetting;
-};
 
-export type HttpRequestHeader = { enabled?: boolean; name: string; value: string; id?: string };
+export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, id?: string, };
 
-export type HttpUrlParameter = {
+export type HttpUrlParameter = { enabled?: boolean, 
-  enabled?: boolean;
+/**
-  /**
+ * Colon-prefixed parameters are treated as path parameters if they match, like `/users/:id`
-   * Colon-prefixed parameters are treated as path parameters if they match, like `/users/:id`
+ * Other entries are appended as query parameters
-   * Other entries are appended as query parameters
+ */
-   */
+name: string, value: string, id?: string, };
-  name: string;
-  value: string;
-  id?: string;
-};
 
-export type InheritedBoolSetting = { enabled?: boolean; value: boolean };
+export type SyncModel = { "type": "workspace" } & Workspace | { "type": "environment" } & Environment | { "type": "folder" } & Folder | { "type": "http_request" } & HttpRequest | { "type": "grpc_request" } & GrpcRequest | { "type": "websocket_request" } & WebsocketRequest;
 
-export type InheritedIntSetting = { enabled?: boolean; value: number };
+export type SyncState = { model: "sync_state", id: string, workspaceId: string, createdAt: string, updatedAt: string, flushedAt: string, modelId: string, checksum: string, relPath: string, syncDir: string, };
 
-export type SyncModel =
+export type WebsocketRequest = { model: "websocket_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, message: string, name: string, sortPriority: number, url: string, 
-  | ({ type: "workspace" } & Workspace)
+/**
-  | ({ type: "environment" } & Environment)
+ * URL parameters used for both path placeholders (`:id`) and query string entries.
-  | ({ type: "folder" } & Folder)
+ */
-  | ({ type: "http_request" } & HttpRequest)
+urlParameters: Array<HttpUrlParameter>, };
-  | ({ type: "grpc_request" } & GrpcRequest)
-  | ({ type: "websocket_request" } & WebsocketRequest);
 
-export type SyncState = {
+export type Workspace = { model: "workspace", id: string, createdAt: string, updatedAt: string, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, encryptionKeyChallenge: string | null, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, settingDnsOverrides: Array<DnsOverride>, };
-  model: "sync_state";
-  id: string;
-  workspaceId: string;
-  createdAt: string;
-  updatedAt: string;
-  flushedAt: string;
-  modelId: string;
-  checksum: string;
-  relPath: string;
-  syncDir: string;
-};
-
-export type WebsocketRequest = {
-  model: "websocket_request";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  workspaceId: string;
-  folderId: string | null;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  message: string;
-  name: string;
-  sortPriority: number;
-  url: string;
-  /**
-   * URL parameters used for both path placeholders (`:id`) and query string entries.
-   */
-  urlParameters: Array<HttpUrlParameter>;
-  settingSendCookies: InheritedBoolSetting;
-  settingStoreCookies: InheritedBoolSetting;
-  settingValidateCertificates: InheritedBoolSetting;
-};
-
-export type Workspace = {
-  model: "workspace";
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  authentication: Record<string, any>;
-  authenticationType: string | null;
-  description: string;
-  headers: Array<HttpRequestHeader>;
-  name: string;
-  encryptionKeyChallenge: string | null;
-  settingValidateCertificates: boolean;
-  settingFollowRedirects: boolean;
-  settingRequestTimeout: number;
-  settingDnsOverrides: Array<DnsOverride>;
-  settingSendCookies: boolean;
-  settingStoreCookies: boolean;
-};

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;