Fix native TLS client certificates on Linux (#554 )

Move the RPC wire schema into a Tauri-free crate (#553 )
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
2026-08-16 08:31:57 +02:00 · 2026-08-15 11:36:36 -07:00 · 2026-08-15 11:25:27 -07:00 · 2026-08-15 11:01:41 -07:00 · 2026-08-15 10:14:13 -07:00 · 2026-08-15 10:03:43 -07:00
81 changed files with 3242 additions and 5454 deletions
@@ -613,15 +613,11 @@ checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
 "async-trait",
 "axum-core",
- "axum-macros",
- "base64 0.22.1",
 "bytes",
 "futures-util",
 "http",
 "http-body",
 "http-body-util",
- "hyper",
- "hyper-util",
 "itoa",
 "matchit",
 "memchr",
@@ -630,17 +626,10 @@ dependencies = [
 "pin-project-lite",
 "rustversion",
 "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
- "sha1",
 "sync_wrapper",
- "tokio",
- "tokio-tungstenite 0.24.0",
 "tower 0.5.2",
 "tower-layer",
 "tower-service",
- "tracing",
 ]

 [[package]]
@@ -661,18 +650,6 @@ dependencies = [
 "sync_wrapper",
 "tower-layer",
 "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "axum-macros"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.101",
 ]

 [[package]]
@@ -3256,12 +3233,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"

-[[package]]
-name = "http-range-header"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c"
-
 [[package]]
 name = "httparse"
 version = "1.10.1"
@@ -9109,18 +9080,6 @@ dependencies = [
 "tokio",
 ]

-[[package]]
-name = "tokio-tungstenite"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9"
-dependencies = [
- "futures-util",
- "log 0.4.29",
- "tokio",
- "tungstenite 0.24.0",
-]
-
 [[package]]
 name = "tokio-tungstenite"
 version = "0.26.2"
@@ -9134,7 +9093,7 @@ dependencies = [
 "rustls-pki-types",
 "tokio",
 "tokio-rustls",
- "tungstenite 0.26.2",
+ "tungstenite",
 ]

 [[package]]
@@ -9328,7 +9287,6 @@ dependencies = [
 "tokio",
 "tower-layer",
 "tower-service",
- "tracing",
 ]

 [[package]]
@@ -9339,23 +9297,13 @@ checksum = "68d6fdd9f81c2819c9a8b0e0cd91660e7746a8e6ea2ba7c6b2b057985f6bcb51"
 dependencies = [
 "bitflags 2.11.0",
 "bytes",
- "futures-core",
 "futures-util",
 "http",
 "http-body",
- "http-body-util",
- "http-range-header",
- "httpdate",
- "mime",
- "mime_guess",
- "percent-encoding",
 "pin-project-lite",
- "tokio",
- "tokio-util",
 "tower 0.5.2",
 "tower-layer",
 "tower-service",
- "tracing",
 "url",
 ]

@@ -9377,7 +9325,6 @@ version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
- "log 0.4.29",
 "pin-project-lite",
 "tracing-attributes",
 "tracing-core",
@@ -9524,24 +9471,6 @@ dependencies = [
 "termcolor",
 ]

-[[package]]
-name = "tungstenite"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http",
- "httparse",
- "log 0.4.29",
- "rand 0.8.5",
- "sha1",
- "thiserror 1.0.69",
- "utf-8",
-]
-
 [[package]]
 name = "tungstenite"
 version = "0.26.2"
@@ -11087,7 +11016,7 @@ dependencies = [
 "thiserror 2.0.17",
 "tokio",
 "tokio-stream",
- "tokio-tungstenite 0.26.2",
+ "tokio-tungstenite",
 "tokio-util",
 "ts-rs",
 "url",
@@ -11106,6 +11035,7 @@ dependencies = [
 "yaak-models",
 "yaak-plugins",
 "yaak-rpc",
+ "yaak-rpc-schema",
 "yaak-sse",
 "yaak-sync",
 "yaak-system-appearance",
@@ -11388,7 +11318,7 @@ dependencies = [
 "sha2",
 "thiserror 2.0.17",
 "tokio",
- "tokio-tungstenite 0.26.2",
+ "tokio-tungstenite",
 "ts-rs",
 "yaak-common",
 "yaak-crypto",
@@ -11444,37 +11374,19 @@ dependencies = [
 ]

 [[package]]
-name = "yaak-server"
-version = "0.1.0"
+name = "yaak-rpc-schema"
+version = "0.0.0"
 dependencies = [
- "axum",
- "charset",
- "chrono",
- "clap",
- "dirs",
- "env_logger",
- "eventsource-client",
- "futures",
- "include_dir",
- "log 0.4.29",
- "mime_guess",
- "pretty_graphql",
- "rand 0.8.5",
 "serde",
- "serde_json",
- "serde_urlencoded",
- "tokio",
- "tower-http",
- "yaak",
- "yaak-common",
- "yaak-core",
- "yaak-crypto",
- "yaak-http",
+ "ts-rs",
+ "yaak-git",
+ "yaak-grpc",
 "yaak-models",
 "yaak-plugins",
- "yaak-rpc",
 "yaak-sse",
+ "yaak-sync",
 "yaak-templates",
+ "yaak-ws",
 ]

 [[package]]
@@ -11542,6 +11454,7 @@ version = "0.1.0"
 dependencies = [
 "log 0.4.29",
 "p12",
+ "pem",
 "rustls",
 "rustls-pemfile",
 "rustls-platform-verifier",
@@ -11577,7 +11490,7 @@ dependencies = [
 "serde_json",
 "thiserror 2.0.17",
 "tokio",
- "tokio-tungstenite 0.26.2",
+ "tokio-tungstenite",
 "url",
 "yaak-http",
 "yaak-models",
@@ -5,6 +5,7 @@ members = [
  # Common/foundation crates
  "crates/common/yaak-database",
  "crates/common/yaak-rpc",
+  "crates/common/yaak-rpc-schema",
  # Shared crates (no Tauri dependency)
  "crates/yaak-core",
  "crates/yaak-common",
@@ -25,8 +26,6 @@ members = [
  "crates-proxy/yaak-proxy-lib",
  # CLI crates
  "crates-cli/yaak-cli",
-  # Headless server crates
-  "crates-server/yaak-server",
  # Tauri-specific crates
  "crates-tauri/yaak-app-client",
  "crates-tauri/yaak-app-proxy",
@@ -65,6 +64,7 @@ ts-rs = "11.1.0"
 # Internal crates - common/foundation
 yaak-database = { path = "crates/common/yaak-database" }
 yaak-rpc = { path = "crates/common/yaak-rpc" }
+yaak-rpc-schema = { path = "crates/common/yaak-rpc-schema" }

 # Internal crates - shared
 yaak-core = { path = "crates/yaak-core" }
@@ -410,7 +410,7 @@ function EnsureCompleteResponse({
  Component,
 }: {
  response: HttpResponse;
-  Component: ComponentType<{ url: string }>;
+  Component: ComponentType<{ bodyUrl: string }>;
 }) {
  // Wait until the response has been fully-downloaded before asking for it
  const complete = response.state === "closed";
@@ -432,7 +432,7 @@ function EnsureCompleteResponse({
    return <div>Empty response body</div>;
  }

-  return <Component url={bodyUrl.data} />;
+  return <Component bodyUrl={bodyUrl.data} />;
 }

 function HttpSvgViewer({ response }: { response: HttpResponse }) {
@@ -1,56 +1,138 @@
-import { VStack } from "@yaakapp-internal/ui";
-import { useState } from "react";
+import { platform } from "@yaakapp-internal/platform";
+import { Icon, VStack } from "@yaakapp-internal/ui";
+import classNames from "classnames";
+import { useEffect, useRef, useState } from "react";
 import { useLocalStorage } from "react-use";
 import { CommercialUseBanner } from "./CommercialUseBanner";
 import { Button } from "./core/Button";
-import { SelectFile } from "./SelectFile";
+import { PlainInput } from "./core/PlainInput";

 interface Props {
-  importData: (filePath: string) => Promise<void>;
+  importFile: (filePath: string) => Promise<void>;
+  importUrl: (url: string) => Promise<void>;
 }

-export function ImportDataDialog({ importData }: Props) {
+/**
+ * An absolute or relative path is unambiguously a file. Everything else is treated as a URL, so a
+ * bare host like `example.com/openapi.json` still works (the backend defaults it to https).
+ */
+function isFilePath(value: string): boolean {
+  return (
+    value.startsWith("/") ||
+    value.startsWith("./") ||
+    value.startsWith("../") ||
+    value.startsWith("~/") ||
+    value.startsWith("\\\\") ||
+    /^[a-zA-Z]:[\\/]/.test(value)
+  );
+}
+
+function fileName(path: string): string {
+  return path.split(/[/\\]/).at(-1) || path;
+}
+
+export function ImportDataDialog({ importFile, importUrl }: Props) {
  const [isLoading, setIsLoading] = useState<boolean>(false);
-  const [filePath, setFilePath] = useLocalStorage<string | null>("importFilePath", null);
+  // A file path or a URL. Both inputs write here, so there is only ever one thing to import
+  const [source, setSource] = useLocalStorage<string | null>("importPathOrUrl", null);
+  const [forceUpdateKey, setForceUpdateKey] = useState<number>(0);
+  const [isHovering, setIsHovering] = useState<boolean>(false);
+  const ref = useRef<HTMLDivElement>(null);
+  const trimmedSource = source?.trim() ?? "";
+  const filePath = isFilePath(trimmedSource) ? trimmedSource : null;
+
+  const selectSource = (value: string) => {
+    setSource(value);
+    // Remount the input so it shows the path of the newly-picked file
+    setForceUpdateKey((k) => k + 1);
+  };
+
+  // Accept a file dropped anywhere on the dialog, the way SelectFile does for its button
+  useEffect(() => {
+    return platform.window.onDragDrop((event) => {
+      if (event.type === "over") {
+        const p = event.position;
+        const r = ref.current?.getBoundingClientRect();
+        if (r == null) return;
+        setIsHovering(p.x >= r.left && p.x <= r.right && p.y >= r.top && p.y <= r.bottom);
+      } else if (event.type === "drop" && isHovering) {
+        const p = event.paths[0];
+        if (p) selectSource(p);
+        setIsHovering(false);
+      } else {
+        setIsHovering(false);
+      }
+    });
+  }, [isHovering, setSource]);
+
+  const handleSelectFile = async () => {
+    const selected = await platform.dialog.open({ title: "Select File", multiple: false });
+    if (selected == null) return;
+    selectSource(selected);
+  };
+
+  const handleImport = async () => {
+    setIsLoading(true);
+    try {
+      if (filePath != null) {
+        await importFile(filePath);
+      } else {
+        await importUrl(trimmedSource);
+      }
+    } finally {
+      setIsLoading(false);
+    }
+  };

  return (
-    <VStack space={5} className="pb-4">
+    <VStack ref={ref} space={4} className="pb-4">
      <CommercialUseBanner source="data-import" title="Importing work data?" />

-      <VStack space={1}>
-        <ul className="list-disc pl-5">
-          <li>OpenAPI 3.0, 3.1</li>
-          <li>Postman Collection v2, v2.1</li>
-          <li>Insomnia v4+</li>
-          <li>Swagger 2.0</li>
-          <li>
-            Curl commands <em className="text-text-subtle">(or paste into URL)</em>
-          </li>
-        </ul>
-      </VStack>
-      <VStack space={2}>
-        <SelectFile
-          filePath={filePath ?? null}
-          onChange={({ filePath }) => setFilePath(filePath)}
-        />
-        {filePath && (
-          <Button
-            color="primary"
-            disabled={!filePath || isLoading}
-            isLoading={isLoading}
-            size="sm"
-            onClick={async () => {
-              setIsLoading(true);
-              try {
-                await importData(filePath);
-              } finally {
-                setIsLoading(false);
-              }
-            }}
-          >
-            {isLoading ? "Importing" : "Import"}
-          </Button>
+      <button
+        type="button"
+        onClick={handleSelectFile}
+        className={classNames(
+          "w-full rounded-lg border border-dashed px-4 py-6",
+          "flex flex-col items-center gap-1 text-center",
+          isHovering ? "border-notice bg-surface-highlight" : "border-border hover:border-text",
        )}
+      >
+        <Icon icon="folder_input" className="text-text-subtlest w-8! h-8! mb-2" />
+        {/* Fixed height so the region doesn't resize between the empty and selected states */}
+        <div className="h-6 w-full flex items-center justify-center">
+          {filePath == null ? (
+            <div className="text-text">
+              <strong className="font-semibold">Choose a file</strong> or drag it here
+            </div>
+          ) : (
+            <div className="text-text font-mono text-xs max-w-full truncate" title={filePath}>
+              {fileName(filePath)}
+            </div>
+          )}
+        </div>
+        <div className="text-xs text-text-subtlest">
+          Supports OpenAPI, Swagger, Postman, Insomnia, and curl
+        </div>
+      </button>
+
+      <VStack space={2}>
+        <PlainInput
+          label="Or enter a file path or URL"
+          size="sm"
+          placeholder="https://example.com/openapi.json"
+          defaultValue={source ?? ""}
+          forceUpdateKey={String(forceUpdateKey)}
+          onChange={setSource}
+        />
+        <Button
+          color="primary"
+          disabled={trimmedSource === "" || isLoading}
+          isLoading={isLoading}
+          size="sm"
+          onClick={handleImport}
+        >
+          {isLoading ? "Importing" : "Import"}
+        </Button>
      </VStack>
    </VStack>
  );
@@ -36,12 +36,16 @@ import { fireAndForget } from "../../lib/fireAndForget";
 import { ErrorBoundary } from "../ErrorBoundary";
 import { Button } from "./Button";
 import { Hotkey } from "./Hotkey";
+import { IconButton } from "./IconButton";
+import type { SeparatorAction } from "./Separator";
 import { Separator } from "./Separator";

 export type DropdownItemSeparator = {
  type: "separator";
  label?: ReactNode;
  hidden?: boolean;
+  /** A control shown beside the label, eg. revealing the labelled file on disk. */
+  action?: SeparatorAction;
 };

 export type DropdownItemContent = {
@@ -66,6 +70,12 @@ export type DropdownItemDefault = {
  submenu?: DropdownItem[];
  /** If true, submenu opens on click instead of hover */
  submenuOpenOnClick?: boolean;
+  /**
+   * How the submenu opens. "row" (default) opens it from the row itself (hover, or click
+   * with submenuOpenOnClick). "button" keeps the row selectable via onSelect and renders
+   * a dedicated button on the right that opens the submenu.
+   */
+  submenuTrigger?: "row" | "button";
  icon?: IconProps["icon"];
 };

@@ -502,9 +512,15 @@ const Menu = forwardRef<Omit<DropdownRef, "open" | "isOpen" | "toggle" | "items"
          }
        }

-        if (!item.keepOpenOnSelect) handleCloseAll();
+        if (!item.keepOpenOnSelect) {
+          handleCloseAll();
+        } else if (isSubmenu) {
+          // Keep the parent menu open, but close this submenu — its items may no
+          // longer describe the row after the action (e.g. Pin → Unpin, Remove)
+          handleClose();
+        }
      },
-      [handleCloseAll, setSelectedIndex],
+      [handleCloseAll, handleClose, isSubmenu, setSelectedIndex],
    );

    useImperativeHandle(ref, () => {
@@ -629,7 +645,7 @@ const Menu = forwardRef<Omit<DropdownRef, "open" | "isOpen" | "toggle" | "items"
        const item = filteredItems[selectedIndex ?? -1];
        if (!item || item.type === "separator" || item.type === "content") return;
        e.preventDefault();
-        if (item.submenu) {
+        if (item.submenu && item.submenuTrigger !== "button") {
          const parent = document.activeElement as HTMLButtonElement;
          if (parent) {
            setActiveSubmenu({ item, parent, viaKeyboard: true });
@@ -648,9 +664,11 @@ const Menu = forwardRef<Omit<DropdownRef, "open" | "isOpen" | "toggle" | "items"
          clearTimeout(submenuTimeoutRef.current);
        }

-        if (item.submenu && !item.submenuOpenOnClick) {
+        if (item.submenu && !item.submenuOpenOnClick && item.submenuTrigger !== "button") {
          setActiveSubmenu({ item, parent });
-        } else if (activeSubmenu) {
+        } else if (activeSubmenu && activeSubmenu.item !== item) {
+          // Hovering the row that owns the open submenu must not dismiss it — the
+          // pointer travels across the row on its way to a button-triggered submenu
          submenuTimeoutRef.current = window.setTimeout(() => {
            const submenuEl = submenuRef.current;
            if (!submenuEl || !activeSubmenu) {
@@ -776,6 +794,7 @@ const Menu = forwardRef<Omit<DropdownRef, "open" | "isOpen" | "toggle" | "items"
                  // oxlint-disable-next-line no-array-index-key -- Nothing else available
                  key={i}
                  className={classNames("my-1.5", item.label ? "ml-2" : null)}
+                  action={item.action}
                >
                  {item.label}
                </Separator>
@@ -797,6 +816,7 @@ const Menu = forwardRef<Omit<DropdownRef, "open" | "isOpen" | "toggle" | "items"
                onFocus={handleFocus}
                onSelect={handleSelect}
                onHover={handleItemHover}
+                onOpenSubmenu={(item, el) => setActiveSubmenu({ item, parent: el })}
                // oxlint-disable-next-line no-array-index-key -- It's fine
                key={i}
                item={item}
@@ -868,6 +888,7 @@ interface MenuItemProps {
  onSelect: (item: DropdownItemDefault, el?: HTMLButtonElement) => Promise<void>;
  onFocus: (item: DropdownItemDefault) => void;
  onHover: (item: DropdownItemDefault, el: HTMLButtonElement) => void;
+  onOpenSubmenu: (item: DropdownItemDefault, el: HTMLButtonElement) => void;
  focused: boolean;
  isParentOfActiveSubmenu?: boolean;
 }
@@ -879,6 +900,7 @@ function MenuItem({
  onHover,
  item,
  onSelect,
+  onOpenSubmenu,
  isParentOfActiveSubmenu,
  ...props
 }: MenuItemProps) {
@@ -914,19 +936,22 @@ function MenuItem({
    e.currentTarget.focus();
  };

-  const rightSlot = item.submenu ? (
-    <Icon icon="chevron_right" color="secondary" />
-  ) : (
-    (item.rightSlot ?? <Hotkey variant="text" action={item.hotKeyAction ?? null} />)
-  );
+  const hasButtonSubmenu = item.submenu != null && item.submenuTrigger === "button";

-  return (
+  const rightSlot =
+    item.submenu && !hasButtonSubmenu ? (
+      <Icon icon="chevron_right" color="secondary" />
+    ) : (
+      (item.rightSlot ?? <Hotkey variant="text" action={item.hotKeyAction ?? null} />)
+    );
+
+  const button = (
    <Button
      ref={initRef}
      size="sm"
      tabIndex={-1}
-      onMouseEnter={handleMouseEnter}
-      onMouseLeave={(e) => e.currentTarget.blur()}
+      onMouseEnter={hasButtonSubmenu ? undefined : handleMouseEnter}
+      onMouseLeave={hasButtonSubmenu ? undefined : (e) => e.currentTarget.blur()}
      disabled={item.disabled}
      onFocus={handleFocus}
      onClick={handleClick}
@@ -947,6 +972,7 @@ function MenuItem({
        "min-w-32 outline-hidden px-2 mx-1.5 flex whitespace-nowrap",
        "focus:bg-surface-highlight focus:text rounded-sm focus:outline-hidden focus-visible:outline-1",
        isParentOfActiveSubmenu && "bg-surface-highlight text rounded-sm",
+        hasButtonSubmenu && "pr-8",
        item.color === "danger" && "text-danger!",
        item.color === "primary" && "text-primary!",
        item.color === "success" && "text-success!",
@@ -959,6 +985,52 @@ function MenuItem({
      <div className={classNames("truncate min-w-20")}>{item.label}</div>
    </Button>
  );
+
+  if (!hasButtonSubmenu) {
+    return button;
+  }
+
+  // The submenu trigger overlays the row as a sibling (not a child) because the row is
+  // itself a button and buttons cannot nest. Hover handling lives on this wrapper so the
+  // row keeps its focus highlight while the mouse is over the trigger.
+  return (
+    <div
+      className="relative grid group/menuitem"
+      onMouseEnter={() => {
+        const el = buttonRef.current;
+        if (el == null) return;
+        onHover(item, el);
+        el.focus();
+      }}
+      onMouseLeave={() => buttonRef.current?.blur()}
+    >
+      {button}
+      <div
+        className={classNames(
+          "absolute right-1.5 inset-y-0 flex items-center",
+          "opacity-0 group-hover/menuitem:opacity-100 group-focus-within/menuitem:opacity-100",
+        )}
+      >
+        <IconButton
+          color="custom"
+          size="2xs"
+          tabIndex={-1}
+          icon="ellipsis_vertical"
+          iconColor="secondary"
+          title="More actions"
+          className="h-full! w-7!"
+          onMouseDown={(e) => {
+            // Prevent the trigger from stealing focus, which would unhighlight the row
+            e.preventDefault();
+          }}
+          onClick={(e) => {
+            e.stopPropagation();
+            onOpenSubmenu(item, e.currentTarget);
+          }}
+        />
+      </div>
+    </div>
+  );
 }

 interface MenuItemHotKeyProps {
@@ -1,13 +1,31 @@
 import type { Color } from "@yaakapp-internal/plugins";
+import type { IconProps } from "@yaakapp-internal/ui";
+import { IconButton } from "@yaakapp-internal/ui";
 import classNames from "classnames";
 import type { ReactNode } from "react";

+/**
+ * A single control attached to a labelled separator, rendered between the label
+ * and the rule.
+ *
+ * Declared rather than passed as a node so the separator keeps ownership of the
+ * things that are easy to get wrong by hand: matching the label's colour, and
+ * staying out of the rule's way when the label is long.
+ */
+export interface SeparatorAction {
+  icon: IconProps["icon"];
+  /** Tooltip and accessible name. Required — the control is icon-only. */
+  title: string;
+  onClick: () => void;
+}
+
 interface Props {
  orientation?: "horizontal" | "vertical";
  dashed?: boolean;
  className?: string;
  children?: ReactNode;
  color?: Color;
+  action?: SeparatorAction;
 }

 export function Separator({
@@ -16,15 +34,31 @@ export function Separator({
  dashed,
  orientation = "horizontal",
  children,
+  action,
 }: Props) {
  return (
    <div role="presentation" className={classNames(className, "flex items-center w-full")}>
      {children && (
        <div className="text-sm text-text-subtlest mr-2 whitespace-nowrap">{children}</div>
      )}
+      {action && (
+        <IconButton
+          size="2xs"
+          iconSize="xs"
+          className="shrink-0 mr-2 -ml-1"
+          // Forced, because the button itself sets `text-text` at full strength.
+          iconClassName="text-text-subtlest!"
+          icon={action.icon}
+          title={action.title}
+          onClick={action.onClick}
+        />
+      )}
      <div
        className={classNames(
          "opacity-60",
+          // Keep a stub of the line visible no matter how long the label is —
+          // `w-full` alone gets squeezed to nothing by a wide label.
+          orientation === "horizontal" && "min-w-8",
          color == null && "border-border",
          color === "primary" && "border-primary",
          color === "secondary" && "border-secondary",
@@ -1,4 +1,5 @@
 import type { HttpRequest } from "@yaakapp-internal/models";
+import { platform } from "@yaakapp-internal/platform";

 import { useAtom } from "jotai";
 import { useCallback, useEffect, useMemo } from "react";
@@ -11,6 +12,7 @@ import type { DropdownItem } from "../core/Dropdown";
 import { Dropdown } from "../core/Dropdown";
 import type { EditorProps } from "../core/Editor/Editor";
 import { Editor } from "../core/Editor/LazyEditor";
+import { IconButton } from "../core/IconButton";
 import type { RadioDropdownItem } from "../core/RadioDropdown";
 import { RadioDropdown } from "../core/RadioDropdown";
 import { Banner, FormattedError, Icon } from "@yaakapp-internal/ui";
@@ -18,6 +20,7 @@ import { Separator } from "../core/Separator";
 import { tryFormatGraphql } from "../../lib/formatters";
 import { parseGraphQLOperationNames } from "../../lib/graphqlOperationNames";
 import { normalizeGraphQLBody } from "../../lib/requestBodyConversion";
+import { revealInFinderText } from "../../lib/reveal";
 import { showGraphQLDocExplorerAtom } from "./graphqlAtoms";

 type Props = Pick<EditorProps, "heightMode" | "className" | "forceUpdateKey"> & {
@@ -28,6 +31,10 @@ type Props = Pick<EditorProps, "heightMode" | "className" | "forceUpdateKey"> &

 const OPERATION_NAME_NOT_SPECIFIED = "";

+// How much of the end of a schema filename is pinned when middle-truncating it.
+// Enough to keep the extension and a little of the name before it.
+const FILE_NAME_TAIL_CHARS = 12;
+
 export function GraphQLEditor(props: Props) {
  // There's some weirdness with stale onChange being called when switching requests, so we'll
  // key on the request ID as a workaround for now.
@@ -38,9 +45,41 @@ function GraphQLEditorInner({ request, onChange, baseRequest, ...extraEditorProp
  const [autoIntrospectDisabled, setAutoIntrospectDisabled] = useLocalStorage<
    Record<string, boolean>
  >("graphQLAutoIntrospectDisabled", {});
-  const { schema, isLoading, error, refetch, clear } = useIntrospectGraphQL(baseRequest, {
+  const {
+    schema,
+    isLoading,
+    error,
+    refetch,
+    clear,
+    loadFromFile,
+    reloadFromFile,
+    removeSchemaFile,
+    filePath,
+  } = useIntrospectGraphQL(baseRequest, {
    disabled: autoIntrospectDisabled?.[baseRequest.id],
  });
+
+  // Last path segment, for display only. The host owns real path semantics; this
+  // just needs something short enough to label the divider with.
+  const fileName = useMemo(() => filePath?.split(/[/\\]/).pop() || filePath, [filePath]);
+
+  // Selecting a file is all it takes — the request's source becomes that file,
+  // which is what keeps automatic introspection from overwriting it.
+  const handleLoadFromFile = useCallback(async () => {
+    const selected = await platform.dialog.open({
+      title: "Load GraphQL Schema",
+      multiple: false,
+      filters: [
+        {
+          name: "GraphQL Schema",
+          extensions: ["graphql", "graphqls", "gql", "json"],
+        },
+      ],
+    });
+    if (selected == null) return;
+
+    await loadFromFile(selected);
+  }, [loadFromFile]);
  const [currentBody, setCurrentBody] = useStateWithDeps<{
    query: string;
    variables: string | undefined;
@@ -160,14 +199,37 @@ function GraphQLEditorInner({ request, onChange, baseRequest, ...extraEditorProp
              ...((schema != null
                ? [
                    {
-                      label: "Clear",
+                      label: "Clear Schema",
                      onSelect: clear,
                      color: "danger",
                      leftSlot: <Icon icon="trash" />,
                    },
-                    { type: "separator" },
                  ]
                : []) satisfies DropdownItem[]),
+              {
+                // Labels the source actions below it, so the menu says where the
+                // schema came from without spending a row on it.
+                type: "separator",
+                hidden: schema == null && filePath == null,
+                label:
+                  fileName == null || filePath == null ? undefined : (
+                    // Middle truncation: the head shrinks and ellipsizes while the
+                    // tail is pinned, so the extension always survives. Full path
+                    // on hover.
+                    <div className="flex min-w-0 max-w-[16rem] font-mono text-xs" title={filePath}>
+                      <span className="truncate">{fileName.slice(0, -FILE_NAME_TAIL_CHARS)}</span>
+                      <span className="shrink-0">{fileName.slice(-FILE_NAME_TAIL_CHARS)}</span>
+                    </div>
+                  ),
+                action:
+                  filePath == null
+                    ? undefined
+                    : {
+                        icon: "folder_symlink",
+                        title: revealInFinderText,
+                        onClick: () => platform.revealItemInDir(filePath),
+                      },
+              },
              {
                hidden: !error,
                label: (
@@ -210,25 +272,33 @@ function GraphQLEditorInner({ request, onChange, baseRequest, ...extraEditorProp
                type: "content",
              },
              {
-                hidden: schema == null,
-                label: `${isDocOpen ? "Hide" : "Show"} Documentation`,
-                leftSlot: <Icon icon="book_open_text" />,
-                onSelect: () => {
-                  setGraphqlDocStateAtomValue((v) => ({
-                    ...v,
-                    [request.id]: isDocOpen ? undefined : null,
-                  }));
+                // One refresh action for either source: re-read the file, or
+                // re-introspect the server.
+                label: "Reload Schema",
+                leftSlot: <Icon icon="refresh" spin={isLoading} />,
+                keepOpenOnSelect: true,
+                // Failures surface through the hook's error state either way.
+                onSelect: async () => {
+                  if (filePath != null) await reloadFromFile();
+                  else await refetch();
                },
              },
              {
-                label: "Introspect Schema",
-                leftSlot: <Icon icon="refresh" spin={isLoading} />,
-                keepOpenOnSelect: true,
-                onSelect: refetch,
+                label: filePath == null ? "Load Schema from File…" : "Load a Different File…",
+                leftSlot: <Icon icon="import" />,
+                onSelect: handleLoadFromFile,
              },
-              { type: "separator", label: "Setting" },
              {
-                label: "Automatic Introspection",
+                hidden: filePath == null,
+                label: "Stop Using File",
+                leftSlot: <Icon icon="x" />,
+                onSelect: removeSchemaFile,
+              },
+              { type: "separator", label: "Settings" },
+              {
+                // Governs both sources: re-introspecting the server, and
+                // re-reading the file when the request is opened.
+                label: filePath == null ? "Automatic Introspection" : "Automatic Reload",
                keepOpenOnSelect: true,
                onSelect: () => {
                  setAutoIntrospectDisabled({
@@ -261,6 +331,29 @@ function GraphQLEditorInner({ request, onChange, baseRequest, ...extraEditorProp
          </Dropdown>
        )}
      </div>,
+      // Sits after the schema control it depends on. Always rendered, disabled
+      // without a schema, so the row never changes shape.
+      <div key="documentation" className="opacity-100!">
+          <IconButton
+            size="sm"
+            variant="border"
+            icon="book_open_text"
+            disabled={schema == null}
+            title={
+              schema == null
+                ? "Documentation unavailable without a schema"
+                : isDocOpen
+                  ? "Hide Documentation"
+                  : "Show Documentation"
+            }
+            onClick={() => {
+              setGraphqlDocStateAtomValue((v) => ({
+                ...v,
+                [request.id]: isDocOpen ? undefined : null,
+              }));
+            }}
+          />
+      </div>,
    ],
    [
      schema,
@@ -272,6 +365,11 @@ function GraphQLEditorInner({ request, onChange, baseRequest, ...extraEditorProp
      isLoading,
      operationNames,
      refetch,
+      handleLoadFromFile,
+      reloadFromFile,
+      removeSchemaFile,
+      filePath,
+      fileName,
      autoIntrospectDisabled,
      baseRequest.id,
      setGraphqlDocStateAtomValue,
@@ -1,18 +1,18 @@
 import { useEffect, useState } from "react";

 interface Props {
-  /** A URL the host resolved, for a body it already stored. */
-  url?: string;
+  /** A URL for the body the host already stored. */
+  bodyUrl?: string;
  data?: Uint8Array;
  mimeType?: string;
 }

-export function AudioViewer({ url, data, mimeType }: Props) {
+export function AudioViewer({ bodyUrl, data, mimeType }: Props) {
  const [src, setSrc] = useState<string>();

  useEffect(() => {
-    if (url) {
-      setSrc(url);
+    if (bodyUrl) {
+      setSrc(bodyUrl);
    } else if (data) {
      // The type matters here in a way it doesn't for an image: a media element goes by what
      // the blob declares rather than sniffing it, so an Ogg labelled as MP3 won't play
@@ -23,7 +23,7 @@ export function AudioViewer({ url, data, mimeType }: Props) {
    } else {
      setSrc(undefined);
    }
-  }, [url, data, mimeType]);
+  }, [bodyUrl, data, mimeType]);

  // oxlint-disable-next-line jsx-a11y/media-has-caption
  return <audio className="w-full" controls src={src} />;
@@ -1,7 +1,9 @@
 import type { HttpResponse } from "@yaakapp-internal/models";
-import { useMemo, useState } from "react";
+import { useQueryClient } from "@tanstack/react-query";
+import { useCallback } from "react";
 import { useCopyHttpResponse } from "../../hooks/useCopyHttpResponse";
-import { useResponseBodyText } from "../../hooks/useResponseBodyText";
+import { responseBodyTextQuery, useResponseBodyText } from "../../hooks/useResponseBodyText";
+import { useResponseFilter } from "../../hooks/useResponseFilter";
 import { useSaveResponse } from "../../hooks/useSaveResponse";
 import { languageFromContentType } from "../../lib/contentType";
 import { getContentTypeFromHeaders } from "../../lib/model_util";
@@ -52,30 +54,25 @@ interface HttpTextViewerProps {
 }

 function HttpTextViewer({ response, text, language, pretty, className }: HttpTextViewerProps) {
-  const [currentFilter, setCurrentFilter] = useState<string | null>(null);
-  const filteredBody = useResponseBodyText({ response, filter: currentFilter });
+  const queryClient = useQueryClient();
+  const filter = useResponseFilter({
+    stateKey: `response.body.${response.requestId}`,
+    // Shares the display query's cache entry, so the verdict costs no extra RPC
+    runFilter: useCallback(
+      (f: string) => queryClient.fetchQuery(responseBodyTextQuery({ response, filter: f })),
+      [queryClient, response],
+    ),
+  });
+  const filteredBody = useResponseBodyText({ response, filter: filter.appliedFilter });
  const saveResponse = useSaveResponse(response);
  const copyResponse = useCopyHttpResponse(response);
  const actionsDisabled = response.state !== "closed" && response.status >= 100;

-  const filterCallback = useMemo(
-    () => (filter: string) => {
-      setCurrentFilter(filter);
-      return {
-        data: filteredBody.data,
-        isPending: filteredBody.isPending,
-        error: !!filteredBody.error,
-      };
-    },
-    [filteredBody],
-  );
-
  return (
    <TextViewer
      text={text}
      language={language}
      stateKey={`response.body.${response.id}`}
-      filterStateKey={`response.body.${response.requestId}`}
      pretty={pretty}
      className={className}
      footerActions={[
@@ -98,7 +95,12 @@ function HttpTextViewer({ response, text, language, pretty, className }: HttpTex
          className="border !border-border-subtle"
        />,
      ]}
-      onFilter={filterCallback}
+      filter={filter}
+      filterResult={{
+        data: filteredBody.data,
+        isPending: filteredBody.isPending,
+        error: !!filteredBody.error,
+      }}
    />
  );
 }
@@ -3,8 +3,8 @@ import { useEffect, useState } from "react";

 type Props = { className?: string; mimeType?: string } & (
  | {
-      /** A URL the host resolved, for a body it already stored. */
-      url: string;
+      /** A URL for the body the host already stored. */
+      bodyUrl: string;
    }
  | {
      data: ArrayBuffer;
@@ -13,12 +13,12 @@ type Props = { className?: string; mimeType?: string } & (

 export function ImageViewer({ className, mimeType, ...props }: Props) {
  const [src, setSrc] = useState<string>();
-  const url = "url" in props ? props.url : null;
+  const bodyUrl = "bodyUrl" in props ? props.bodyUrl : null;
  const data = "data" in props ? props.data : null;

  useEffect(() => {
-    if (url != null) {
-      setSrc(url);
+    if (bodyUrl != null) {
+      setSrc(bodyUrl);
    } else if (data != null) {
      const blob = new Blob([data], { type: mimeType ?? "image/png" });
      const objectUrl = URL.createObjectURL(blob);
@@ -27,7 +27,7 @@ export function ImageViewer({ className, mimeType, ...props }: Props) {
    } else {
      setSrc(undefined);
    }
-  }, [url, data, mimeType]);
+  }, [bodyUrl, data, mimeType]);

  return (
    <img
@@ -17,8 +17,8 @@ fireAndForget(
 );

 interface Props {
-  /** A URL the host resolved, for a body it already stored. */
-  url?: string;
+  /** A URL for the body the host already stored. */
+  bodyUrl?: string;
  data?: Uint8Array;
 }

@@ -27,7 +27,7 @@ const options = {
  standardFontDataUrl: "/standard_fonts/",
 };

-export function PdfViewer({ url, data }: Props) {
+export function PdfViewer({ bodyUrl, data }: Props) {
  const containerRef = useRef<HTMLDivElement>(null);
  const [numPages, setNumPages] = useState<number>();

@@ -36,8 +36,8 @@ export function PdfViewer({ url, data }: Props) {
  // During render, not in an effect: an effect leaves the first paint with no file, and
  // `Document` renders its "Failed to load PDF file" state for that frame before recovering
  const src = useMemo(() => {
-    if (url) {
-      return url;
+    if (bodyUrl) {
+      return bodyUrl;
    }
    if (data) {
      // Create a copy to avoid "Buffer is already detached" errors
@@ -45,7 +45,7 @@ export function PdfViewer({ url, data }: Props) {
      return { data: new Uint8Array(data) };
    }
    return undefined;
-  }, [url, data]);
+  }, [bodyUrl, data]);

  const onDocumentLoadSuccess = ({ numPages: nextNumPages }: PDFDocumentProxy): void => {
    setNumPages(nextNumPages);
@@ -0,0 +1,96 @@
+import { Icon } from "@yaakapp-internal/ui";
+import type { RecentFilter } from "../../hooks/useRecentFilters";
+import { Dropdown, type DropdownItem } from "../core/Dropdown";
+import { IconButton } from "../core/IconButton";
+
+interface Props {
+  recentFilters: RecentFilter[];
+  activeFilter: string | null;
+  onSelect: (value: string) => void;
+  onRemove: (value: string) => void;
+  onTogglePin: (value: string) => void;
+  onClear: () => void;
+}
+
+export function RecentFiltersDropdown({
+  recentFilters,
+  activeFilter,
+  onSelect,
+  onRemove,
+  onTogglePin,
+  onClear,
+}: Props) {
+  const pinned = recentFilters.filter((f) => f.pinned);
+  const unpinned = recentFilters.filter((f) => !f.pinned);
+
+  const toItem = (filter: RecentFilter): DropdownItem => ({
+    label: (
+      <div className="font-mono text-sm truncate max-w-sm" title={filter.value}>
+        {filter.value}
+      </div>
+    ),
+    leftSlot: <Icon icon={filter.value === activeFilter ? "check" : "empty"} />,
+    onSelect: () => onSelect(filter.value),
+    submenuTrigger: "button",
+    submenu: [
+      {
+        label: filter.pinned ? "Unpin" : "Pin",
+        icon: filter.pinned ? "unpin" : "pin",
+        keepOpenOnSelect: true,
+        onSelect: () => onTogglePin(filter.value),
+      },
+      {
+        label: "Remove",
+        icon: "trash",
+        color: "danger",
+        keepOpenOnSelect: true,
+        onSelect: () => onRemove(filter.value),
+      },
+    ],
+  });
+
+  const items: DropdownItem[] = [];
+
+  if (recentFilters.length === 0) {
+    items.push({
+      type: "content",
+      label: (
+        <span className="block px-4 py-1 text-sm text-text-subtle">
+          Filters you use are remembered here
+        </span>
+      ),
+    });
+  }
+
+  if (pinned.length > 0) {
+    items.push({ type: "separator", label: "Pinned" }, ...pinned.map(toItem));
+  }
+
+  if (unpinned.length > 0) {
+    items.push({ type: "separator", label: "Recent" }, ...unpinned.map(toItem));
+  }
+
+  if (recentFilters.length > 0) {
+    items.push(
+      { type: "separator" },
+      {
+        label: "Clear All",
+        leftSlot: <Icon icon="trash" />,
+        color: "danger",
+        onSelect: onClear,
+      },
+    );
+  }
+
+  return (
+    <Dropdown items={items}>
+      <IconButton
+        size="xs"
+        icon="filter"
+        title="Recent filters"
+        iconColor="secondary"
+        className="w-8 ml-0.5 mr-1 h-auto!"
+      />
+    </Dropdown>
+  );
+}
@@ -1,14 +1,15 @@
-import classNames from "classnames";
 import type { ReactNode } from "react";
 import { Children, useCallback, useMemo } from "react";
-import { createGlobalState } from "react-use";
-import { useDebouncedValue } from "@yaakapp-internal/ui";
+import { Banner, HStack, Icon, InlineCode } from "@yaakapp-internal/ui";
 import { useFormatText } from "../../hooks/useFormatText";
+import type { ResponseFilterApi } from "../../hooks/useResponseFilter";
+import { Button } from "../core/Button";
 import type { EditorProps } from "../core/Editor/Editor";
 import { hyperlink } from "../core/Editor/hyperlink/extension";
 import { Editor } from "../core/Editor/LazyEditor";
 import { IconButton } from "../core/IconButton";
 import { Input } from "../core/Input";
+import { RecentFiltersDropdown } from "./RecentFiltersDropdown";

 const extraExtensions = [hyperlink];

@@ -16,57 +17,45 @@ interface Props {
  text: string;
  language: EditorProps["language"];
  stateKey: string | null;
-  filterStateKey?: string | null;
  pretty?: boolean;
  className?: string;
  footerActions?: ReactNode;
-  onFilter?: (filter: string) => {
+  filter?: ResponseFilterApi;
+  filterResult?: {
    data: string | null | undefined;
    isPending: boolean;
    error: boolean;
  };
 }

-const useFilterText = createGlobalState<Record<string, string | null>>({});
-
 export function TextViewer({
  language,
  text,
  stateKey,
-  filterStateKey,
  pretty,
  className,
  footerActions,
-  onFilter,
+  filter,
+  filterResult,
 }: Props) {
-  const filterKey = filterStateKey ?? stateKey;
-  const [filterTextMap, setFilterTextMap] = useFilterText();
-  const filterText = filterKey ? (filterTextMap[filterKey] ?? null) : null;
-  const debouncedFilterText = useDebouncedValue(filterText);
-  const setFilterText = useCallback(
-    (v: string | null) => {
-      if (!filterKey) return;
-      setFilterTextMap((m) => ({ ...m, [filterKey]: v }));
+  const canFilter =
+    filter != null && (language === "json" || language === "xml" || language === "html");
+  const isSearching = filter?.isSearching ?? false;
+  const appliedFilter = filter?.appliedFilter ?? null;
+  const resultError = filterResult?.error ?? false;
+
+  const handleFilterKeyDown = useCallback(
+    (e: KeyboardEvent) => {
+      if (filter == null) return;
+      if (e.key === "Escape") {
+        filter.toggleSearch();
+      } else if (e.key === "Enter" && filter.filterText != null) {
+        filter.applyFilter(filter.filterText);
+      }
    },
-    [filterKey, setFilterTextMap],
+    [filter],
  );

-  const isSearching = filterText != null;
-  const filteredResponse =
-    onFilter && debouncedFilterText
-      ? onFilter(debouncedFilterText)
-      : { data: null, isPending: false, error: false };
-
-  const toggleSearch = useCallback(() => {
-    if (isSearching) {
-      setFilterText(null);
-    } else {
-      setFilterText("");
-    }
-  }, [isSearching, setFilterText]);
-
-  const canFilter = onFilter && (language === "json" || language === "xml" || language === "html");
-
  const actions = useMemo<ReactNode[]>(() => {
    const nodes: ReactNode[] = isSearching ? [] : Children.toArray(footerActions);

@@ -76,8 +65,8 @@ export function TextViewer({
      nodes.push(
        <div key="input" className="w-full opacity-100!">
          <Input
-            key={filterKey ?? "filter"}
-            validate={!filteredResponse.error}
+            key={filter.stateKey ?? "filter"}
+            validate={!resultError}
            hideLabel
            autoFocus
            containerClassName="bg-surface"
@@ -85,39 +74,62 @@ export function TextViewer({
            placeholder={language === "json" ? "JSONPath expression" : "XPath expression"}
            label="Filter expression"
            name="filter"
-            defaultValue={filterText}
-            onKeyDown={(e) => e.key === "Escape" && toggleSearch()}
-            onChange={setFilterText}
-            stateKey={filterKey ? `filter.${filterKey}` : null}
+            defaultValue={filter.filterText}
+            forceUpdateKey={filter.filterUpdateKey}
+            onKeyDown={handleFilterKeyDown}
+            onChange={filter.setFilterText}
+            stateKey={filter.stateKey ? `filter.${filter.stateKey}` : null}
+            leftSlot={
+              <div className="py-0.5 flex">
+                <RecentFiltersDropdown
+                  recentFilters={filter.recentFilters}
+                  activeFilter={filter.appliedFilter}
+                  onSelect={filter.replaceFilter}
+                  onRemove={filter.removeRecentFilter}
+                  onTogglePin={filter.togglePinRecentFilter}
+                  onClear={filter.clearRecentFilters}
+                />
+              </div>
+            }
+            rightSlot={
+              <div className="py-0.5 flex">
+                <IconButton
+                  size="xs"
+                  icon="x"
+                  title="Close filter"
+                  iconColor="secondary"
+                  onClick={filter.toggleSearch}
+                  className="w-8 mr-0.5 h-auto!"
+                />
+              </div>
+            }
          />
        </div>,
      );
+    } else {
+      nodes.push(
+        <IconButton
+          key="icon"
+          size="sm"
+          isLoading={filterResult?.isPending ?? false}
+          icon="filter"
+          title="Filter response"
+          onClick={filter.toggleSearch}
+          className="border border-border-subtle!"
+        />,
+      );
    }

-    nodes.push(
-      <IconButton
-        key="icon"
-        size="sm"
-        isLoading={filteredResponse.isPending}
-        icon={isSearching ? "x" : "filter"}
-        title={isSearching ? "Close filter" : "Filter response"}
-        onClick={toggleSearch}
-        className={classNames("border border-border-subtle!", isSearching && "opacity-100!")}
-      />,
-    );
-
    return nodes;
  }, [
    canFilter,
    footerActions,
-    filterKey,
-    filterText,
-    filteredResponse.error,
-    filteredResponse.isPending,
+    filter,
+    filterResult?.isPending,
+    resultError,
    isSearching,
    language,
-    setFilterText,
-    toggleSearch,
+    handleFilterKeyDown,
  ]);

  const formattedBody = useFormatText({ text, language, pretty: pretty ?? false });
@@ -126,11 +138,11 @@ export function TextViewer({
  }

  let body: string;
-  if (isSearching && filterText?.length > 0) {
-    if (filteredResponse.error) {
+  if (appliedFilter) {
+    if (resultError) {
      body = "";
    } else {
-      body = filteredResponse.data != null ? filteredResponse.data : "";
+      body = filterResult?.data != null ? filterResult.data : "";
    }
  } else {
    body = formattedBody;
@@ -143,15 +155,61 @@ export function TextViewer({
  }

  return (
-    <Editor
-      readOnly
-      className={className}
-      defaultValue={body}
-      language={language}
-      actions={actions}
-      extraExtensions={extraExtensions}
-      stateKey={stateKey}
-    />
+    <div className="grid grid-rows-[auto_minmax(0,1fr)] h-full w-full">
+      {appliedFilter && filter != null ? (
+        <AppliedFilterBar
+          filter={appliedFilter}
+          error={resultError}
+          onClear={() => filter.replaceFilter("")}
+        />
+      ) : (
+        <span />
+      )}
+      <Editor
+        readOnly
+        className={className}
+        defaultValue={body}
+        language={language}
+        actions={actions}
+        extraExtensions={extraExtensions}
+        stateKey={stateKey}
+      />
+    </div>
+  );
+}
+
+/**
+ * Shows what's actually filtering the body, which the filter box below can't convey
+ * once it holds an edited expression that hasn't been applied yet.
+ */
+function AppliedFilterBar({
+  filter,
+  error,
+  onClear,
+}: {
+  filter: string;
+  error: boolean;
+  onClear: () => void;
+}) {
+  return (
+    <Banner color={error ? "danger" : "info"} className="py-1! mb-2! text-sm">
+      <HStack space={2} className="min-w-0">
+        <Icon icon="filter" size="xs" className="shrink-0 opacity-70" />
+        <span className="truncate min-w-0" title={filter}>
+          Response filtered by <InlineCode>{filter}</InlineCode>
+          {error && " (invalid expression)"}
+        </span>
+        <Button
+          size="2xs"
+          variant="border"
+          color={error ? "danger" : "info"}
+          className="ml-auto shrink-0"
+          onClick={onClear}
+        >
+          Clear
+        </Button>
+      </HStack>
+    </Banner>
  );
 }

@@ -1,18 +1,18 @@
 import { useEffect, useState } from "react";

 interface Props {
-  /** A URL the host resolved, for a body it already stored. */
-  url?: string;
+  /** A URL for the body the host already stored. */
+  bodyUrl?: string;
  data?: Uint8Array;
  mimeType?: string;
 }

-export function VideoViewer({ url, data, mimeType }: Props) {
+export function VideoViewer({ bodyUrl, data, mimeType }: Props) {
  const [src, setSrc] = useState<string>();

  useEffect(() => {
-    if (url) {
-      setSrc(url);
+    if (bodyUrl) {
+      setSrc(bodyUrl);
    } else if (data) {
      // As in AudioViewer: a media element trusts the declared type instead of sniffing
      const blob = new Blob([new Uint8Array(data)], { type: mimeType ?? "video/mp4" });
@@ -22,7 +22,7 @@ export function VideoViewer({ url, data, mimeType }: Props) {
    } else {
      setSrc(undefined);
    }
-  }, [url, data, mimeType]);
+  }, [bodyUrl, data, mimeType]);

  // oxlint-disable-next-line jsx-a11y/media-has-caption
  return <video className="w-full" controls src={src} />;
@@ -0,0 +1,18 @@
+import { useKeyValue } from "./useKeyValue";
+
+// The file a request's GraphQL schema is loaded from, or null when the schema
+// comes from an introspection request.
+//
+// This is the *source*, not the schema. The introspection row it produces is a
+// cache that expires on its own; this outlives it and regenerates it, the same
+// way gRPC keeps its proto file list separate from a reflection result.
+export function graphqlSchemaFileArgs(requestId: string | null) {
+  return {
+    namespace: "global" as const,
+    key: ["graphql_schema_file", requestId ?? "n/a"],
+  };
+}
+
+export function useGraphQLSchemaFile(requestId: string | null) {
+  return useKeyValue<string | null>({ ...graphqlSchemaFileArgs(requestId), fallback: null });
+}
@@ -1,13 +1,14 @@
 import { useQuery, useQueryClient } from "@tanstack/react-query";
-
 import type { GraphQlIntrospection, HttpRequest } from "@yaakapp-internal/models";
+import { platform } from "@yaakapp-internal/platform";
 import type { GraphQLSchema, IntrospectionQuery } from "graphql";
 import { buildClientSchema, getIntrospectionQuery } from "graphql";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { tryBuildIntrospectionFromFile } from "../lib/graphqlSchema";
 import { minPromiseMillis } from "../lib/minPromiseMillis";
-import { getResponseBodyText } from "../lib/responseBody";
 import { sendEphemeralRequest } from "../lib/sendEphemeralRequest";
 import { useActiveEnvironment } from "./useActiveEnvironment";
+import { useGraphQLSchemaFile } from "./useGraphQLSchemaFile";
 import { useDebouncedValue } from "@yaakapp-internal/ui";
 import { rpc } from "../lib/rpc";

@@ -31,6 +32,11 @@ export function useIntrospectGraphQL(

  const introspection = useIntrospectionResult(baseRequest);

+  // The schema's source. Outlives the introspection row it produces, so a
+  // request configured with a file keeps working after the row is swept.
+  const schemaFile = useGraphQLSchemaFile(baseRequest.id);
+  const filePath = schemaFile.value ?? null;
+
  const upsertIntrospection = useCallback(
    async (content: string | null) => {
      const v = await rpc<GraphQlIntrospection>("models_upsert_graphql_introspection", {
@@ -55,7 +61,7 @@ export function useIntrospectGraphQL(
        bodyType: "application/json",
        body: { text: introspectionRequestBody },
      };
-      const response = await minPromiseMillis(
+      const { response, body } = await minPromiseMillis(
        sendEphemeralRequest(args, activeEnvironment?.id ?? null),
        700,
      );
@@ -64,14 +70,16 @@ export function useIntrospectGraphQL(
        return setError(response.error);
      }

-      const bodyText = await getResponseBodyText({ response, filter: null });
+      // The send hands back the only copy of the body — an unsaved response has
+      // nothing on disk and no row to read it back from
+      const bodyText = new TextDecoder("utf-8").decode(new Uint8Array(body));
      if (response.status < 200 || response.status >= 300) {
        return setError(
          `Request failed with status ${response.status}.\nThe response text is:\n\n${bodyText}`,
        );
      }

-      if (bodyText === null) {
+      if (bodyText === "") {
        return setError("Empty body returned in response");
      }

@@ -91,15 +99,109 @@ export function useIntrospectGraphQL(
      return;
    }

-    refetch().catch(console.error);
-  }, [baseRequest.id, debouncedRequest.url, debouncedRequest.method, activeEnvironment?.id]);
+    // A request pointed at a file gets its schema from that file. Introspecting
+    // here would overwrite it on the next URL edit.
+    if (filePath != null) {
+      return;
+    }

+    refetch().catch(console.error);
+  }, [
+    baseRequest.id,
+    debouncedRequest.url,
+    debouncedRequest.method,
+    activeEnvironment?.id,
+    filePath,
+  ]);
+
+  // Clears the schema, not the source. Removing a file source is a separate
+  // action, because the source is what would rebuild this a moment later.
  const clear = useCallback(async () => {
    setError("");
    setSchema(null);
    await upsertIntrospection(null);
  }, [upsertIntrospection]);

+  // Reads a schema file and produces an introspection row from it, the same way
+  // `refetch` produces one from a server. Does not touch the stored source.
+  const introspectFromFile = useCallback(
+    async (path: string): Promise<{ ok: true } | { ok: false; error: string }> => {
+      try {
+        setIsLoading(true);
+        setError(undefined);
+
+        const fileContent = await platform.files.readText(path);
+        const result = tryBuildIntrospectionFromFile(fileContent);
+
+        if ("error" in result) {
+          setError(result.error);
+          return { ok: false, error: result.error };
+        }
+
+        await upsertIntrospection(result.content);
+        return { ok: true };
+      } catch (err) {
+        // The host rejects with a bare string for a missing or unreadable path,
+        // so this can't assume an Error.
+        const message = err instanceof Error ? err.message : String(err);
+        setError(message);
+        return { ok: false, error: message };
+      } finally {
+        setIsLoading(false);
+      }
+    },
+    [upsertIntrospection],
+  );
+
+  // Points the request at a file and immediately builds its schema from it.
+  const loadFromFile = useCallback(
+    async (path: string) => {
+      const result = await introspectFromFile(path);
+      if (result.ok) await schemaFile.set(path);
+      return result;
+    },
+    [introspectFromFile, schemaFile],
+  );
+
+  const reloadFromFile = useCallback(async () => {
+    if (filePath == null) return { ok: false as const, error: "No schema file to reload" };
+    return introspectFromFile(filePath);
+  }, [filePath, introspectFromFile]);
+
+  // The file-source counterpart of automatic introspection: re-read the file
+  // when the request is opened, so an edited schema is picked up without asking.
+  //
+  // A missing row is repaired even with the setting off — that is recovering
+  // from the 7-day sweep, not keeping the schema fresh, and skipping it would
+  // make the schema disappear with no visible cause.
+  const reloadedFor = useRef<string | null>(null);
+  useEffect(() => {
+    if (filePath == null || introspection.isLoading) return;
+    // Only attempt once per path, so an unreadable file doesn't spin.
+    if (reloadedFor.current === filePath) return;
+
+    const hasContent = (introspection.data?.content ?? "") !== "";
+    if (hasContent && options.disabled) return;
+
+    reloadedFor.current = filePath;
+    introspectFromFile(filePath).catch(console.error);
+  }, [
+    filePath,
+    introspection.data?.content,
+    introspection.isLoading,
+    introspectFromFile,
+    options.disabled,
+  ]);
+
+  // Stops using the file. The schema goes with it, since the file is what
+  // produced it; introspection repopulates if it's set to run automatically.
+  const removeSchemaFile = useCallback(async () => {
+    setError("");
+    setSchema(null);
+    await schemaFile.set(null);
+    await upsertIntrospection(null);
+  }, [schemaFile, upsertIntrospection]);
+
  useEffect(() => {
    if (introspection.data?.content == null || introspection.data.content === "") {
      return;
@@ -113,7 +215,17 @@ export function useIntrospectGraphQL(
    }
  }, [introspection.data?.content]);

-  return { schema, isLoading, error, refetch, clear };
+  return {
+    schema,
+    isLoading,
+    error,
+    refetch,
+    clear,
+    loadFromFile,
+    reloadFromFile,
+    removeSchemaFile,
+    filePath,
+  };
 }

 function useIntrospectionResult(request: HttpRequest) {
@@ -0,0 +1,67 @@
+import { useCallback } from "react";
+import { useKeyValue } from "./useKeyValue";
+
+export interface RecentFilter {
+  value: string;
+  pinned?: boolean;
+}
+
+const MAX_RECENT_FILTERS = 20;
+const kvKey = (filterStateKey: string) => `recent_filters::${filterStateKey}`;
+const namespace = "global";
+const fallback: RecentFilter[] = [];
+
+export function useRecentFilters(filterStateKey: string | null) {
+  const { value, set } = useKeyValue<RecentFilter[]>({
+    key: kvKey(filterStateKey ?? "n/a"),
+    namespace,
+    fallback,
+  });
+
+  const addFilter = useCallback(
+    async (rawValue: string) => {
+      const value = rawValue.trim();
+      if (filterStateKey == null || value === "") return;
+      await set((prev) => {
+        // Returning the same reference skips the write, so re-committing the
+        // expression already at the top (on every blur) costs nothing
+        if (prev[0]?.value === value) return prev;
+        const existing = prev.find((f) => f.value === value);
+        const rest = prev.filter((f) => f.value !== value);
+        return trim([{ value, pinned: existing?.pinned }, ...rest]);
+      });
+    },
+    [filterStateKey, set],
+  );
+
+  const removeFilter = useCallback(
+    async (value: string) => set((prev) => prev.filter((f) => f.value !== value)),
+    [set],
+  );
+
+  const togglePin = useCallback(
+    async (value: string) =>
+      set((prev) => prev.map((f) => (f.value === value ? { ...f, pinned: !f.pinned } : f))),
+    [set],
+  );
+
+  const clearFilters = useCallback(async () => set([]), [set]);
+
+  return { recentFilters: value ?? fallback, addFilter, removeFilter, togglePin, clearFilters };
+}
+
+/** Bound the list, evicting the oldest unpinned entries before any pinned ones */
+function trim(filters: RecentFilter[]): RecentFilter[] {
+  const excess = filters.length - MAX_RECENT_FILTERS;
+  if (excess <= 0) return filters;
+
+  const evicted = new Set<number>();
+  for (let i = filters.length - 1; i >= 0 && evicted.size < excess; i--) {
+    if (!filters[i]?.pinned) evicted.add(i);
+  }
+  for (let i = filters.length - 1; i >= 0 && evicted.size < excess; i--) {
+    evicted.add(i);
+  }
+
+  return filters.filter((_, i) => !evicted.has(i));
+}
@@ -2,6 +2,25 @@ import { useQuery } from "@tanstack/react-query";
 import type { HttpResponse } from "@yaakapp-internal/models";
 import { getResponseBodyBytes, getResponseBodyText } from "../lib/responseBody";

+export function responseBodyTextQuery({
+  response,
+  filter,
+}: {
+  response: HttpResponse;
+  filter: string | null;
+}) {
+  return {
+    queryKey: [
+      "response_body_text",
+      response.id,
+      response.updatedAt,
+      response.contentLength,
+      filter ?? "",
+    ],
+    queryFn: () => getResponseBodyText({ response, filter }),
+  };
+}
+
 export function useResponseBodyText({
  response,
  filter,
@@ -11,14 +30,7 @@ export function useResponseBodyText({
 }) {
  return useQuery({
    placeholderData: (prev) => prev, // Keep previous data on refetch
-    queryKey: [
-      "response_body_text",
-      response.id,
-      response.updatedAt,
-      response.contentLength,
-      filter ?? "",
-    ],
-    queryFn: () => getResponseBodyText({ response, filter }),
+    ...responseBodyTextQuery({ response, filter }),
  });
 }

@@ -18,6 +18,7 @@ export function useResponseBodyUrl(response: HttpResponse | null) {
  return useQuery({
    queryKey: ["response_body_url", responseId, response?.updatedAt ?? ""],
    enabled: responseId != null,
-    queryFn: () => (responseId == null ? null : platform.files.responseBodyUrl(responseId)),
+    // A response body is stored under the response's own id
+    queryFn: () => (responseId == null ? null : platform.blobs.url(responseId)),
  });
 }
@@ -0,0 +1,129 @@
+import { useCallback, useState } from "react";
+import { createGlobalState } from "react-use";
+import type { RecentFilter } from "./useRecentFilters";
+import { useRecentFilters } from "./useRecentFilters";
+
+/** What's typed in the filter box. `null` means the filter box is closed */
+const useFilterTextMap = createGlobalState<Record<string, string | null>>({});
+
+/** What's actually applied to the response. Only changes on an explicit apply */
+const useAppliedFilterMap = createGlobalState<Record<string, string | null>>({});
+
+export interface ResponseFilterApi {
+  stateKey: string | null;
+  /** Draft text in the filter box, or `null` when the box is closed */
+  filterText: string | null;
+  /** The expression currently filtering the response */
+  appliedFilter: string | null;
+  isSearching: boolean;
+  /** The box holds an expression that isn't the one currently applied */
+  isDirty: boolean;
+  /** Bumped when the (uncontrolled) filter input must re-read its defaultValue */
+  filterUpdateKey: number;
+  setFilterText: (value: string | null) => void;
+  /** Apply the expression to the response, recording it if the filter accepts it */
+  applyFilter: (value: string) => void;
+  /** Like applyFilter, but also replaces what's shown in the filter box */
+  replaceFilter: (value: string) => void;
+  toggleSearch: () => void;
+  recentFilters: RecentFilter[];
+  removeRecentFilter: (value: string) => void;
+  togglePinRecentFilter: (value: string) => void;
+  clearRecentFilters: () => void;
+}
+
+/**
+ * Draft/applied state and history for a response filter (JSONPath/XPath).
+ *
+ * History records at most one entry per apply gesture, and only after `runFilter`
+ * confirms the plugin accepts the expression — the plugin is the sole judge of
+ * validity. Because nothing but the gesture ever writes, refetches can't resurrect
+ * deleted entries and a gesture can't record into another request's history.
+ */
+export function useResponseFilter({
+  stateKey,
+  runFilter,
+}: {
+  stateKey: string | null;
+  /** Evaluate an expression, rejecting if the filter plugin reports an error */
+  runFilter: (filter: string) => Promise<unknown>;
+}): ResponseFilterApi {
+  const [filterTextMap, setFilterTextMap] = useFilterTextMap();
+  const [appliedFilterMap, setAppliedFilterMap] = useAppliedFilterMap();
+  const filterText = stateKey ? (filterTextMap[stateKey] ?? null) : null;
+  const appliedFilter = stateKey ? (appliedFilterMap[stateKey] ?? null) : null;
+
+  const setFilterText = useCallback(
+    (v: string | null) => {
+      if (!stateKey) return;
+      setFilterTextMap((m) => ({ ...m, [stateKey]: v }));
+    },
+    [stateKey, setFilterTextMap],
+  );
+
+  const setAppliedFilter = useCallback(
+    (v: string | null) => {
+      if (!stateKey) return;
+      setAppliedFilterMap((m) => ({ ...m, [stateKey]: v }));
+    },
+    [stateKey, setAppliedFilterMap],
+  );
+
+  const {
+    recentFilters,
+    addFilter,
+    removeFilter: removeRecentFilter,
+    togglePin: togglePinRecentFilter,
+    clearFilters: clearRecentFilters,
+  } = useRecentFilters(stateKey);
+
+  const applyFilter = useCallback(
+    (value: string) => {
+      setFilterText(value);
+      const applied = value.trim() === "" ? null : value.trim();
+      setAppliedFilter(applied);
+      if (applied == null) return;
+      runFilter(applied).then(
+        () => addFilter(applied),
+        () => {}, // Rejected by the filter plugin — don't record
+      );
+    },
+    [setFilterText, setAppliedFilter, runFilter, addFilter],
+  );
+
+  const [filterUpdateKey, setFilterUpdateKey] = useState(0);
+  const replaceFilter = useCallback(
+    (value: string) => {
+      applyFilter(value);
+      setFilterUpdateKey((k) => k + 1);
+    },
+    [applyFilter],
+  );
+
+  const isSearching = filterText != null;
+  const toggleSearch = useCallback(() => {
+    if (isSearching) {
+      setFilterText(null);
+      setAppliedFilter(null);
+    } else {
+      setFilterText("");
+    }
+  }, [isSearching, setFilterText, setAppliedFilter]);
+
+  return {
+    stateKey,
+    filterText,
+    appliedFilter,
+    isSearching,
+    isDirty: filterText != null && filterText.trim() !== (appliedFilter ?? ""),
+    filterUpdateKey,
+    setFilterText,
+    applyFilter,
+    replaceFilter,
+    toggleSearch,
+    recentFilters,
+    removeRecentFilter,
+    togglePinRecentFilter,
+    clearRecentFilters,
+  };
+}
@@ -25,6 +25,10 @@ export function useSaveResponse(response: HttpResponse | null) {
        defaultPath: ext ? `${slug}.${ext}` : slug,
        title: "Save Response",
      });
+      if (filepath == null) {
+        return; // Cancelled
+      }
+
      await rpc("cmd_save_response", { responseId: response.id, filepath });
      showToast({
        message: (
@@ -0,0 +1,85 @@
+import { buildSchema, introspectionFromSchema } from "graphql";
+import { describe, expect, test } from "vite-plus/test";
+import { tryBuildIntrospectionFromFile } from "./graphqlSchema";
+
+const sdl = `
+  type Query {
+    hello: String!
+    user(id: ID!): User
+  }
+
+  type User {
+    id: ID!
+    name: String
+  }
+`;
+
+const introspection = introspectionFromSchema(buildSchema(sdl));
+
+describe("tryBuildIntrospectionFromFile", () => {
+  test("accepts introspection JSON wrapped in { data: ... }", () => {
+    const input = JSON.stringify({ data: introspection });
+    const result = tryBuildIntrospectionFromFile(input);
+
+    expect("schema" in result).toBe(true);
+    if ("schema" in result) {
+      expect(result.schema.getQueryType()?.getFields()).toHaveProperty("hello");
+      // Output content is the normalized, persistable shape.
+      expect(JSON.parse(result.content)).toHaveProperty("data.__schema");
+    }
+  });
+
+  test("accepts bare introspection JSON without a data wrapper", () => {
+    const input = JSON.stringify(introspection);
+    const result = tryBuildIntrospectionFromFile(input);
+
+    expect("schema" in result).toBe(true);
+    if ("schema" in result) {
+      expect(result.schema.getQueryType()?.getFields()).toHaveProperty("user");
+      // Bare input is wrapped on the way out.
+      expect(JSON.parse(result.content)).toHaveProperty("data.__schema");
+    }
+  });
+
+  test("accepts a GraphQL SDL string", () => {
+    const result = tryBuildIntrospectionFromFile(sdl);
+
+    expect("schema" in result).toBe(true);
+    if ("schema" in result) {
+      const fields = result.schema.getQueryType()?.getFields() ?? {};
+      expect(fields).toHaveProperty("hello");
+      expect(fields).toHaveProperty("user");
+      // SDL is converted to introspection JSON for storage.
+      expect(JSON.parse(result.content)).toHaveProperty("data.__schema");
+    }
+  });
+
+  test("returns an error for JSON that is neither introspection nor SDL", () => {
+    const result = tryBuildIntrospectionFromFile('{"unrelated":"value"}');
+
+    expect("error" in result).toBe(true);
+    if ("error" in result) {
+      expect(result.error).toMatch(/Could not parse file as introspection JSON or GraphQL SDL/);
+    }
+  });
+
+  test("returns an error for content that is neither valid JSON nor valid SDL", () => {
+    const result = tryBuildIntrospectionFromFile("not a schema!@#$");
+
+    expect("error" in result).toBe(true);
+    if ("error" in result) {
+      expect(result.error).toMatch(/Could not parse file as introspection JSON or GraphQL SDL/);
+    }
+  });
+
+  test("returns an error when introspection JSON has a malformed __schema", () => {
+    // Has the data.__schema shape but the contents are invalid for buildClientSchema.
+    const input = JSON.stringify({ data: { __schema: { broken: true } } });
+    const result = tryBuildIntrospectionFromFile(input);
+
+    expect("error" in result).toBe(true);
+    if ("error" in result) {
+      expect(result.error).toMatch(/Failed to build schema from introspection JSON/);
+    }
+  });
+});
@@ -0,0 +1,51 @@
+import type { GraphQLSchema, IntrospectionQuery } from "graphql";
+import { buildClientSchema, buildSchema, introspectionFromSchema } from "graphql";
+
+// Accepts either a GraphQL introspection JSON ({ data: { __schema } } or
+// { __schema }) or an SDL string and normalizes both into the wrapped
+// { data: <introspection> } JSON shape used by the introspection store.
+export function tryBuildIntrospectionFromFile(
+  fileContent: string,
+): { schema: GraphQLSchema; content: string } | { error: string } {
+  let parsedJson: unknown;
+  try {
+    parsedJson = JSON.parse(fileContent);
+  } catch {
+    parsedJson = undefined;
+  }
+
+  if (parsedJson != null && typeof parsedJson === "object") {
+    const candidates: unknown[] = [(parsedJson as { data?: unknown }).data, parsedJson];
+
+    for (const candidate of candidates) {
+      if (
+        candidate != null &&
+        typeof candidate === "object" &&
+        "__schema" in (candidate as Record<string, unknown>)
+      ) {
+        try {
+          const schema = buildClientSchema(candidate as IntrospectionQuery, {});
+          return { schema, content: JSON.stringify({ data: candidate }) };
+        } catch (e) {
+          return {
+            error: `Failed to build schema from introspection JSON: ${errorMessage(e)}`,
+          };
+        }
+      }
+    }
+  }
+
+  try {
+    const schema = buildSchema(fileContent);
+    const introspection = introspectionFromSchema(schema);
+    return { schema, content: JSON.stringify({ data: introspection }) };
+  } catch (e) {
+    return {
+      error: `Could not parse file as introspection JSON or GraphQL SDL: ${errorMessage(e)}`,
+    };
+  }
+}
+
+function errorMessage(e: unknown): string {
+  return e instanceof Error ? e.message : String(e);
+}
@@ -2,11 +2,9 @@ import type { BatchUpsertResult } from "@yaakapp-internal/models";
 import { FormattedError, VStack } from "@yaakapp-internal/ui";
 import { Button } from "../components/core/Button";
 import { ImportDataDialog } from "../components/ImportDataDialog";
-import { activeWorkspaceAtom } from "../hooks/useActiveWorkspace";
 import { createFastMutation } from "../hooks/useFastMutation";
 import { showAlert } from "./alert";
 import { showDialog } from "./dialog";
-import { jotaiStore } from "./jotai";
 import { pluralizeCount } from "./pluralize";
 import { router } from "./router";
 import { rpc } from "./rpc";
@@ -28,12 +26,9 @@ export const importData = createFastMutation({
        title: "Import Data",
        size: "sm",
        render: ({ hide }) => {
-          const importAndHide = async (filePath: string) => {
+          const importAndHide = async (runImport: () => Promise<BatchUpsertResult>) => {
            try {
-              const didImport = await performImport(filePath);
-              if (!didImport) {
-                return;
-              }
+              await finishImport(await runImport());
              resolve();
            } catch (err) {
              reject(err);
@@ -41,20 +36,23 @@ export const importData = createFastMutation({
              hide();
            }
          };
-          return <ImportDataDialog importData={importAndHide} />;
+          return (
+            <ImportDataDialog
+              importFile={(filePath) =>
+                importAndHide(() => rpc<BatchUpsertResult>("cmd_import_data", { filePath }))
+              }
+              importUrl={(url) =>
+                importAndHide(() => rpc<BatchUpsertResult>("cmd_import_url", { url }))
+              }
+            />
+          );
        },
      });
    });
  },
 });

-async function performImport(filePath: string): Promise<boolean> {
-  const activeWorkspace = jotaiStore.get(activeWorkspaceAtom);
-  const imported = await rpc<BatchUpsertResult>("cmd_import_data", {
-    filePath,
-    workspaceId: activeWorkspace?.id,
-  });
-
+async function finishImport(imported: BatchUpsertResult): Promise<void> {
  const importedWorkspace = imported.workspaces[0];

  showDialog({
@@ -103,6 +101,4 @@ async function performImport(filePath: string): Promise<boolean> {
      search: { environment_id: environmentId },
    });
  }
-
-  return true;
 }
@@ -68,7 +68,8 @@ export async function getResponseBodySseSummary(
 export async function getResponseBodyBytes(
  response: HttpResponse,
 ): Promise<Uint8Array<ArrayBuffer> | null> {
-  return platform.files.readResponseBody(response.id);
+  // A response body is stored under the response's own id
+  return platform.blobs.read(response.id);
 }

 async function getResponseBodyDecoded(response: HttpResponse): Promise<string | null> {
@@ -1,6 +1,6 @@
 import type { RpcPayload } from "@yaakapp-internal/platform";
 import { platform } from "@yaakapp-internal/platform";
-import type { RpcSchema } from "@yaakapp-internal/tauri-client";
+import type { RpcSchema } from "@yaakapp-internal/rpc-schema";

 /**
 * Every backend command the app can call: the generated wire schema, one field
@@ -1,11 +1,12 @@
-import type { HttpRequest, HttpResponse } from "@yaakapp-internal/models";
+import type { HttpRequest } from "@yaakapp-internal/models";
+import type { EphemeralHttpResponse } from "@yaakapp-internal/rpc-schema";
 import { getActiveCookieJar } from "../hooks/useActiveCookieJar";
 import { rpc } from "./rpc";

 export async function sendEphemeralRequest(
  request: HttpRequest,
  environmentId: string | null,
-): Promise<HttpResponse> {
+): Promise<EphemeralHttpResponse> {
  // Remove some things that we don't want to associate
  const newRequest = { ...request };
  return rpc("cmd_send_ephemeral_request", {
@@ -1,47 +0,0 @@
-[package]
-name = "yaak-server"
-version = "0.1.0"
-edition = "2024"
-publish = false
-
-[[bin]]
-name = "yaak-bridge"
-path = "src/main.rs"
-
-[dependencies]
-axum = { version = "0.7", features = ["ws", "macros"] }
-charset = "0.1"
-chrono = { workspace = true }
-clap = { version = "4", features = ["derive", "env"] }
-dirs = "6"
-env_logger = "0.11"
-eventsource-client = { git = "https://github.com/yaakapp/rust-eventsource-client", version = "0.14.0" }
-futures = "0.3"
-include_dir = "0.7"
-log = { workspace = true }
-mime_guess = "2"
-pretty_graphql = "0.2"
-rand = "0.8"
-serde = { workspace = true }
-serde_json = { workspace = true }
-serde_urlencoded = "0.7"
-tokio = { workspace = true, features = [
-  "rt-multi-thread",
-  "macros",
-  "io-util",
-  "net",
-  "signal",
-  "time",
-  "sync",
-] }
-tower-http = { version = "0.6", features = ["cors", "fs", "trace"] }
-yaak = { workspace = true }
-yaak-common = { workspace = true }
-yaak-core = { workspace = true }
-yaak-crypto = { workspace = true }
-yaak-http = { workspace = true }
-yaak-models = { workspace = true }
-yaak-plugins = { workspace = true }
-yaak-rpc = { workspace = true }
-yaak-sse = { workspace = true }
-yaak-templates = { workspace = true }
@@ -1,94 +0,0 @@
-# Yaak Bridge
-
-A headless binary that runs the real Yaak engine for a browser tab.
-
-The tab is the unmodified Yaak UI. Everything a page cannot do — send an HTTP
-request and see every response header, follow redirects, keep a cookie jar, run
-the plugin runtime, read a response body off disk — happens in this process,
-reached over local HTTP and a WebSocket.
-
-This is the reason a browser Yaak can be credible at all. An in-page `fetch`
-sender only ever sees the CORS-safelisted response headers: measured against
-httpbin, a server that sent 8 headers yielded 2. Through the bridge the same
-request yields all 8, plus the redirect chain, `Set-Cookie`, connection timings
-and client certificates.
-
-## Running it
-
-Start the bridge:
-
-```bash
-cargo run -p yaak-server -- --port 9444
-```
-
-It binds `127.0.0.1` only and prints a bearer token that every route requires.
-
-Then point a frontend at it. In dev, run Vite separately and tell it where the
-bridge is:
-
-```bash
-YAAK_CLIENT_DEV_PORT=1472 VITE_YAAK_BRIDGE_URL=http://127.0.0.1:9444 npm run dev --workspace apps/yaak-client
-```
-
-Open `http://localhost:1472/?bridgeToken=<token>`. The token is consumed from
-the query, kept for the session, and stripped from the address bar. Without one
-you get a small connect form.
-
-To serve the built frontend from the bridge itself instead, so there is only one
-process:
-
-```bash
-npm run build --workspace apps/yaak-client
-cargo run -p yaak-server -- --web-dir dist/apps/yaak-client
-```
-
-## Shape
-
-| Route | What it carries |
-| --- | --- |
-| `POST /rpc` | The yaak-rpc envelope, the same one Tauri's `invoke` wraps on the desktop |
-| `GET /events` | WebSocket. Server to client: `model_writes`, `stream_{id}`, toasts, plugin events. Client to server: the tab's location, and replies to prompts |
-| `GET /responses/:id/body` | Response bodies, with Range support. Replaces reading `bodyPath` off disk |
-| `GET /bridge/info` | Capabilities and the implemented command list |
-
-Auth is a bearer token in the `Authorization` header, or a `token` query
-parameter for the two requests the browser issues itself (the WebSocket, and
-`<img src>`-style body loads). It is dev-grade and deliberately minimal: OTP
-pairing and request encryption replace it, and `require_token` in `http.rs` is
-where they go.
-
-## Relationship to the other hosts
-
-The engine crates under `crates/` are Tauri-free, and `crates-cli/yaak-cli`
-already proved they run headless. This crate is structurally the CLI's
-`CliContext` with an event hub attached — same `init_standalone` database, same
-`PluginManager` over the same Node sidecar.
-
-Two things are ported deliberately rather than invented:
-
- **Model writes** (`model_writes.rs`) keep the desktop's two paths: an
-  in-memory channel for writes this process made, and a poll of the
-  `model_changes` table so external writers — the CLI, the desktop app open on
-  the same database — show up live in the browser.
- **Plugin host requests** (`plugin_events.rs`) let `yaak::plugin_events`
-  answer everything that is only a database question, exactly as the CLI and the
-  desktop do. Only the host-specific arms differ, and where the CLI answers a
-  prompt from a TTY, the bridge round-trips it to the tab the way the desktop
-  round-trips it to a window.
-
-## Known gaps
-
- **Settings is unreachable.** The desktop opens it via `cmd_new_child_window`.
-  A tab is one window, `multiWindow` is false, and this task did not add in-page
-  routing for it.
- **One tab at a time.** Model writes broadcast correctly to every connected
-  tab, so two tabs stay in sync for reads. What breaks is the session: the
-  tab's reported URL lives in a single slot, so with two tabs in different
-  workspaces a plugin's template render resolves against whichever attached
-  last. Prompts also broadcast, so a dialog raised by one tab appears in both.
- **No local files.** There is no file dialog, so request bodies from disk,
-  export, and save-response are unsupported. `cmd_import_data` is registered and
-  works, but only for a path typed by hand on the bridge's machine.
- **Command subset.** Roughly 40 of the desktop's 107 commands are implemented.
-  The rest return a structured "not supported on this host" error naming the
-  command; `UNSUPPORTED_COMMANDS` in `rpc/mod.rs` lists them.
@@ -1,117 +0,0 @@
-//! The events channel: everything the browser tab would have received as a
-//! Tauri window event.
-//!
-//! Two directions ride the same WebSocket. Server to client is a broadcast, so
-//! `model_writes`, `stream_{id}` messages, toasts and plugin events all reach
-//! the tab through one pipe. Client to server exists because some plugin host
-//! requests are questions — a prompt round-trips through the UI and comes back
-//! keyed by the originating event's id, exactly as the desktop app's
-//! `call_frontend` does with window events.
-
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::sync::{Arc, Mutex};
-use tokio::sync::{broadcast, mpsc};
-
-/// One frame in either direction: a name and a JSON payload.
-///
-/// Deliberately the same shape both ways, and the same shape as the desktop's
-/// event payloads, so `platform.listen` on the browser side hands the payload
-/// to callers unwrapped.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct EventFrame {
-    pub event: String,
-    #[serde(default)]
-    pub payload: serde_json::Value,
-}
-
-#[derive(Clone)]
-pub struct EventHub {
-    outbound: broadcast::Sender<EventFrame>,
-    /// Listeners waiting on a named event from the client, keyed by event name.
-    inbound: Arc<Mutex<HashMap<String, Vec<mpsc::UnboundedSender<serde_json::Value>>>>>,
-}
-
-/// A subscription to one named client-sent event. Deregisters on drop, so a
-/// prompt that is never answered doesn't leak a listener for the process's life.
-pub struct InboundSubscription {
-    event: String,
-    rx: mpsc::UnboundedReceiver<serde_json::Value>,
-    inbound: Arc<Mutex<HashMap<String, Vec<mpsc::UnboundedSender<serde_json::Value>>>>>,
-}
-
-impl InboundSubscription {
-    pub async fn recv(&mut self) -> Option<serde_json::Value> {
-        self.rx.recv().await
-    }
-}
-
-impl Drop for InboundSubscription {
-    fn drop(&mut self) {
-        let mut inbound = match self.inbound.lock() {
-            Ok(inbound) => inbound,
-            Err(poisoned) => poisoned.into_inner(),
-        };
-        if let Some(senders) = inbound.get_mut(&self.event) {
-            senders.retain(|tx| !tx.is_closed());
-            if senders.is_empty() {
-                inbound.remove(&self.event);
-            }
-        }
-    }
-}
-
-impl EventHub {
-    pub fn new() -> Self {
-        // Bounded: a tab that stops reading gets dropped frames rather than
-        // growing the server's memory without limit. Model writes are the
-        // high-volume case (imports, bulk deletes) and they arrive in batches.
-        let (outbound, _) = broadcast::channel(1024);
-        Self { outbound, inbound: Arc::new(Mutex::new(HashMap::new())) }
-    }
-
-    /// Send an event to every connected tab. Fails silently when none is
-    /// connected, which is the normal state before a browser attaches.
-    pub fn emit<T: Serialize>(&self, event: impl Into<String>, payload: &T) {
-        let payload = match serde_json::to_value(payload) {
-            Ok(payload) => payload,
-            Err(e) => {
-                log::warn!("Failed to serialize event payload: {e}");
-                return;
-            }
-        };
-        let _ = self.outbound.send(EventFrame { event: event.into(), payload });
-    }
-
-    pub fn subscribe(&self) -> broadcast::Receiver<EventFrame> {
-        self.outbound.subscribe()
-    }
-
-    /// Listen for a named event sent *by* the client.
-    pub fn subscribe_inbound(&self, event: impl Into<String>) -> InboundSubscription {
-        let event = event.into();
-        let (tx, rx) = mpsc::unbounded_channel();
-        let mut inbound = match self.inbound.lock() {
-            Ok(inbound) => inbound,
-            Err(poisoned) => poisoned.into_inner(),
-        };
-        inbound.entry(event.clone()).or_default().push(tx);
-        drop(inbound);
-        InboundSubscription { event, rx, inbound: Arc::clone(&self.inbound) }
-    }
-
-    /// Route a frame that arrived from a tab to whoever is waiting on it.
-    pub fn dispatch_inbound(&self, frame: EventFrame) {
-        let mut inbound = match self.inbound.lock() {
-            Ok(inbound) => inbound,
-            Err(poisoned) => poisoned.into_inner(),
-        };
-        let Some(senders) = inbound.get_mut(&frame.event) else {
-            return;
-        };
-        senders.retain(|tx| tx.send(frame.payload.clone()).is_ok());
-        if senders.is_empty() {
-            inbound.remove(&frame.event);
-        }
-    }
-}
@@ -1,355 +0,0 @@
-//! The front door: one HTTP surface for the browser tab.
-//!
-//! Three routes carry everything. `POST /rpc` is the yaak-rpc envelope, byte for
-//! byte what the desktop puts inside Tauri's `invoke`. `GET /events` is the
-//! WebSocket that replaces window events, in both directions. And
-//! `GET /responses/:id/body` replaces reading `bodyPath` off disk, which a tab
-//! cannot do.
-
-use crate::events::EventFrame;
-use crate::rpc::BridgeCtx;
-use crate::session::SessionContext;
-use crate::state::BridgeState;
-use axum::body::Body;
-use axum::extract::ws::{Message, WebSocket, WebSocketUpgrade};
-use axum::extract::{Path, Query, Request, State};
-use axum::http::{HeaderMap, StatusCode, header};
-use axum::middleware::Next;
-use axum::response::{IntoResponse, Response};
-use axum::routing::{get, post};
-use axum::{Json, Router};
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-use tokio::io::{AsyncReadExt, AsyncSeekExt};
-use tower_http::cors::CorsLayer;
-use yaak_rpc::{RpcRequest, RpcResponse, RpcRouter};
-
-#[derive(Clone)]
-pub struct AppState {
-    pub state: Arc<BridgeState>,
-    pub router: Arc<RpcRouter<BridgeCtx>>,
-}
-
-pub fn build_app(state: Arc<BridgeState>, router: Arc<RpcRouter<BridgeCtx>>) -> Router {
-    let app_state = AppState { state: state.clone(), router };
-
-    let api = Router::new()
-        .route("/bridge/info", get(bridge_info))
-        .route("/rpc", post(rpc_handler))
-        .route("/events", get(events_handler))
-        .route("/responses/:id/body", get(response_body))
-        .layer(axum::middleware::from_fn_with_state(state.clone(), require_token))
-        // The dev setup serves the frontend from Vite on another port, so the
-        // tab's origin is not the bridge's. Credentials never ride on cookies
-        // here — the token is explicit — so a permissive CORS layer is safe and
-        // is bounded by the token check that runs before it.
-        .layer(CorsLayer::permissive())
-        .with_state(app_state);
-
-    match std::env::var("YAAK_BRIDGE_WEB_DIR").ok() {
-        // Serving the built frontend makes the bridge a single process to run.
-        // `index.html` is the fallback because the router owns the paths.
-        Some(dir) => api.fallback_service(
-            tower_http::services::ServeDir::new(&dir)
-                .fallback(tower_http::services::ServeFile::new(format!("{dir}/index.html"))),
-        ),
-        None => api,
-    }
-}
-
-// -- Auth --
-
-#[derive(Debug, Deserialize)]
-struct TokenQuery {
-    token: Option<String>,
-}
-
-/// Dev-grade bearer check on every route.
-///
-/// The header is the normal path. The query parameter exists because two of
-/// these are opened by the browser itself — the WebSocket and the `<img src>`
-/// pointing at a response body — and neither lets the page set headers.
-///
-/// This is the seam where OTP pairing and per-session keys go. It is not one
-/// today: the token is a process-lifetime shared secret, and anything that can
-/// read the tab's URL can read it.
-async fn require_token(
-    State(state): State<Arc<BridgeState>>,
-    request: Request,
-    next: Next,
-) -> Response {
-    let from_header = request
-        .headers()
-        .get(header::AUTHORIZATION)
-        .and_then(|v| v.to_str().ok())
-        .and_then(|v| v.strip_prefix("Bearer "))
-        .map(|v| v.to_string());
-
-    let from_query = request
-        .uri()
-        .query()
-        .and_then(|q| serde_urlencoded::from_str::<TokenQuery>(q).ok())
-        .and_then(|q| q.token);
-
-    let presented = from_header.or(from_query);
-
-    match presented {
-        Some(token) if constant_time_eq(&token, &state.token) => next.run(request).await,
-        _ => (StatusCode::UNAUTHORIZED, "Invalid or missing bridge token").into_response(),
-    }
-}
-
-/// Compares without returning early on the first differing byte, so a caller
-/// can't learn the token one character at a time.
-fn constant_time_eq(a: &str, b: &str) -> bool {
-    if a.len() != b.len() {
-        return false;
-    }
-    a.bytes().zip(b.bytes()).fold(0u8, |acc, (x, y)| acc | (x ^ y)) == 0
-}
-
-// -- Routes --
-
-#[derive(Debug, Serialize)]
-#[serde(rename_all = "camelCase")]
-struct BridgeInfo {
-    name: String,
-    version: String,
-    capabilities: crate::state::BridgeCapabilities,
-    /// Commands this build implements. The browser host uses it to fail fast
-    /// with a clear message instead of waiting for a round trip.
-    commands: Vec<String>,
-}
-
-async fn bridge_info(State(app): State<AppState>) -> Json<BridgeInfo> {
-    Json(BridgeInfo {
-        name: "Yaak Bridge".to_string(),
-        version: env!("CARGO_PKG_VERSION").to_string(),
-        capabilities: app.state.capabilities.clone(),
-        commands: crate::rpc::implemented_commands(&app.router),
-    })
-}
-
-/// One envelope in, one out. Errors are carried inside the envelope, not as an
-/// HTTP status, so the browser host can reject the caller's promise with the
-/// backend's own message.
-async fn rpc_handler(
-    State(app): State<AppState>,
-    Json(req): Json<RpcRequest>,
-) -> Json<RpcResponse> {
-    let ctx = BridgeCtx { state: app.state.clone(), session: app.state.session.get() };
-    log::debug!("RPC {}", req.cmd);
-    let response = app.router.handle(req, &ctx).await;
-    if let RpcResponse::Error { error, .. } = &response {
-        log::warn!("RPC failed: {error}");
-    }
-    Json(response)
-}
-
-async fn events_handler(State(app): State<AppState>, ws: WebSocketUpgrade) -> Response {
-    ws.on_upgrade(move |socket| handle_events_socket(socket, app))
-}
-
-/// The tab's first frame reports who and where it is; everything after that is
-/// a reply to something the server asked.
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct AttachPayload {
-    label: String,
-    url: String,
-}
-
-async fn handle_events_socket(socket: WebSocket, app: AppState) {
-    use futures::{SinkExt, StreamExt};
-
-    let (mut sink, mut stream) = socket.split();
-    let mut outbound = app.state.events.subscribe();
-
-    // Server to client.
-    let send_task = tokio::spawn(async move {
-        loop {
-            match outbound.recv().await {
-                Ok(frame) => {
-                    let Ok(text) = serde_json::to_string(&frame) else {
-                        continue;
-                    };
-                    if sink.send(Message::Text(text)).await.is_err() {
-                        break;
-                    }
-                }
-                // A tab that fell behind has missed writes, and the model store
-                // would be silently stale. Close instead, so a reconnect
-                // re-reads the workspace from scratch.
-                Err(tokio::sync::broadcast::error::RecvError::Lagged(n)) => {
-                    log::warn!("Events client lagged by {n} frames; closing so it resyncs");
-                    break;
-                }
-                Err(tokio::sync::broadcast::error::RecvError::Closed) => break,
-            }
-        }
-    });
-
-    // Client to server.
-    let state = app.state.clone();
-    let recv_task = tokio::spawn(async move {
-        while let Some(Ok(message)) = stream.next().await {
-            let Message::Text(text) = message else {
-                continue;
-            };
-            let Ok(frame) = serde_json::from_str::<EventFrame>(&text) else {
-                log::warn!("Ignoring malformed event frame from browser");
-                continue;
-            };
-
-            // `bridge_attach` is the browser telling us what the desktop would
-            // have read off the window: its label and its current URL.
-            if frame.event == "bridge_attach" {
-                match serde_json::from_value::<AttachPayload>(frame.payload.clone()) {
-                    Ok(attach) => {
-                        log::info!("Browser attached: {} at {}", attach.label, attach.url);
-                        state.session.set(SessionContext {
-                            label: attach.label,
-                            url: attach.url,
-                        });
-                    }
-                    Err(e) => log::warn!("Bad bridge_attach payload: {e}"),
-                }
-                continue;
-            }
-
-            state.events.dispatch_inbound(frame);
-        }
-    });
-
-    tokio::select! {
-        _ = send_task => {},
-        _ = recv_task => {},
-    }
-}
-
-#[derive(Debug, Deserialize)]
-struct BodyQuery {
-    /// Present so the shared token extractor doesn't reject the request; the
-    /// value itself is checked in the middleware.
-    #[allow(dead_code)]
-    token: Option<String>,
-}
-
-/// Stream a response body, with Range support.
-///
-/// Keyed by response id rather than by path: the tab hands back a `bodyPath`
-/// the backend gave it, and resolving that through the database means this
-/// route can only ever serve a file the engine wrote, not an arbitrary path a
-/// page asked for. Range matters because the video and audio viewers seek.
-async fn response_body(
-    State(app): State<AppState>,
-    Path(id): Path<String>,
-    Query(_q): Query<BodyQuery>,
-    headers: HeaderMap,
-) -> Response {
-    let response = match app.state.db().get_http_response(&id) {
-        Ok(response) => response,
-        Err(_) => return (StatusCode::NOT_FOUND, "No such response").into_response(),
-    };
-
-    let Some(body_path) = response.body_path else {
-        return (StatusCode::NOT_FOUND, "Response has no body").into_response();
-    };
-
-    let mut file = match tokio::fs::File::open(&body_path).await {
-        Ok(file) => file,
-        Err(e) => return (StatusCode::NOT_FOUND, format!("Body unavailable: {e}")).into_response(),
-    };
-
-    let total = match file.metadata().await {
-        Ok(meta) => meta.len(),
-        Err(e) => {
-            return (StatusCode::INTERNAL_SERVER_ERROR, format!("Body unreadable: {e}"))
-                .into_response();
-        }
-    };
-
-    let content_type = response
-        .headers
-        .iter()
-        .find(|h| h.name.eq_ignore_ascii_case("content-type"))
-        .map(|h| h.value.clone())
-        .unwrap_or_else(|| "application/octet-stream".to_string());
-
-    let range = headers.get(header::RANGE).and_then(|v| v.to_str().ok()).and_then(parse_range);
-
-    let (start, end, status) = match range {
-        Some((start, end)) => {
-            let end = end.unwrap_or(total.saturating_sub(1)).min(total.saturating_sub(1));
-            if total == 0 || start > end {
-                return Response::builder()
-                    .status(StatusCode::RANGE_NOT_SATISFIABLE)
-                    .header(header::CONTENT_RANGE, format!("bytes */{total}"))
-                    .body(Body::empty())
-                    .unwrap();
-            }
-            (start, end, StatusCode::PARTIAL_CONTENT)
-        }
-        None => (0, total.saturating_sub(1), StatusCode::OK),
-    };
-
-    let length = if total == 0 { 0 } else { end - start + 1 };
-
-    if file.seek(std::io::SeekFrom::Start(start)).await.is_err() {
-        return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to seek body").into_response();
-    }
-
-    let mut buf = vec![0u8; length as usize];
-    if let Err(e) = file.read_exact(&mut buf).await {
-        return (StatusCode::INTERNAL_SERVER_ERROR, format!("Failed to read body: {e}"))
-            .into_response();
-    }
-
-    let mut builder = Response::builder()
-        .status(status)
-        .header(header::CONTENT_TYPE, content_type)
-        .header(header::ACCEPT_RANGES, "bytes")
-        .header(header::CONTENT_LENGTH, length);
-
-    if status == StatusCode::PARTIAL_CONTENT {
-        builder = builder.header(header::CONTENT_RANGE, format!("bytes {start}-{end}/{total}"));
-    }
-
-    builder.body(Body::from(buf)).unwrap()
-}
-
-/// Parses a single `bytes=start-end` range. Multi-range requests are not
-/// answered as multipart; the first range is used, which browsers accept.
-fn parse_range(value: &str) -> Option<(u64, Option<u64>)> {
-    let spec = value.strip_prefix("bytes=")?.split(',').next()?.trim();
-    let (start, end) = spec.split_once('-')?;
-    if start.is_empty() {
-        return None;
-    }
-    let start: u64 = start.parse().ok()?;
-    let end = if end.is_empty() { None } else { Some(end.parse().ok()?) };
-    Some((start, end))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn parses_ranges() {
-        assert_eq!(parse_range("bytes=0-499"), Some((0, Some(499))));
-        assert_eq!(parse_range("bytes=500-"), Some((500, None)));
-        assert_eq!(parse_range("bytes=0-99,200-299"), Some((0, Some(99))));
-        // Suffix ranges ("last 500 bytes") aren't supported; callers get the
-        // whole body, which is correct if wasteful.
-        assert_eq!(parse_range("bytes=-500"), None);
-        assert_eq!(parse_range("nonsense"), None);
-    }
-
-    #[test]
-    fn token_comparison_requires_exact_match() {
-        assert!(constant_time_eq("abc", "abc"));
-        assert!(!constant_time_eq("abc", "abd"));
-        assert!(!constant_time_eq("abc", "abcd"));
-    }
-}
@@ -1,121 +0,0 @@
-//! Yaak Bridge — the local companion that runs the real Yaak engine for a
-//! browser tab.
-//!
-//! The tab is the Yaak UI, unchanged. Everything it cannot do in a page —
-//! sending an HTTP request and seeing every response header, following
-//! redirects, keeping a cookie jar, running plugins, reading a response body
-//! off disk — happens in this process, over a local HTTP and WebSocket
-//! connection.
-//!
-//! Loopback only, and every route needs the token printed at startup.
-
-mod events;
-mod http;
-mod model_writes;
-mod plugin_events;
-mod rpc;
-mod session;
-mod state;
-
-use clap::Parser;
-use rand::Rng;
-use std::net::SocketAddr;
-use std::path::PathBuf;
-use std::sync::Arc;
-
-const APP_ID: &str = "app.yaak.bridge";
-
-#[derive(Parser, Debug)]
-#[command(name = "yaak-bridge", about = "Run the Yaak engine for a browser tab")]
-struct Args {
-    /// Port to listen on. Loopback only, always.
-    #[arg(long, default_value_t = 9444, env = "YAAK_BRIDGE_PORT")]
-    port: u16,
-
-    /// Where the database, plugins and response bodies live.
-    #[arg(long, env = "YAAK_BRIDGE_DATA_DIR")]
-    data_dir: Option<PathBuf>,
-
-    /// Use a fixed token instead of generating one. For scripted dev loops.
-    #[arg(long, env = "YAAK_BRIDGE_TOKEN")]
-    token: Option<String>,
-
-    /// Where the frontend was built to. Serving it makes this the only process
-    /// to run; without it, point a Vite dev server at this bridge instead.
-    #[arg(long, env = "YAAK_BRIDGE_WEB_DIR")]
-    web_dir: Option<PathBuf>,
-}
-
-#[tokio::main]
-async fn main() {
-    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
-
-    let args = Args::parse();
-
-    let data_dir = args.data_dir.unwrap_or_else(default_data_dir);
-    if let Err(e) = std::fs::create_dir_all(&data_dir) {
-        eprintln!("Error: failed to create data dir {}: {e}", data_dir.display());
-        std::process::exit(1);
-    }
-
-    if let Some(web_dir) = &args.web_dir {
-        // Read back by the router; keeping it in the environment avoids
-        // threading an option through every layer for a dev-mode convenience.
-        unsafe { std::env::set_var("YAAK_BRIDGE_WEB_DIR", web_dir) };
-    }
-
-    let token = args.token.unwrap_or_else(generate_token);
-    let is_dev = cfg!(debug_assertions);
-
-    let mut state = state::BridgeState::new(data_dir.clone(), APP_ID, token.clone(), is_dev);
-    state.init_plugins().await;
-    let state = Arc::new(state);
-
-    let router = Arc::new(rpc::build_router());
-    let app = http::build_app(state.clone(), router);
-
-    let addr = SocketAddr::from(([127, 0, 0, 1], args.port));
-    let listener = match tokio::net::TcpListener::bind(addr).await {
-        Ok(listener) => listener,
-        Err(e) => {
-            eprintln!("Error: failed to bind {addr}: {e}");
-            std::process::exit(1);
-        }
-    };
-
-    let base = format!("http://127.0.0.1:{}", args.port);
-    println!();
-    println!("  Yaak Bridge listening on {base}");
-    println!("  Data dir: {}", data_dir.display());
-    println!("  Plugins:  {}", if state.capabilities.plugins { "running" } else { "unavailable" });
-    println!();
-    if std::env::var("YAAK_BRIDGE_WEB_DIR").is_ok() {
-        println!("  Open: {base}/?bridgeToken={token}");
-    } else {
-        println!("  Token: {token}");
-        println!("  Open your dev server with ?bridgeToken={token}");
-    }
-    println!();
-
-    let shutdown_state = state.clone();
-    let server = axum::serve(listener, app).with_graceful_shutdown(async move {
-        let _ = tokio::signal::ctrl_c().await;
-        log::info!("Shutting down");
-        shutdown_state.shutdown().await;
-    });
-
-    if let Err(e) = server.await {
-        eprintln!("Error: server failed: {e}");
-        std::process::exit(1);
-    }
-}
-
-fn default_data_dir() -> PathBuf {
-    dirs::data_dir().unwrap_or_else(|| PathBuf::from(".")).join("yaak-bridge")
-}
-
-/// A 256-bit random token, hex encoded. Per process, never written to disk.
-fn generate_token() -> String {
-    let bytes: [u8; 32] = rand::thread_rng().r#gen();
-    bytes.iter().map(|b| format!("{b:02x}")).collect()
-}
@@ -1,125 +0,0 @@
-//! Pushing model writes to the connected tab.
-//!
-//! A direct port of the desktop's two paths (see
-//! crates-tauri/yaak-app-client/src/models_ext.rs), and for the same reason:
-//! the in-memory channel is the fast path for writes this process made on a
-//! client's behalf, while polling the `model_changes` table is what makes an
-//! external writer — the CLI, a second bridge, the desktop app open on the same
-//! database — show up live in the browser. Keeping both means the browser
-//! behaves like the desktop rather than like a cache.
-
-use crate::events::EventHub;
-use chrono::Utc;
-use log::error;
-use std::sync::mpsc::Receiver;
-use std::time::Duration;
-use yaak_models::query_manager::QueryManager;
-use yaak_models::util::{ModelPayload, UpdateSource};
-
-const MODEL_CHANGES_RETENTION_HOURS: i64 = 1;
-const MODEL_CHANGES_POLL_INTERVAL_MS: u64 = 1000;
-const MODEL_CHANGES_POLL_BATCH_SIZE: usize = 200;
-
-struct ModelChangeCursor {
-    created_at: String,
-    id: i64,
-}
-
-impl ModelChangeCursor {
-    fn from_launch_time() -> Self {
-        Self {
-            created_at: Utc::now().naive_utc().format("%Y-%m-%d %H:%M:%S%.3f").to_string(),
-            id: 0,
-        }
-    }
-}
-
-pub fn start(query_manager: &QueryManager, rx: Receiver<ModelPayload>, events: EventHub) {
-    if let Err(err) =
-        query_manager.connect().prune_model_changes_older_than_hours(MODEL_CHANGES_RETENTION_HOURS)
-    {
-        error!("Failed to prune model_changes rows on startup: {err:?}");
-    }
-
-    // Only stream writes that happen after this process started.
-    let cursor = ModelChangeCursor::from_launch_time();
-    let poll_query_manager = query_manager.clone();
-    let poll_events = events.clone();
-    tokio::spawn(async move {
-        run_model_change_poller(poll_query_manager, poll_events, cursor).await;
-    });
-
-    // `init_standalone` hands back a std (blocking) receiver, so it gets a
-    // thread rather than a task.
-    std::thread::spawn(move || {
-        while let Ok(payload) = rx.recv() {
-            let mut batch: Vec<ModelPayload> = Vec::new();
-            if matches!(payload.update_source, UpdateSource::Window { .. }) {
-                batch.push(payload);
-            }
-            // Coalesce anything already queued into the same frame.
-            while let Ok(next) = rx.try_recv() {
-                if matches!(next.update_source, UpdateSource::Window { .. }) {
-                    batch.push(next);
-                }
-            }
-            if batch.is_empty() {
-                continue;
-            }
-            events.emit("model_writes", &batch);
-        }
-    });
-}
-
-async fn run_model_change_poller(
-    query_manager: QueryManager,
-    events: EventHub,
-    mut cursor: ModelChangeCursor,
-) {
-    loop {
-        while drain_model_changes_batch(&query_manager, &events, &mut cursor) {}
-        tokio::time::sleep(Duration::from_millis(MODEL_CHANGES_POLL_INTERVAL_MS)).await;
-    }
-}
-
-fn drain_model_changes_batch(
-    query_manager: &QueryManager,
-    events: &EventHub,
-    cursor: &mut ModelChangeCursor,
-) -> bool {
-    let changes = match query_manager.connect().list_model_changes_since(
-        &cursor.created_at,
-        cursor.id,
-        MODEL_CHANGES_POLL_BATCH_SIZE,
-    ) {
-        Ok(changes) => changes,
-        Err(err) => {
-            error!("Failed to poll model_changes rows: {err:?}");
-            return false;
-        }
-    };
-
-    if changes.is_empty() {
-        return false;
-    }
-
-    let fetched_count = changes.len();
-    let mut batch: Vec<ModelPayload> = Vec::with_capacity(fetched_count);
-    for change in changes {
-        cursor.created_at = change.created_at;
-        cursor.id = change.id;
-
-        // Window-sourced writes already went out on the in-memory fast path.
-        if matches!(change.payload.update_source, UpdateSource::Window { .. }) {
-            continue;
-        }
-        batch.push(change.payload);
-    }
-
-    // One batch per drain so bulk writes don't flood the tab.
-    if !batch.is_empty() {
-        events.emit("model_writes", &batch);
-    }
-
-    fetched_count == MODEL_CHANGES_POLL_BATCH_SIZE
-}
@@ -1,582 +0,0 @@
-//! The bridge's plugin host.
-//!
-//! Same shape as the CLI's bridge (crates-cli/yaak-cli/src/plugin_events.rs):
-//! subscribe to the plugin manager, let `handle_shared_plugin_event` answer
-//! everything that is only a database question, and implement the rest here.
-//!
-//! Where it differs is that a UI is attached. The CLI answers a prompt from a
-//! TTY and refuses when there isn't one; the bridge does what the desktop does
-//! instead — pushes the event to the tab and waits for the reply keyed by the
-//! event's id. Toasts, clipboard writes and external URLs go the same way,
-//! because the browser is the only thing here that can show or do them.
-
-use crate::events::EventHub;
-use crate::session::SessionStore;
-use serde_json::Value;
-use std::path::PathBuf;
-use std::sync::Arc;
-use tokio::task::JoinHandle;
-use yaak::plugin_events::{
-    GroupedPluginEvent, HostRequest, SharedPluginEventContext, handle_shared_plugin_event,
-};
-use yaak::render::{render_grpc_request, render_http_request};
-use yaak::send::{SendHttpRequestWithPluginsParams, send_http_request_with_plugins};
-use yaak_crypto::manager::EncryptionManager;
-use yaak_http::cookies::get_cookie_value_from_jar;
-use yaak_http::manager::HttpConnectionManager;
-use yaak_models::blob_manager::BlobManager;
-use yaak_models::models::Environment;
-use yaak_models::queries::any_request::AnyRequest;
-use yaak_models::query_manager::QueryManager;
-use yaak_models::render::make_vars_hashmap;
-use yaak_models::util::UpdateSource;
-use yaak_plugins::events::{
-    EmptyPayload, ErrorResponse, GetCookieValueResponse, InternalEvent, InternalEventPayload,
-    ListCookieNamesResponse, ListOpenWorkspacesResponse, PluginContext, PromptTextResponse,
-    RenderGrpcRequestResponse, RenderHttpRequestResponse, SendHttpRequestResponse,
-    TemplateRenderResponse, WindowInfoResponse, WorkspaceInfo,
-};
-use yaak_plugins::manager::PluginManager;
-use yaak_plugins::plugin_handle::PluginHandle;
-use yaak_plugins::template_callback::PluginTemplateCallback;
-use yaak_templates::{RenderOptions, TemplateCallback, render_json_value_raw};
-
-pub struct BridgePluginEventBridge {
-    rx_id: String,
-    task: JoinHandle<()>,
-}
-
-struct BridgeHostContext {
-    query_manager: QueryManager,
-    blob_manager: BlobManager,
-    plugin_manager: Arc<PluginManager>,
-    encryption_manager: Arc<EncryptionManager>,
-    connection_manager: Arc<HttpConnectionManager>,
-    response_dir: PathBuf,
-    events: EventHub,
-    session: SessionStore,
-}
-
-impl BridgePluginEventBridge {
-    #[allow(clippy::too_many_arguments)]
-    pub async fn start(
-        plugin_manager: Arc<PluginManager>,
-        query_manager: QueryManager,
-        blob_manager: BlobManager,
-        encryption_manager: Arc<EncryptionManager>,
-        connection_manager: Arc<HttpConnectionManager>,
-        data_dir: PathBuf,
-        events: EventHub,
-        session: SessionStore,
-    ) -> Self {
-        let (rx_id, mut rx) = plugin_manager.subscribe("bridge").await;
-        let rx_id_for_task = rx_id.clone();
-        let pm = plugin_manager.clone();
-        let host_context = Arc::new(BridgeHostContext {
-            query_manager,
-            blob_manager,
-            plugin_manager,
-            encryption_manager,
-            connection_manager,
-            response_dir: data_dir.join("responses"),
-            events,
-            session,
-        });
-
-        let task = tokio::spawn(async move {
-            while let Some(event) = rx.recv().await {
-                // Events with reply IDs are replies to app-originated requests.
-                if event.reply_id.is_some() {
-                    continue;
-                }
-
-                let Some(plugin_handle) = pm.get_plugin_by_ref_id(&event.plugin_ref_id).await
-                else {
-                    log::warn!(
-                        "Ignoring plugin event with unknown plugin ref '{}'",
-                        event.plugin_ref_id
-                    );
-                    continue;
-                };
-
-                let pm = pm.clone();
-                let host_context = host_context.clone();
-
-                // Avoid deadlocks for nested plugin-host requests (for example, template functions
-                // that trigger additional host requests during render) by handling each event in
-                // its own task.
-                tokio::spawn(async move {
-                    let plugin_name = plugin_handle.info().name;
-                    let Some(reply_payload) = build_plugin_reply(
-                        host_context.as_ref(),
-                        &event,
-                        &plugin_name,
-                        &plugin_handle,
-                    )
-                    .await
-                    else {
-                        return;
-                    };
-
-                    if let Err(err) = pm.reply(&event, &reply_payload).await {
-                        log::warn!("Failed replying to plugin event: {err}");
-                    }
-                });
-            }
-
-            pm.unsubscribe(&rx_id_for_task).await;
-        });
-
-        Self { rx_id, task }
-    }
-
-    pub async fn shutdown(self, plugin_manager: &PluginManager) {
-        plugin_manager.unsubscribe(&self.rx_id).await;
-        self.task.abort();
-        let _ = self.task.await;
-    }
-}
-
-async fn build_plugin_reply(
-    host_context: &BridgeHostContext,
-    event: &InternalEvent,
-    plugin_name: &str,
-    plugin_handle: &PluginHandle,
-) -> Option<InternalEventPayload> {
-    let session = host_context.session.get();
-    let shared_workspace_id =
-        event.context.workspace_id.clone().or_else(|| session.workspace_id());
-
-    match handle_shared_plugin_event(
-        &host_context.query_manager,
-        &event.payload,
-        SharedPluginEventContext {
-            plugin_name,
-            workspace_id: shared_workspace_id.as_deref(),
-        },
-    ) {
-        GroupedPluginEvent::Handled(payload) => payload,
-        GroupedPluginEvent::ToHandle(host_request) => match host_request {
-            HostRequest::ErrorResponse(resp) => {
-                log::warn!("[plugin:{plugin_name}] error: {}", resp.error);
-                None
-            }
-            HostRequest::ReloadResponse(_) => None,
-
-            // The tab owns everything the user can see or the OS can do. These
-            // are fire-and-forget: the plugin gets its acknowledgement as soon
-            // as the frame is queued, matching the desktop, which also does not
-            // wait for the webview to paint.
-            HostRequest::ShowToast(req) => {
-                host_context.events.emit("show_toast", &req);
-                Some(InternalEventPayload::ShowToastResponse(EmptyPayload {}))
-            }
-            HostRequest::CopyText(req) => {
-                host_context.events.emit("bridge_copy_text", &req);
-                Some(InternalEventPayload::CopyTextResponse(EmptyPayload {}))
-            }
-            HostRequest::OpenExternalUrl(req) => {
-                host_context.events.emit("bridge_open_url", &req);
-                Some(InternalEventPayload::OpenExternalUrlResponse(EmptyPayload {}))
-            }
-
-            // Prompts are questions, so they round-trip: the tab renders the
-            // dialog and emits the answer back under the event's own id.
-            HostRequest::PromptText(_) => {
-                let reply = call_frontend(host_context, event).await;
-                Some(reply.unwrap_or(InternalEventPayload::PromptTextResponse(
-                    PromptTextResponse { value: None },
-                )))
-            }
-
-            // A form streams: the tab sends a response per interaction and the
-            // plugin re-renders, until one comes back marked done.
-            HostRequest::PromptForm(_) => {
-                host_context.events.emit("plugin_event", event);
-                if event.reply_id.is_none() {
-                    spawn_form_reply_pump(host_context, event, plugin_handle);
-                }
-                None
-            }
-
-            HostRequest::ListOpenWorkspaces(_) => {
-                let workspaces = match host_context.query_manager.connect().list_workspaces() {
-                    Ok(workspaces) => workspaces
-                        .into_iter()
-                        .map(|w| WorkspaceInfo {
-                            id: w.id.clone(),
-                            name: w.name,
-                            label: session.label.clone(),
-                        })
-                        .collect(),
-                    Err(err) => {
-                        return Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                            error: format!("Failed to list workspaces in bridge: {err}"),
-                        }));
-                    }
-                };
-                Some(InternalEventPayload::ListOpenWorkspacesResponse(ListOpenWorkspacesResponse {
-                    workspaces,
-                }))
-            }
-
-            HostRequest::SendHttpRequest(req) => {
-                let mut http_request = req.http_request.clone();
-                if http_request.workspace_id.is_empty() {
-                    let Some(workspace_id) = shared_workspace_id.clone() else {
-                        return Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                            error: "workspace_id is required to send HTTP requests in bridge"
-                                .to_string(),
-                        }));
-                    };
-                    http_request.workspace_id = workspace_id;
-                }
-
-                let cookie_jar_id = match session.cookie_jar_id() {
-                    Some(id) => Some(id),
-                    None => match host_context
-                        .query_manager
-                        .connect()
-                        .list_cookie_jars(http_request.workspace_id.as_str())
-                    {
-                        Ok(jars) => {
-                            jars.into_iter().min_by_key(|jar| jar.created_at).map(|jar| jar.id)
-                        }
-                        Err(err) => {
-                            return Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                                error: format!("Failed to list cookie jars in bridge: {err}"),
-                            }));
-                        }
-                    },
-                };
-
-                let plugin_context = PluginContext {
-                    workspace_id: Some(http_request.workspace_id.clone()),
-                    ..event.context.clone()
-                };
-
-                match send_http_request_with_plugins(SendHttpRequestWithPluginsParams {
-                    query_manager: &host_context.query_manager,
-                    blob_manager: &host_context.blob_manager,
-                    request: http_request,
-                    environment_id: session.environment_id().as_deref(),
-                    update_source: UpdateSource::Plugin,
-                    cookie_jar_id,
-                    response_dir: &host_context.response_dir,
-                    emit_events_to: None,
-                    emit_response_body_chunks_to: None,
-                    existing_response: None,
-                    plugin_manager: host_context.plugin_manager.clone(),
-                    encryption_manager: host_context.encryption_manager.clone(),
-                    plugin_context: &plugin_context,
-                    cancelled_rx: None,
-                    connection_manager: &host_context.connection_manager,
-                })
-                .await
-                {
-                    Ok(result) => Some(InternalEventPayload::SendHttpRequestResponse(
-                        SendHttpRequestResponse { http_response: result.response },
-                    )),
-                    Err(err) => Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                        error: format!("Failed to send HTTP request in bridge: {err}"),
-                    })),
-                }
-            }
-
-            HostRequest::RenderHttpRequest(req) => {
-                let mut http_request = req.http_request.clone();
-                if http_request.workspace_id.is_empty() {
-                    let Some(workspace_id) = shared_workspace_id.clone() else {
-                        return Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                            error: "workspace_id is required to render HTTP requests in bridge"
-                                .to_string(),
-                        }));
-                    };
-                    http_request.workspace_id = workspace_id;
-                }
-
-                let plugin_context = PluginContext {
-                    workspace_id: Some(http_request.workspace_id.clone()),
-                    ..event.context.clone()
-                };
-
-                let environment_chain = match host_context.query_manager.connect().resolve_environments(
-                    &http_request.workspace_id,
-                    http_request.folder_id.as_deref(),
-                    session.environment_id().as_deref(),
-                ) {
-                    Ok(chain) => chain,
-                    Err(err) => {
-                        return Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                            error: format!("Failed to resolve environments in bridge: {err}"),
-                        }));
-                    }
-                };
-
-                let template_callback = PluginTemplateCallback::new(
-                    host_context.plugin_manager.clone(),
-                    host_context.encryption_manager.clone(),
-                    &plugin_context,
-                    req.purpose.clone(),
-                );
-
-                match render_http_request(
-                    &http_request,
-                    environment_chain,
-                    &template_callback,
-                    &RenderOptions::throw(),
-                )
-                .await
-                {
-                    Ok(http_request) => Some(InternalEventPayload::RenderHttpRequestResponse(
-                        RenderHttpRequestResponse { http_request },
-                    )),
-                    Err(err) => Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                        error: format!("Failed to render HTTP request in bridge: {err}"),
-                    })),
-                }
-            }
-
-            HostRequest::RenderGrpcRequest(req) => {
-                let mut grpc_request = req.grpc_request.clone();
-                if grpc_request.workspace_id.is_empty() {
-                    let Some(workspace_id) = shared_workspace_id.clone() else {
-                        return Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                            error: "workspace_id is required to render gRPC requests in bridge"
-                                .to_string(),
-                        }));
-                    };
-                    grpc_request.workspace_id = workspace_id;
-                }
-
-                let plugin_context = PluginContext {
-                    workspace_id: Some(grpc_request.workspace_id.clone()),
-                    ..event.context.clone()
-                };
-
-                let environment_chain = match host_context.query_manager.connect().resolve_environments(
-                    &grpc_request.workspace_id,
-                    grpc_request.folder_id.as_deref(),
-                    session.environment_id().as_deref(),
-                ) {
-                    Ok(chain) => chain,
-                    Err(err) => {
-                        return Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                            error: format!("Failed to resolve environments in bridge: {err}"),
-                        }));
-                    }
-                };
-
-                let template_callback = PluginTemplateCallback::new(
-                    host_context.plugin_manager.clone(),
-                    host_context.encryption_manager.clone(),
-                    &plugin_context,
-                    req.purpose.clone(),
-                );
-
-                match render_grpc_request(
-                    &grpc_request,
-                    environment_chain,
-                    &template_callback,
-                    &RenderOptions::throw(),
-                )
-                .await
-                {
-                    Ok(grpc_request) => Some(InternalEventPayload::RenderGrpcRequestResponse(
-                        RenderGrpcRequestResponse { grpc_request },
-                    )),
-                    Err(err) => Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                        error: format!("Failed to render gRPC request in bridge: {err}"),
-                    })),
-                }
-            }
-
-            HostRequest::TemplateRender(req) => {
-                let Some(workspace_id) = shared_workspace_id.clone() else {
-                    return Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                        error: "workspace_id is required to render templates in bridge".to_string(),
-                    }));
-                };
-
-                let plugin_context =
-                    PluginContext { workspace_id: Some(workspace_id.clone()), ..event.context.clone() };
-
-                let folder_id = session.request_id().and_then(|rid| {
-                    match host_context.query_manager.connect().get_any_request(&rid) {
-                        Ok(AnyRequest::HttpRequest(r)) => r.folder_id,
-                        Ok(AnyRequest::GrpcRequest(r)) => r.folder_id,
-                        Ok(AnyRequest::WebsocketRequest(r)) => r.folder_id,
-                        Err(_) => None,
-                    }
-                });
-
-                let environment_chain = match host_context.query_manager.connect().resolve_environments(
-                    &workspace_id,
-                    folder_id.as_deref(),
-                    session.environment_id().as_deref(),
-                ) {
-                    Ok(chain) => chain,
-                    Err(err) => {
-                        return Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                            error: format!("Failed to resolve environments in bridge: {err}"),
-                        }));
-                    }
-                };
-
-                let template_callback = PluginTemplateCallback::new(
-                    host_context.plugin_manager.clone(),
-                    host_context.encryption_manager.clone(),
-                    &plugin_context,
-                    req.purpose.clone(),
-                );
-
-                match render_json_value(
-                    req.data.clone(),
-                    environment_chain,
-                    &template_callback,
-                    &RenderOptions::throw(),
-                )
-                .await
-                {
-                    Ok(data) => {
-                        Some(InternalEventPayload::TemplateRenderResponse(TemplateRenderResponse {
-                            data,
-                        }))
-                    }
-                    Err(err) => Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                        error: format!("Failed to render template data in bridge: {err}"),
-                    })),
-                }
-            }
-
-            HostRequest::ListCookieNames(_) => {
-                let Some(cookie_jar_id) = session.cookie_jar_id() else {
-                    return Some(InternalEventPayload::ListCookieNamesResponse(
-                        ListCookieNamesResponse { names: Vec::new() },
-                    ));
-                };
-                match host_context.query_manager.connect().get_cookie_jar(&cookie_jar_id) {
-                    Ok(jar) => Some(InternalEventPayload::ListCookieNamesResponse(
-                        ListCookieNamesResponse {
-                            names: jar.cookies.into_iter().map(|c| c.name).collect(),
-                        },
-                    )),
-                    Err(err) => Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                        error: format!("Failed to load cookie jar in bridge: {err}"),
-                    })),
-                }
-            }
-
-            HostRequest::GetCookieValue(req) => {
-                let Some(cookie_jar_id) = session.cookie_jar_id() else {
-                    return Some(InternalEventPayload::GetCookieValueResponse(
-                        GetCookieValueResponse { value: None },
-                    ));
-                };
-                match host_context.query_manager.connect().get_cookie_jar(&cookie_jar_id) {
-                    Ok(jar) => {
-                        let value =
-                            get_cookie_value_from_jar(jar.cookies, &req.name, req.domain.as_deref());
-                        Some(InternalEventPayload::GetCookieValueResponse(GetCookieValueResponse {
-                            value,
-                        }))
-                    }
-                    Err(err) => Some(InternalEventPayload::ErrorResponse(ErrorResponse {
-                        error: format!("Failed to load cookie jar in bridge: {err}"),
-                    })),
-                }
-            }
-
-            HostRequest::WindowInfo(req) => {
-                Some(InternalEventPayload::WindowInfoResponse(WindowInfoResponse {
-                    label: req.label.clone(),
-                    request_id: session.request_id(),
-                    workspace_id: shared_workspace_id.clone(),
-                    environment_id: session.environment_id(),
-                }))
-            }
-
-            // A tab is one window. Opening and closing them needs the
-            // multiWindow capability the bridge reports false.
-            HostRequest::OpenWindow(_) => Some(unsupported("open_window_request")),
-            HostRequest::CloseWindow(_) => Some(unsupported("close_window_request")),
-            HostRequest::OtherRequest(payload) => Some(unsupported(&payload.type_name())),
-        },
-    }
-}
-
-fn unsupported(type_name: &str) -> InternalEventPayload {
-    InternalEventPayload::ErrorResponse(ErrorResponse {
-        error: format!("Unsupported plugin request in bridge: {type_name}"),
-    })
-}
-
-/// Ask the tab and wait for its answer, keyed by the event's id — the same
-/// contract as the desktop's `call_frontend`.
-async fn call_frontend(
-    host_context: &BridgeHostContext,
-    event: &InternalEvent,
-) -> Option<InternalEventPayload> {
-    // Subscribe before emitting: the tab can answer faster than this task is
-    // rescheduled, and a reply that arrives before the listener exists is lost.
-    let mut replies = host_context.events.subscribe_inbound(event.id.clone());
-    host_context.events.emit("plugin_event", event);
-
-    let value = replies.recv().await?;
-    match serde_json::from_value::<InternalEvent>(value) {
-        Ok(reply) => Some(reply.payload),
-        Err(e) => {
-            log::warn!("Failed to parse plugin reply from browser: {e}");
-            None
-        }
-    }
-}
-
-/// Forward every form response the tab sends back to the plugin, until one is
-/// marked done.
-fn spawn_form_reply_pump(
-    host_context: &BridgeHostContext,
-    event: &InternalEvent,
-    plugin_handle: &PluginHandle,
-) {
-    let mut replies = host_context.events.subscribe_inbound(event.id.clone());
-    let plugin_handle = plugin_handle.clone();
-    let plugin_context = event.context.clone();
-
-    tokio::spawn(async move {
-        while let Some(value) = replies.recv().await {
-            let Ok(resp) = serde_json::from_value::<InternalEvent>(value) else {
-                log::warn!("Failed to parse form response from browser");
-                continue;
-            };
-
-            let is_done = matches!(
-                &resp.payload,
-                InternalEventPayload::PromptFormResponse(r) if r.done.unwrap_or(false)
-            );
-
-            let event_to_send = plugin_handle.build_event_to_send(
-                &plugin_context,
-                &resp.payload,
-                Some(resp.reply_id.unwrap_or_default()),
-            );
-            if let Err(e) = plugin_handle.send(&event_to_send).await {
-                log::warn!("Failed to forward form response to plugin: {e:?}");
-            }
-
-            if is_done {
-                break;
-            }
-        }
-    });
-}
-
-async fn render_json_value<T: TemplateCallback>(
-    value: Value,
-    environment_chain: Vec<Environment>,
-    cb: &T,
-    opt: &RenderOptions,
-) -> yaak_templates::error::Result<Value> {
-    let vars = &make_vars_hashmap(environment_chain);
-    render_json_value_raw(value, vars, cb, opt).await
-}
@@ -1,147 +0,0 @@
-//! The bridge's RPC surface.
-//!
-//! Same envelope and same command names as the desktop, dispatched through the
-//! same `RpcRouter`. Only the adapters differ: the desktop's take a Tauri
-//! window and read the workspace off its URL, while these take a `BridgeCtx`
-//! carrying the connected tab's reported URL. The bodies underneath call the
-//! same engine functions in `yaak`, `yaak-models` and `yaak-plugins`.
-//!
-//! This is a subset — enough to boot, edit, send and inspect. Anything not
-//! registered here still gets a well-formed answer: `unsupported_command`
-//! turns it into an RPC error naming the command and this host, so the frontend
-//! surfaces "not supported by the Yaak Bridge" instead of a bare failure.
-
-mod commands;
-
-pub use commands::implemented_commands;
-
-use crate::session::SessionContext;
-use crate::state::BridgeState;
-use std::sync::Arc;
-use yaak_plugins::events::PluginContext;
-use yaak_rpc::{RpcError, RpcRouter};
-
-/// Per-call context. The tab's identity and location, plus the engine.
-///
-/// Mirrors the desktop's `ClientCtx { window }`: the window there answers both
-/// "who is calling" and "what are they looking at", and those are exactly the
-/// two things a bridge call needs that the payload doesn't carry.
-#[derive(Clone)]
-pub struct BridgeCtx {
-    pub state: Arc<BridgeState>,
-    pub session: SessionContext,
-}
-
-impl BridgeCtx {
-    pub fn plugin_context(&self) -> PluginContext {
-        PluginContext::new(Some(self.session.label.clone()), self.session.workspace_id())
-    }
-
-    pub fn update_source(&self) -> yaak_models::util::UpdateSource {
-        yaak_models::util::UpdateSource::from_window_label(&self.session.label)
-    }
-
-    /// The plugin runtime, or an error naming the reason it isn't there.
-    pub fn plugins(&self) -> Result<Arc<yaak_plugins::manager::PluginManager>, RpcError> {
-        self.state.plugin_manager().ok_or_else(|| RpcError {
-            message: "The plugin runtime failed to start, so this command is unavailable"
-                .to_string(),
-        })
-    }
-}
-
-pub fn build_router() -> RpcRouter<BridgeCtx> {
-    commands::build_router()
-}
-
-/// Every command the desktop has that the bridge does not implement.
-///
-/// Registered explicitly rather than left to fall through to "unknown command",
-/// so the message says *why* — the frontend can tell a host that will never
-/// support git from one that is simply out of date.
-pub const UNSUPPORTED_COMMANDS: &[&str] = &[
-    // Multi-window. A tab is one window; Settings opens through this on the
-    // desktop and is therefore unreachable in the browser today.
-    "cmd_new_child_window",
-    "cmd_new_main_window",
-    // gRPC and WebSocket sending.
-    "cmd_grpc_reflect",
-    "cmd_grpc_go",
-    "cmd_grpc_request_actions",
-    "cmd_call_grpc_request_action",
-    "cmd_delete_all_grpc_connections",
-    "cmd_ws_connect",
-    "cmd_ws_send",
-    "cmd_ws_close",
-    "cmd_ws_delete_connections",
-    "cmd_websocket_request_actions",
-    "cmd_call_websocket_request_action",
-    // Git-backed workspaces.
-    "cmd_git_checkout",
-    "cmd_git_branch",
-    "cmd_git_delete_branch",
-    "cmd_git_delete_remote_branch",
-    "cmd_git_merge_branch",
-    "cmd_git_rename_branch",
-    "cmd_git_status",
-    "cmd_git_branch_info",
-    "cmd_git_worktree_status",
-    "cmd_git_log",
-    "cmd_git_log_for_file",
-    "cmd_git_file_diff_for_commit",
-    "cmd_git_initialize",
-    "cmd_git_clone",
-    "cmd_git_commit",
-    "cmd_git_fetch_all",
-    "cmd_git_push",
-    "cmd_git_pull",
-    "cmd_git_pull_force_reset",
-    "cmd_git_pull_merge",
-    "cmd_git_add",
-    "cmd_git_unstage",
-    "cmd_git_reset_changes",
-    "cmd_git_restore_files",
-    "cmd_git_restore_file_from_commit",
-    "cmd_git_add_credential",
-    "cmd_git_remotes",
-    "cmd_git_add_remote",
-    "cmd_git_rm_remote",
-    "cmd_git_watch_worktree_status",
-    // Filesystem sync.
-    "cmd_sync_calculate",
-    "cmd_sync_calculate_fs",
-    "cmd_sync_apply",
-    "cmd_sync_watch",
-    // Workspace encryption.
-    "cmd_enable_encryption",
-    "cmd_disable_encryption",
-    "cmd_reveal_workspace_key",
-    "cmd_set_workspace_key",
-    // Things that need a local filesystem the tab can point at.
-    //
-    // `cmd_http_response_body_path` is how the desktop host turns a response id
-    // into a file it can open; a tab has nothing to do with the answer and
-    // fetches `/responses/:id/body` instead.
-    "cmd_http_response_body_path",
-    "cmd_export_data",
-    "cmd_save_response",
-    "cmd_save_base64_to_binary",
-    "cmd_plugins_install_from_directory",
-    // Desktop application management.
-    "cmd_restart",
-    "cmd_check_for_updates",
-    "cmd_dismiss_notification",
-    "cmd_send_feedback",
-    "cmd_plugins_search",
-    "cmd_plugins_install",
-    "cmd_plugins_uninstall",
-    "cmd_plugins_updates",
-    "cmd_plugins_update_all",
-    "cmd_reload_plugins",
-];
-
-pub fn unsupported_command(cmd: &str) -> RpcError {
-    RpcError {
-        message: format!("`{cmd}` is not supported on this host (Yaak Bridge)"),
-    }
-}
@@ -1,140 +0,0 @@
-//! What the connected tab is currently looking at.
-//!
-//! The desktop reads workspace, environment, cookie jar and request straight off
-//! the window's URL (crates-tauri/yaak-tauri-utils/src/window.rs). A browser tab
-//! runs the same router and so has the same URL, but the server cannot see it —
-//! so the tab reports it, on connect and whenever it changes, and the same
-//! parsing happens here.
-//!
-//! One session for the whole process: this slice serves a single tab. A second
-//! tab overwrites the first's context rather than getting its own.
-
-use std::sync::{Arc, RwLock};
-
-#[derive(Debug, Clone, Default)]
-pub struct SessionContext {
-    /// Identifies the tab, and lands in `UpdateSource::Window { label }` so
-    /// model-write echo suppression works exactly as it does on the desktop.
-    pub label: String,
-    pub url: String,
-}
-
-impl SessionContext {
-    pub fn workspace_id(&self) -> Option<String> {
-        let rest = self.url.split("/workspaces/").nth(1)?;
-        let id: String =
-            rest.chars().take_while(|c| c.is_alphanumeric() || *c == '_').collect();
-        if id.is_empty() { None } else { Some(id) }
-    }
-
-    pub fn request_id(&self) -> Option<String> {
-        let rest = self.url.split("/requests/").nth(1)?;
-        let id: String =
-            rest.chars().take_while(|c| c.is_alphanumeric() || *c == '_').collect();
-        if id.is_empty() { None } else { Some(id) }
-    }
-
-    pub fn environment_id(&self) -> Option<String> {
-        self.query_param("environment_id")
-    }
-
-    pub fn cookie_jar_id(&self) -> Option<String> {
-        self.query_param("cookie_jar_id")
-    }
-
-    fn query_param(&self, key: &str) -> Option<String> {
-        let query = self.url.split('?').nth(1)?;
-        let value = query.split('&').find_map(|pair| {
-            let (k, v) = pair.split_once('=')?;
-            if k != key {
-                return None;
-            }
-            Some(percent_decode(v))
-        })?;
-
-        // The router writes `environment_id=null` when nothing is selected.
-        // Neither of these is an id, and treating them as one sends a lookup
-        // for a model that cannot exist.
-        if value.is_empty() || value == "null" || value == "undefined" {
-            return None;
-        }
-        Some(value)
-    }
-}
-
-fn percent_decode(input: &str) -> String {
-    let bytes = input.replace('+', " ").into_bytes();
-    let mut out: Vec<u8> = Vec::with_capacity(bytes.len());
-    let mut i = 0;
-    while i < bytes.len() {
-        if bytes[i] == b'%' && i + 2 < bytes.len() {
-            let hex = std::str::from_utf8(&bytes[i + 1..i + 3]).ok();
-            if let Some(byte) = hex.and_then(|h| u8::from_str_radix(h, 16).ok()) {
-                out.push(byte);
-                i += 3;
-                continue;
-            }
-        }
-        out.push(bytes[i]);
-        i += 1;
-    }
-    String::from_utf8_lossy(&out).to_string()
-}
-
-#[derive(Clone, Default)]
-pub struct SessionStore {
-    inner: Arc<RwLock<SessionContext>>,
-}
-
-impl SessionStore {
-    pub fn get(&self) -> SessionContext {
-        match self.inner.read() {
-            Ok(guard) => guard.clone(),
-            Err(poisoned) => poisoned.into_inner().clone(),
-        }
-    }
-
-    pub fn set(&self, context: SessionContext) {
-        let mut guard = match self.inner.write() {
-            Ok(guard) => guard,
-            Err(poisoned) => poisoned.into_inner(),
-        };
-        *guard = context;
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn ctx(url: &str) -> SessionContext {
-        SessionContext { label: "tab".into(), url: url.into() }
-    }
-
-    #[test]
-    fn parses_ids_from_a_router_url() {
-        let c = ctx(
-            "http://localhost:1472/workspaces/wk_abc123/requests/rq_def456?environment_id=ev_1&cookie_jar_id=cj_2",
-        );
-        assert_eq!(c.workspace_id().as_deref(), Some("wk_abc123"));
-        assert_eq!(c.request_id().as_deref(), Some("rq_def456"));
-        assert_eq!(c.environment_id().as_deref(), Some("ev_1"));
-        assert_eq!(c.cookie_jar_id().as_deref(), Some("cj_2"));
-    }
-
-    #[test]
-    fn placeholder_query_values_are_not_ids() {
-        let c = ctx("http://localhost:1472/workspaces/wk_a?environment_id=null&cookie_jar_id=");
-        assert_eq!(c.environment_id(), None);
-        assert_eq!(c.cookie_jar_id(), None);
-    }
-
-    #[test]
-    fn missing_parts_are_none() {
-        let c = ctx("http://localhost:1472/");
-        assert_eq!(c.workspace_id(), None);
-        assert_eq!(c.request_id(), None);
-        assert_eq!(c.environment_id(), None);
-        assert_eq!(c.cookie_jar_id(), None);
-    }
-}
@@ -1,244 +0,0 @@
-//! The bridge's engine handles, shared by every route.
-//!
-//! Structurally this is `CliContext` (crates-cli/yaak-cli/src/context.rs) with
-//! an event hub bolted on: the same `init_standalone` database, the same
-//! `PluginManager` over the same Node sidecar. What differs is that a browser
-//! tab is attached, so writes have to be pushed out as they happen instead of
-//! the process exiting when a command finishes.
-
-use crate::events::EventHub;
-use crate::plugin_events::BridgePluginEventBridge;
-use crate::session::SessionStore;
-use include_dir::{Dir, include_dir};
-use serde::Serialize;
-use std::fs;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-use tokio::sync::Mutex;
-use yaak_crypto::manager::EncryptionManager;
-use yaak_http::manager::HttpConnectionManager;
-use yaak_models::blob_manager::BlobManager;
-use yaak_models::client_db::ClientDb;
-use yaak_models::query_manager::QueryManager;
-use yaak_plugins::events::PluginContext;
-use yaak_plugins::manager::PluginManager;
-
-const EMBEDDED_PLUGIN_RUNTIME: &str = include_str!(concat!(
-    env!("CARGO_MANIFEST_DIR"),
-    "/../../crates-tauri/yaak-app-client/vendored/plugin-runtime/index.cjs"
-));
-static EMBEDDED_VENDORED_PLUGINS: Dir<'_> =
-    include_dir!("$CARGO_MANIFEST_DIR/../../crates-tauri/yaak-app-client/vendored/plugins");
-
-/// What this host can do, mirroring `PlatformCapabilities` in
-/// packages/platform/src/types.ts.
-///
-/// Reported to the browser rather than hardcoded there, because the honest
-/// answer depends on how the bridge was built — these become cargo features as
-/// the surface grows, and the tab should not have to guess.
-#[derive(Debug, Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct BridgeCapabilities {
-    pub grpc: bool,
-    pub websocket: bool,
-    pub git: bool,
-    pub sync: bool,
-    pub tls_options: bool,
-    pub cookie_jar: bool,
-    pub local_files: bool,
-    pub timeline: bool,
-    pub multi_window: bool,
-    pub plugins: bool,
-    pub encryption: bool,
-    pub updater: bool,
-    pub clipboard_read: bool,
-    pub system_fonts: bool,
-    pub license: bool,
-}
-
-impl BridgeCapabilities {
-    /// The first slice: real HTTP sending with full fidelity, real plugins, a
-    /// real cookie jar and timeline. Everything the bridge has no route for is
-    /// reported false so the UI hides it rather than calling and failing.
-    fn for_this_build(plugins: bool) -> Self {
-        Self {
-            grpc: false,
-            websocket: false,
-            git: false,
-            sync: false,
-            // The engine does the TLS, so client certs and custom CAs are real.
-            tls_options: true,
-            cookie_jar: true,
-            // The bridge has a filesystem but the tab has no way to pick a path
-            // on it: there is no dialog implementation on this host.
-            local_files: false,
-            timeline: true,
-            multi_window: false,
-            plugins,
-            encryption: false,
-            updater: false,
-            clipboard_read: false,
-            system_fonts: false,
-            license: false,
-        }
-    }
-}
-
-pub struct BridgeState {
-    data_dir: PathBuf,
-    query_manager: QueryManager,
-    blob_manager: BlobManager,
-    pub encryption_manager: Arc<EncryptionManager>,
-    connection_manager: Arc<HttpConnectionManager>,
-    plugin_manager: Option<Arc<PluginManager>>,
-    plugin_event_bridge: Mutex<Option<BridgePluginEventBridge>>,
-    pub events: EventHub,
-    pub session: SessionStore,
-    pub capabilities: BridgeCapabilities,
-    /// Dev-grade shared secret, minted per process. The seam where OTP pairing
-    /// and per-session keys will go; deliberately not persisted.
-    pub token: String,
-    pub is_dev: bool,
-}
-
-impl BridgeState {
-    pub fn new(data_dir: PathBuf, app_id: &str, token: String, is_dev: bool) -> Self {
-        let db_path = data_dir.join("db.sqlite");
-        let blob_path = data_dir.join("blobs.sqlite");
-        let (query_manager, blob_manager, rx) =
-            match yaak_models::init_standalone(&db_path, &blob_path) {
-                Ok(v) => v,
-                Err(err) => {
-                    eprintln!("Error: Failed to initialize database: {err}");
-                    std::process::exit(1);
-                }
-            };
-        let encryption_manager = Arc::new(EncryptionManager::new(query_manager.clone(), app_id));
-        let events = EventHub::new();
-
-        // A Settings row has to exist before the frontend's first render — the
-        // singular model atom throws without one. `get_settings` upserts a
-        // default when it finds nothing, so touching it here is enough.
-        let _ = query_manager.connect().get_settings();
-
-        crate::model_writes::start(&query_manager, rx, events.clone());
-
-        Self {
-            data_dir,
-            query_manager,
-            blob_manager,
-            encryption_manager,
-            connection_manager: Arc::new(HttpConnectionManager::new()),
-            plugin_manager: None,
-            plugin_event_bridge: Mutex::new(None),
-            events,
-            session: SessionStore::default(),
-            capabilities: BridgeCapabilities::for_this_build(false),
-            token,
-            is_dev,
-        }
-    }
-
-    /// Start the Node plugin runtime and the host-request bridge. Mirrors
-    /// `CliContext::init_plugins`; a failure here is survivable, but sending
-    /// loses auth and template functions, so the capability flips off.
-    pub async fn init_plugins(&mut self) {
-        let vendored_plugin_dir = self.data_dir.join("vendored-plugins");
-        let installed_plugin_dir = self.data_dir.join("installed-plugins");
-        let node_bin_path = PathBuf::from("node");
-
-        prepare_embedded_vendored_plugins(&vendored_plugin_dir)
-            .expect("Failed to prepare bundled plugins");
-
-        let plugin_runtime_main =
-            std::env::var("YAAK_PLUGIN_RUNTIME").map(PathBuf::from).unwrap_or_else(|_| {
-                prepare_embedded_plugin_runtime(&self.data_dir)
-                    .expect("Failed to prepare embedded plugin runtime")
-            });
-
-        match PluginManager::new(
-            vendored_plugin_dir,
-            installed_plugin_dir,
-            node_bin_path,
-            plugin_runtime_main,
-            &self.query_manager,
-            &PluginContext::new_empty(),
-            false,
-        )
-        .await
-        {
-            Ok(plugin_manager) => {
-                let plugin_manager = Arc::new(plugin_manager);
-                let plugin_event_bridge = BridgePluginEventBridge::start(
-                    plugin_manager.clone(),
-                    self.query_manager.clone(),
-                    self.blob_manager.clone(),
-                    self.encryption_manager.clone(),
-                    self.connection_manager.clone(),
-                    self.data_dir.clone(),
-                    self.events.clone(),
-                    self.session.clone(),
-                )
-                .await;
-                self.plugin_manager = Some(plugin_manager);
-                *self.plugin_event_bridge.lock().await = Some(plugin_event_bridge);
-                self.capabilities.plugins = true;
-            }
-            Err(err) => {
-                log::warn!("Failed to initialize plugins: {err}");
-                self.capabilities.plugins = false;
-            }
-        }
-    }
-
-    pub fn data_dir(&self) -> &Path {
-        &self.data_dir
-    }
-
-    pub fn response_dir(&self) -> PathBuf {
-        self.data_dir.join("responses")
-    }
-
-    pub fn db(&self) -> ClientDb<'_> {
-        self.query_manager.connect()
-    }
-
-    pub fn query_manager(&self) -> &QueryManager {
-        &self.query_manager
-    }
-
-    pub fn blob_manager(&self) -> &BlobManager {
-        &self.blob_manager
-    }
-
-    pub fn connection_manager(&self) -> &HttpConnectionManager {
-        &self.connection_manager
-    }
-
-    pub fn plugin_manager(&self) -> Option<Arc<PluginManager>> {
-        self.plugin_manager.clone()
-    }
-
-    pub async fn shutdown(&self) {
-        if let Some(plugin_manager) = &self.plugin_manager {
-            if let Some(plugin_event_bridge) = self.plugin_event_bridge.lock().await.take() {
-                plugin_event_bridge.shutdown(plugin_manager).await;
-            }
-            plugin_manager.terminate().await;
-        }
-    }
-}
-
-fn prepare_embedded_plugin_runtime(data_dir: &Path) -> std::io::Result<PathBuf> {
-    let runtime_dir = data_dir.join("vendored").join("plugin-runtime");
-    fs::create_dir_all(&runtime_dir)?;
-    let runtime_main = runtime_dir.join("index.cjs");
-    fs::write(&runtime_main, EMBEDDED_PLUGIN_RUNTIME)?;
-    Ok(runtime_main)
-}
-
-fn prepare_embedded_vendored_plugins(vendored_plugin_dir: &Path) -> std::io::Result<()> {
-    fs::create_dir_all(vendored_plugin_dir)?;
-    EMBEDDED_VENDORED_PLUGINS.extract(vendored_plugin_dir)?;
-    Ok(())
-}
@@ -73,6 +73,7 @@ url = "2"
 tokio-util = { version = "0.7", features = ["codec"] }
 ts-rs = { workspace = true }
 yaak-rpc = { workspace = true }
+yaak-rpc-schema = { workspace = true }
 uuid = "1.12.1"
 yaak-api = { workspace = true }
 yaak-common = { workspace = true }
@@ -1,7 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.

-export type GitWatchResult = { unlistenEvent: string, };
-
 export type PluginUpdateInfo = { name: string, currentVersion: string, latestVersion: string, };

 export type PluginUpdateNotification = { updateCount: number, plugins: Array<PluginUpdateInfo>, };
@@ -12,8 +10,6 @@ export type UpdateResponse = { "type": "ack" } | { "type": "action", action: Upd

 export type UpdateResponseAction = "install" | "skip";

-export type WatchResult = { unlistenEvent: string, };
-
 export type YaakNotification = { timestamp: string, timeout: number | null, id: string, title: string | null, message: string, color: string | null, action: YaakNotificationAction | null, };

 export type YaakNotificationAction = { label: string, url: string, };
@@ -1,4 +1,4 @@
-// ts-rs owns bindings/index.ts and rewrites it on export, so this hand-written
-// entry point is where the generated files come together.
-export * from "./bindings/gen_rpc";
+// ts-rs owns bindings/index.ts and rewrites it on export. What remains here
+// after the RPC schema moved to @yaakapp-internal/rpc-schema is the
+// desktop-only surface: updater and notification types.
 export * from "./bindings/index";
@@ -2,7 +2,6 @@ use crate::error::{Error, Result};
 use chrono::Utc;
 use log::{debug, error, warn};
 use notify::Watcher;
-use serde::{Deserialize, Serialize};
 use std::path::Path;
 use std::sync::mpsc;
 use std::time::Duration;
@@ -10,18 +9,11 @@ use tauri::{AppHandle, Listener, Runtime};
 use tokio::select;
 use tokio::sync::watch;
 use tokio::time::sleep;
-use ts_rs::TS;
 use yaak_git::{GitWorktreeStatus, git_path_is_ignored, git_repository_paths, git_worktree_status};
+use yaak_rpc_schema::GitWatchResult;

 const GIT_STATUS_COALESCE_WINDOW: Duration = Duration::from_millis(250);

-#[derive(Debug, Clone, Serialize, Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export, export_to = "index.ts")]
-pub(crate) struct GitWatchResult {
-    unlisten_event: String,
-}
-
 pub(crate) async fn watch_git_worktree_status<R, F>(
    app_handle: AppHandle<R>,
    dir: &Path,
@@ -8,7 +8,7 @@ use std::sync::Arc;
 use std::time::Instant;
 use tauri::{AppHandle, Manager, Runtime, WebviewWindow};
 use tokio::sync::watch::Receiver;
-use yaak::send::{SendHttpRequestWithPluginsParams, send_http_request_with_plugins};
+use yaak::send::{ResponseBody, SendHttpRequestWithPluginsParams, send_http_request_with_plugins};
 use yaak_crypto::manager::EncryptionManager;
 use yaak_http::manager::HttpConnectionManager;
 use yaak_models::models::{CookieJar, Environment, HttpRequest, HttpResponse, HttpResponseState};
@@ -62,6 +62,12 @@ impl<R: Runtime> ResponseContext<R> {
    }
 }

+/// What a send produced: the response, and where its body went.
+pub struct SentHttpRequest {
+    pub response: HttpResponse,
+    pub body: ResponseBody,
+}
+
 pub async fn send_http_request<R: Runtime>(
    window: &WebviewWindow<R>,
    unrendered_request: &HttpRequest,
@@ -69,7 +75,7 @@ pub async fn send_http_request<R: Runtime>(
    environment: Option<Environment>,
    cookie_jar: Option<CookieJar>,
    cancelled_rx: &mut Receiver<bool>,
-) -> Result<HttpResponse> {
+) -> Result<SentHttpRequest> {
    send_http_request_with_context(
        window,
        unrendered_request,
@@ -90,7 +96,7 @@ pub async fn send_http_request_with_context<R: Runtime>(
    cookie_jar: Option<CookieJar>,
    cancelled_rx: &Receiver<bool>,
    plugin_context: &PluginContext,
-) -> Result<HttpResponse> {
+) -> Result<SentHttpRequest> {
    let app_handle = window.app_handle().clone();
    let update_source = UpdateSource::from_window_label(window.label());
    let mut response_ctx =
@@ -110,7 +116,7 @@ pub async fn send_http_request_with_context<R: Runtime>(
    .await;

    match result {
-        Ok(response) => Ok(response),
+        Ok(sent) => Ok(sent),
        Err(e) => {
            let error = e.to_string();
            let elapsed = start.elapsed().as_millis() as i32;
@@ -123,7 +129,12 @@ pub async fn send_http_request_with_context<R: Runtime>(
                }
                r.error = Some(error);
            });
-            Ok(response_ctx.response().clone())
+            // The send failed, so whatever body exists is the partial one
+            // already on disk under the response's id.
+            Ok(SentHttpRequest {
+                response: response_ctx.response().clone(),
+                body: ResponseBody::Stored,
+            })
        }
    }
 }
@@ -136,7 +147,7 @@ async fn send_http_request_inner<R: Runtime>(
    cancelled_rx: &Receiver<bool>,
    plugin_context: &PluginContext,
    response_ctx: &mut ResponseContext<R>,
-) -> Result<HttpResponse> {
+) -> Result<SentHttpRequest> {
    let app_handle = window.app_handle().clone();
    let plugin_manager = Arc::new((*app_handle.state::<PluginManager>()).clone());
    let encryption_manager = Arc::new((*app_handle.state::<EncryptionManager>()).clone());
@@ -165,7 +176,7 @@ async fn send_http_request_inner<R: Runtime>(
    .await
    .map_err(|e| GenericError(e.to_string()))?;

-    Ok(result.response)
+    Ok(SentHttpRequest { response: result.response, body: result.response_body })
 }

 pub fn resolve_http_request<R: Runtime>(
@@ -5,6 +5,7 @@ use std::fs::read_to_string;
 use std::io::ErrorKind;
 use tauri::{Manager, Runtime, WebviewWindow};
 use yaak::import::{self, ImportDataParams};
+use yaak_api::{ApiClientKind, yaak_api_client};
 use yaak_core::WorkspaceContext;
 use yaak_models::util::BatchUpsertResult;
 use yaak_plugins::manager::PluginManager;
@@ -13,10 +14,25 @@ use yaak_tauri_utils::window::WorkspaceWindowTrait;
 pub(crate) async fn import_data<R: Runtime>(
    window: &WebviewWindow<R>,
    file_path: &str,
+) -> Result<BatchUpsertResult> {
+    let contents = read_import_file(file_path)?;
+    import_contents(window, &contents).await
+}
+
+pub(crate) async fn import_url<R: Runtime>(
+    window: &WebviewWindow<R>,
+    url: &str,
+) -> Result<BatchUpsertResult> {
+    let contents = fetch_import_url(window, url).await?;
+    import_contents(window, &contents).await
+}
+
+async fn import_contents<R: Runtime>(
+    window: &WebviewWindow<R>,
+    contents: &str,
 ) -> Result<BatchUpsertResult> {
    let plugin_manager = window.state::<PluginManager>();
    let query_manager = window.db_manager();
-    let file = read_import_file(file_path)?;
    let plugin_context = window.plugin_context();
    let workspace_context = WorkspaceContext {
        workspace_id: window.workspace_id(),
@@ -30,11 +46,57 @@ pub(crate) async fn import_data<R: Runtime>(
        plugin_manager: &plugin_manager,
        plugin_context: &plugin_context,
        workspace_context,
-        contents: &file,
+        contents,
    })
    .await?)
 }

+/// Download an importable document (OpenAPI, Postman, Insomnia, …) so it can be fed to the same
+/// pipeline as a file on disk.
+///
+/// This uses Yaak's own API client, which follows the OS proxy but not the workspace's proxy,
+/// client certificate, or certificate-validation settings. Requests are unauthenticated, so
+/// specs behind auth must still be downloaded manually and imported as a file.
+async fn fetch_import_url<R: Runtime>(window: &WebviewWindow<R>, url: &str) -> Result<String> {
+    let url = normalize_import_url(url)?;
+    let app_version = window.app_handle().package_info().version.to_string();
+    let response = yaak_api_client(ApiClientKind::App, &app_version)?
+        .get(&url)
+        // The API client defaults to JSON, but specs are just as often YAML
+        .header("Accept", "*/*")
+        .send()
+        .await
+        .map_err(|err| Error::GenericError(format!("Failed to fetch {url}: {err}")))?;
+
+    let status = response.status();
+    if !status.is_success() {
+        return Err(Error::GenericError(format!("Failed to fetch {url}: responded with {status}")));
+    }
+
+    response
+        .text()
+        .await
+        .map_err(|err| Error::GenericError(format!("Failed to read response from {url}: {err}")))
+}
+
+fn normalize_import_url(url: &str) -> Result<String> {
+    let url = url.trim();
+    if url.is_empty() {
+        return Err(Error::GenericError("Import URL must not be empty".to_string()));
+    }
+
+    if url.starts_with("http://") || url.starts_with("https://") {
+        return Ok(url.to_string());
+    }
+
+    match url.split_once("://") {
+        Some((scheme, _)) => {
+            Err(Error::GenericError(format!("Import URL must be http or https, but got {scheme}")))
+        }
+        None => Ok(format!("https://{url}")),
+    }
+}
+
 fn read_import_file(file_path: &str) -> Result<String> {
    read_to_string(file_path).map_err(|err| {
        if err.kind() == ErrorKind::InvalidData {
@@ -71,4 +133,22 @@ mod tests {

        remove_file(path).expect("remove binary fixture");
    }
+
+    #[test]
+    fn normalize_import_url_defaults_to_https() {
+        assert_eq!(
+            normalize_import_url(" example.com/openapi.yaml ").unwrap(),
+            "https://example.com/openapi.yaml"
+        );
+        assert_eq!(
+            normalize_import_url("http://example.com/openapi.yaml").unwrap(),
+            "http://example.com/openapi.yaml"
+        );
+    }
+
+    #[test]
+    fn normalize_import_url_rejects_other_schemes() {
+        assert!(normalize_import_url("file:///tmp/openapi.yaml").is_err());
+        assert!(normalize_import_url("  ").is_err());
+    }
 }
@@ -4,7 +4,7 @@ use crate::error::Error::GenericError;
 use crate::error::Result;
 use crate::grpc::{build_metadata, metadata_to_map, resolve_grpc_request};
 use crate::http_request::{resolve_http_request, send_http_request};
-use crate::import::import_data;
+use crate::import::{import_data, import_url};
 use crate::models_ext::{BlobManagerExt, QueryManagerExt};
 use crate::notifications::YaakNotifier;
 use crate::render::{render_grpc_request, render_json_value, render_template};
@@ -30,7 +30,7 @@ use tokio::sync::Mutex;
 use tokio::task::block_in_place;
 use tokio::time;
 use yaak::export::{self, ExportDataParams};
-use yaak::responses::{is_response_id, response_body_path};
+use yaak::send::ResponseBody;
 use yaak_common::command::new_checked_command;
 use yaak_crypto::manager::EncryptionManager;
 use yaak_grpc::manager::{GrpcConfig, GrpcHandle};
@@ -56,6 +56,7 @@ use yaak_plugins::events::{
 use yaak_plugins::manager::PluginManager;
 use yaak_plugins::plugin_meta::{PluginMetadata, get_plugin_meta};
 use yaak_plugins::template_callback::PluginTemplateCallback;
+use yaak_rpc_schema::{AppMetaData, EphemeralHttpResponse};
 use yaak_sse::sse::ServerSentEvent;
 use yaak_tauri_utils::window::WorkspaceWindowTrait;
 use yaak_templates::format_json::format_json;
@@ -183,22 +184,6 @@ impl<R: Runtime> PluginContextExt<R> for WebviewWindow<R> {
    }
 }

-#[derive(serde::Serialize, ts_rs::TS)]
-#[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "gen_rpc.ts")]
-pub struct AppMetaData {
-    is_dev: bool,
-    version: String,
-    cli_version: Option<String>,
-    name: String,
-    app_data_dir: String,
-    app_log_dir: String,
-    vendored_plugin_dir: String,
-    default_project_dir: String,
-    feature_updater: bool,
-    feature_license: bool,
-}
-
 async fn cmd_metadata<R: Runtime>(app_handle: AppHandle<R>) -> YaakResult<AppMetaData> {
    let app_data_dir = app_handle.path().app_data_dir()?;
    let app_log_dir = app_handle.path().app_log_dir()?;
@@ -982,13 +967,18 @@ async fn cmd_restart<R: Runtime>(app_handle: AppHandle<R>) -> YaakResult<()> {
    Ok(())
 }

+/// Send without saving anything.
+///
+/// The response never reaches the database, so its body cannot be read back by
+/// id later the way a saved response's can. It comes back here instead, which
+/// is the only copy the caller gets.
 async fn cmd_send_ephemeral_request<R: Runtime>(
    mut request: HttpRequest,
    environment_id: Option<&str>,
    cookie_jar_id: Option<&str>,
    window: WebviewWindow<R>,
    app_handle: AppHandle<R>,
-) -> YaakResult<HttpResponse> {
+) -> YaakResult<EphemeralHttpResponse> {
    let response = HttpResponse::default();
    request.id = "".to_string();
    let environment = match environment_id {
@@ -1007,7 +997,18 @@ async fn cmd_send_ephemeral_request<R: Runtime>(
        }
    });

-    send_http_request(&window, &request, &response, environment, cookie_jar, &mut cancel_rx).await
+    let sent =
+        send_http_request(&window, &request, &response, environment, cookie_jar, &mut cancel_rx)
+            .await?;
+
+    // Blanking the request id above is what makes this send unsaved, so the
+    // engine always hands the body back. Failing loudly beats returning an
+    // empty body that reads as "the server sent nothing".
+    let ResponseBody::Returned(body) = sent.body else {
+        return Err(GenericError("Unsaved response did not return a body".to_string()));
+    };
+
+    Ok(EphemeralHttpResponse { response: sent.response, body })
 }

 async fn cmd_format_json(text: &str) -> YaakResult<String> {
@@ -1025,46 +1026,31 @@ async fn cmd_format_graphql(text: &str) -> YaakResult<String> {
 struct ResponseBodyLocation {
    /// None when the response has no stored body.
    path: Option<PathBuf>,
-    /// The response's declared `Content-Type`, empty when it has none. An
-    /// ephemeral response has no headers to consult, so its body decodes as
-    /// UTF-8.
+    /// The response's declared `Content-Type`, empty when it has none.
    content_type: String,
 }

 /// Find a response's body from its id alone.
 ///
-/// The frontend hands back an id and never a path, so nothing a caller says can
-/// point this at a file the engine didn't write. Persisted responses carry the
-/// path they were written to; ephemeral ones (GraphQL introspection) never
-/// reach the database, but their body still lands at `<response dir>/<id>`,
-/// which is how [`yaak::send`] builds the path in the first place.
+/// The frontend hands back an id and never a path, so the only bodies reachable
+/// here are ones the engine wrote and the database still knows about. A
+/// response that was never saved has no entry, and its body came back from the
+/// send that made it.
 fn locate_response_body<R: Runtime>(
    app_handle: &AppHandle<R>,
    response_id: &str,
 ) -> YaakResult<ResponseBodyLocation> {
-    if !is_response_id(response_id) {
-        return Err(GenericError(format!("Invalid response ID {response_id}")));
-    }
+    let response = app_handle.db().get_http_response(response_id)?;

-    match app_handle.db().get_http_response(response_id) {
-        Ok(response) => Ok(ResponseBodyLocation {
-            path: response.body_path.map(PathBuf::from),
-            content_type: response
-                .headers
-                .iter()
-                .find(|h| h.name.eq_ignore_ascii_case("content-type"))
-                .map(|h| h.value.clone())
-                .unwrap_or_default(),
-        }),
-        Err(yaak_models::error::Error::ModelNotFound(_)) => {
-            let response_dir = app_handle.path().app_data_dir()?.join("responses");
-            Ok(ResponseBodyLocation {
-                path: Some(response_body_path(&response_dir, response_id)),
-                content_type: String::new(),
-            })
-        }
-        Err(e) => Err(e.into()),
-    }
+    Ok(ResponseBodyLocation {
+        path: response.body_path.map(PathBuf::from),
+        content_type: response
+            .headers
+            .iter()
+            .find(|h| h.name.eq_ignore_ascii_case("content-type"))
+            .map(|h| h.value.clone())
+            .unwrap_or_default(),
+    })
 }

 async fn cmd_http_response_body<R: Runtime>(
@@ -1163,6 +1149,13 @@ async fn cmd_import_data<R: Runtime>(
    import_data(&window, file_path).await
 }

+async fn cmd_import_url<R: Runtime>(
+    window: WebviewWindow<R>,
+    url: &str,
+) -> YaakResult<BatchUpsertResult> {
+    import_url(&window, url).await
+}
+
 async fn cmd_http_request_actions<R: Runtime>(
    window: WebviewWindow<R>,
    plugin_manager: State<'_, PluginManager>,
@@ -1547,7 +1540,7 @@ async fn cmd_send_http_request<R: Runtime>(
    )
    .await
    {
-        Ok(r) => r,
+        Ok(sent) => sent.response,
        Err(e) => {
            let resp = app_handle.db().get_http_response(&response.id)?;
            app_handle.db().upsert_http_response(
@@ -314,7 +314,7 @@ async fn handle_host_plugin_request<R: Runtime>(
            .await?;

            Ok(Some(InternalEventPayload::SendHttpRequestResponse(SendHttpRequestResponse {
-                http_response,
+                http_response: http_response.response,
            })))
        }
        HostRequest::OpenWindow(req) => {
@@ -6,11 +6,10 @@ use crate::error::Result;
 use crate::models_ext::{BlobManagerExt, QueryManagerExt};
 use chrono::Utc;
 use log::warn;
-use serde::{Deserialize, Serialize};
 use std::path::Path;
 use tauri::{AppHandle, Listener, Runtime};
 use tokio::sync::watch;
-use ts_rs::TS;
+use yaak_rpc_schema::WatchResult;
 use yaak_sync::error::Error::InvalidSyncDirectory;
 use yaak_sync::sync::{
    FsCandidate, SyncOp, apply_sync_ops, apply_sync_state_ops, compute_sync_ops, get_db_candidates,
@@ -57,13 +56,6 @@ pub(crate) async fn cmd_sync_apply<R: Runtime>(
    Ok(())
 }

-#[derive(Debug, Clone, Serialize, Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export, export_to = "index.ts")]
-pub(crate) struct WatchResult {
-    unlisten_event: String,
-}
-
 pub(crate) async fn sync_watch<R, F>(
    app_handle: AppHandle<R>,
    sync_dir: &Path,
@@ -0,0 +1,18 @@
+[package]
+name = "yaak-rpc-schema"
+version = "0.0.0"
+edition = "2024"
+authors = ["Gregory Schier"]
+publish = false
+
+[dependencies]
+serde = { workspace = true, features = ["derive"] }
+ts-rs = { workspace = true }
+yaak-git = { workspace = true }
+yaak-grpc = { workspace = true }
+yaak-models = { workspace = true }
+yaak-plugins = { workspace = true }
+yaak-sse = { workspace = true }
+yaak-sync = { workspace = true }
+yaak-templates = { workspace = true }
+yaak-ws = { workspace = true }
@@ -0,0 +1,44 @@
+# yaak-rpc-schema
+
+The wire schema for the app's RPC surface: every command name, its request
+payload, and its response type, declared once.
+
+Every host that serves the Yaak UI — the desktop app today, the browser bridge
+and anything after it — imports these types and implements the commands against
+them. That is what keeps a request's shape from drifting between hosts, and it
+is why the TypeScript bindings (`bindings/gen_rpc.ts`, exposed to the frontend
+as `@yaakapp-internal/rpc-schema`) are generated from one place.
+
+Nothing here depends on Tauri or on any host. Request structs are plain data,
+and so are the few response types declared here rather than in an engine crate.
+Command *bodies* live with the host that runs them.
+
+## Adding a command
+
+1. Add its request struct and an entry in `with_commands!` in `src/lib.rs`.
+2. Write the adapter in each host — the desktop's live in
+   `crates-tauri/yaak-app-client/src/rpc_ext.rs`. A host that does not support
+   the command still has to say so; a missing adapter fails to compile.
+3. Regenerate the bindings: `cargo test -p yaak-rpc-schema` writes
+   `bindings/gen_rpc.ts`, which is committed.
+
+## How hosts consume the list
+
+`with_commands!` takes the name of a `macro_rules!` macro and calls it with the
+full `name(Req) -> Res` list. Each host writes a small macro that receives that
+list and builds its router:
+
+```rust
+macro_rules! register_commands {
+    ( $( $name:ident ( $req:ty ) -> $res:ty ),* $(,)? ) => {
+        pub fn build_router() -> RpcRouter<MyCtx> {
+            let mut router = RpcRouter::new();
+            $( router.register(stringify!($name), rpc_handler_async!($name)); )*
+            router
+        }
+    };
+}
+yaak_rpc_schema::with_commands!(register_commands);
+```
+
+The schema decides *what* commands exist; the host decides *how* each one runs.
@@ -0,0 +1,4 @@
+// The RPC wire schema, generated by ts-rs from the Rust declarations in
+// src/lib.rs. `RpcSchema` maps every command name to its (request, response)
+// pair; the app's `rpc()` helper derives its command union from it.
+export * from "./bindings/gen_rpc";
@@ -0,0 +1,6 @@
+{
+  "name": "@yaakapp-internal/rpc-schema",
+  "version": "1.0.0",
+  "private": true,
+  "main": "index.ts"
+}
@@ -4,7 +4,9 @@ use log::{debug, info, warn};
 use reqwest::{Client, ClientBuilder, Proxy, redirect};
 use std::sync::{Arc, Mutex};
 use yaak_models::models::DnsOverride;
-use yaak_tls::{ClientCertificateConfig, get_tls_config, load_client_identity_pkcs12};
+use yaak_tls::{
+    ClientCertificateConfig, NativeClientIdentity, get_tls_config, load_native_client_identity,
+};

 pub const HTTP2_MAX_RESPONSE_HEADER_LIST_SIZE: u32 = 1024 * 1024;

@@ -61,12 +63,19 @@ static IDENTITY_IMPORT: Mutex<()> = Mutex::new(());
 fn build_native_tls_identity(
    client_cert: Option<ClientCertificateConfig>,
 ) -> Result<Option<native_tls::Identity>> {
-    let Some((pkcs12, password)) = load_client_identity_pkcs12(client_cert)? else {
+    let Some(material) = load_native_client_identity(client_cert)? else {
        return Ok(None);
    };

    let _guard = IDENTITY_IMPORT.lock().unwrap_or_else(|e| e.into_inner());
-    Ok(Some(native_tls::Identity::from_pkcs12(&pkcs12, &password)?))
+    Ok(Some(match material {
+        NativeClientIdentity::Pkcs12 { data, password } => {
+            native_tls::Identity::from_pkcs12(&data, &password)?
+        }
+        NativeClientIdentity::Pkcs8 { chain_pem, key_pem } => {
+            native_tls::Identity::from_pkcs8(&chain_pem, &key_pem)?
+        }
+    }))
 }

 #[derive(Clone)]
@@ -593,7 +593,7 @@ impl UpsertModelInfo for WorkspaceMeta {
    }
 }

-#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[derive(Debug, Clone, Serialize, Deserialize, TS, PartialEq)]
 #[ts(export, export_to = "gen_models.ts")]
 pub enum CookieDomain {
    HostOnly(String),
@@ -602,14 +602,14 @@ pub enum CookieDomain {
    Empty,
 }

-#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[derive(Debug, Clone, Serialize, Deserialize, TS, PartialEq)]
 #[ts(export, export_to = "gen_models.ts")]
 pub enum CookieExpires {
    AtUtc(String),
    SessionEnd,
 }

-#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[derive(Debug, Clone, Serialize, Deserialize, TS, PartialEq)]
 #[ts(export, export_to = "gen_models.ts")]
 pub enum CookieSameSite {
    Strict,
@@ -617,7 +617,7 @@ pub enum CookieSameSite {
    None,
 }

-#[derive(Debug, Clone, Serialize, TS)]
+#[derive(Debug, Clone, Serialize, TS, PartialEq)]
 #[serde(rename_all = "camelCase")]
 #[ts(export, export_to = "gen_models.ts")]
 pub struct Cookie {
@@ -1,5 +1,5 @@
 import { platform } from "@yaakapp-internal/platform";
-import type { WatchResult } from "@yaakapp-internal/tauri-client";
+import type { WatchResult } from "@yaakapp-internal/rpc-schema";
 import { SyncOp } from "./bindings/gen_sync";
 import { WatchEvent } from "./bindings/gen_watch";

@@ -7,6 +7,7 @@ publish = false
 [dependencies]
 log = { workspace = true }
 p12 = "0.6.3"
+pem = "3"
 rustls = { workspace = true, default-features = false, features = ["ring"] }
 rustls-pemfile = "2"
 rustls-platform-verifier = { workspace = true }
@@ -18,7 +18,7 @@ pub mod error;
 const OID_RSA_ENCRYPTION: &[u64] = &[1, 2, 840, 113549, 1, 1, 1];
 const OID_EC_PUBLIC_KEY: &[u64] = &[1, 2, 840, 10045, 2, 1];

-/// Password for the PKCS#12 blob [`load_client_identity_pkcs12`] builds from PEM
+/// Password for the PKCS#12 blob [`load_native_client_identity`] builds from PEM
 /// files. The blob never leaves the process, so the value only has to agree with
 /// the caller that immediately re-parses it.
 const IN_MEMORY_PKCS12_PASSWORD: &str = "yaak";
@@ -107,16 +107,33 @@ fn load_client_cert(
    Ok(None)
 }

-/// Load the configured client certificate as PKCS#12 DER, along with the
-/// password needed to open it.
+/// A client identity in one of the encodings a native TLS stack accepts.
+pub enum NativeClientIdentity {
+    /// A PKCS#12 archive, with the password needed to open it.
+    Pkcs12 { data: Vec<u8>, password: String },
+    /// A PEM certificate chain, leaf first, with a PKCS#8 PEM private key.
+    Pkcs8 {
+        chain_pem: Vec<u8>,
+        key_pem: Vec<u8>,
+    },
+}
+
+/// Whether the platform's native TLS stack should be handed PEM material as
+/// PKCS#12 rather than PKCS#8.
 ///
-/// Native TLS stacks accept a client identity as either PKCS#12 or a PKCS#8
-/// PEM, and the PKCS#8 route rejects EC keys on macOS outright. Going through
-/// PKCS#12 keeps the key formats we accept identical to the rustls path, which
-/// reads PKCS#1 and SEC1 keys directly.
-pub fn load_client_identity_pkcs12(
+/// Both encodings lose something. PKCS#8 is rejected for EC keys by Security
+/// Framework on macOS and by SChannel on Windows, which imports keys through an
+/// RSA-only provider. PKCS#12 as the `p12` crate emits it is encrypted with
+/// SHA1/40-bit-RC2 (certificates) and SHA1/3DES (key), and OpenSSL 3 moved RC2
+/// into the legacy provider, so on Linux it fails to decrypt what we just
+/// wrote. Each platform therefore gets the encoding its own stack can read.
+const NATIVE_TLS_WANTS_PKCS12: bool = cfg!(any(target_vendor = "apple", target_os = "windows"));
+
+/// Load the configured client certificate in whichever encoding this platform's
+/// native TLS stack accepts.
+pub fn load_native_client_identity(
    client_cert: Option<ClientCertificateConfig>,
-) -> Result<Option<(Vec<u8>, String)>> {
+) -> Result<Option<NativeClientIdentity>> {
    let config = match client_cert {
        None => return Ok(None),
        Some(c) => c,
@@ -127,7 +144,10 @@ pub fn load_client_identity_pkcs12(
    if let Some(pfx_path) = &config.pfx_file {
        if !pfx_path.is_empty() {
            let data = fs::read(Path::new(pfx_path))?;
-            return Ok(Some((data, config.passphrase.clone().unwrap_or_default())));
+            return Ok(Some(NativeClientIdentity::Pkcs12 {
+                data,
+                password: config.passphrase.clone().unwrap_or_default(),
+            }));
        }
    }

@@ -136,13 +156,35 @@ pub fn load_client_identity_pkcs12(
    };

    let key_der = to_pkcs8_der(&key)?;
+
+    if !NATIVE_TLS_WANTS_PKCS12 {
+        return Ok(Some(to_pkcs8_identity(&certs, &key_der)));
+    }
+
    let (leaf, cas) = certs.split_first().ok_or(GenericError("No certificates found".into()))?;
    let cas: Vec<&[u8]> = cas.iter().map(|c| c.as_ref()).collect();

    let pfx = p12::PFX::new_with_cas(leaf, &key_der, &cas, IN_MEMORY_PKCS12_PASSWORD, "yaak")
        .ok_or(GenericError("Failed to build PKCS#12 from client certificate".into()))?;

-    Ok(Some((pfx.to_der(), IN_MEMORY_PKCS12_PASSWORD.to_string())))
+    Ok(Some(NativeClientIdentity::Pkcs12 {
+        data: pfx.to_der(),
+        password: IN_MEMORY_PKCS12_PASSWORD.to_string(),
+    }))
+}
+
+/// Re-encode a certificate chain and PKCS#8 key as the PEM pair native-tls
+/// expects. It only recognises a key whose first line is the PKCS#8 header, so
+/// the key has to arrive already converted by [`to_pkcs8_der`].
+fn to_pkcs8_identity(certs: &[CertificateDer<'static>], key_der: &[u8]) -> NativeClientIdentity {
+    let config = pem::EncodeConfig::new().set_line_ending(pem::LineEnding::LF);
+    let chain: Vec<pem::Pem> =
+        certs.iter().map(|c| pem::Pem::new("CERTIFICATE", c.as_ref())).collect();
+
+    NativeClientIdentity::Pkcs8 {
+        chain_pem: pem::encode_many_config(&chain, config).into_bytes(),
+        key_pem: pem::encode_config(&pem::Pem::new("PRIVATE KEY", key_der), config).into_bytes(),
+    }
 }

 /// Re-encode a private key as PKCS#8 DER, wrapping PKCS#1 and SEC1 keys.
@@ -379,3 +421,79 @@ pub fn find_client_certificate(

    None
 }
+
+#[cfg(test)]
+mod pkcs8_identity_tests {
+    use super::*;
+
+    const EC_CRT: &str = r#"-----BEGIN CERTIFICATE-----
+MIIBhTCCASugAwIBAgIUB8703dqXCUOJQbhbyaMUMbVFOjwwCgYIKoZIzj0EAwIw
+FzEVMBMGA1UEAwwMeWFhay10ZXN0LWVjMCAXDTI2MDgxNDIwNDYyNFoYDzIxMjYw
+NzIxMjA0NjI0WjAXMRUwEwYDVQQDDAx5YWFrLXRlc3QtZWMwWTATBgcqhkjOPQIB
+BggqhkjOPQMBBwNCAATCYYKhzgHEaRaGsYVjJSoXvoroL8qe1yeEA0VtfxFzMBg+
+bkPQ0nCtMyFfvQQtXWYIakxzsWJyhI8wPjUj6QSo1MwUTAdBgNVHQ4EFgQUKq40
+Hl+2DziVkBVR/tGsPj9FRo0wHwYDVR0jBBgwFoAUKq40Hl+2DziVkBVR/tGsPj9F
+Ro0wDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNIADBFAiEAj1dx5XLl9iCZ
+rD0CW+a3RTluxQ5icXno9WJ9qaS6L08CIFx2t0y9znQr7n5x+SmfXbfZtkDola8e
+8nEZga/HXSeu
+-----END CERTIFICATE-----"#;
+
+    const EC_SEC1_KEY: &str = r#"-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIoiiZ/hb4h6eHkZUVBTQFz7KLrVKJqQtWee2ygOjijNoAoGCCqGSM49
+AwEHoUQDQgAEwmGCoc4BxGkWhrGFYyUqF76K6C/KntcnhANFbX8RczAYPvm5D0NJ
+wrTMhX70ELV1mCGpMc7FicoSPMD41I+kEg==
+-----END EC PRIVATE KEY-----"#;
+
+    const EC_PKCS8_KEY: &str = r#"-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgiiKJn+FviHp4eRlR
+UFNAXPsoutUompC1Z57bKA6OKM2hRANCAATCYYKhzgHEaRaGsYVjJSoXvoroL8qe
+1yeEA0VtfxFzMBg++bkPQ0nCtMyFfvQQtXWYIakxzsWJyhI8wPjUj6QS
+-----END PRIVATE KEY-----"#;
+
+    fn pkcs8_identity(crt: &str, key: &str) -> (Vec<u8>, Vec<u8>) {
+        let certs: Vec<CertificateDer<'static>> =
+            rustls_pemfile::certs(&mut BufReader::new(crt.as_bytes()))
+                .map(|c| c.unwrap())
+                .collect();
+        let key_der = to_pkcs8_der(&load_private_key(key.as_bytes()).unwrap()).unwrap();
+
+        match to_pkcs8_identity(&certs, &key_der) {
+            NativeClientIdentity::Pkcs8 { chain_pem, key_pem } => (chain_pem, key_pem),
+            NativeClientIdentity::Pkcs12 { .. } => unreachable!("asked for PKCS#8"),
+        }
+    }
+
+    /// native-tls matches the PKCS#8 header as a literal prefix and rejects the
+    /// key outright when it does not line up, so pin it on every platform even
+    /// though only the OpenSSL backend is handed this encoding.
+    #[test]
+    fn every_key_format_re_encodes_to_a_pkcs8_pem() {
+        for (name, key) in [("SEC1", EC_SEC1_KEY), ("PKCS#8", EC_PKCS8_KEY)] {
+            let (chain_pem, key_pem) = pkcs8_identity(EC_CRT, key);
+
+            assert!(
+                key_pem.starts_with(b"-----BEGIN PRIVATE KEY-----\n"),
+                "{name} key did not re-encode to a PKCS#8 PEM"
+            );
+
+            let round_tripped: Vec<CertificateDer<'static>> =
+                rustls_pemfile::certs(&mut BufReader::new(chain_pem.as_slice()))
+                    .map(|c| c.unwrap())
+                    .collect();
+            let original: Vec<CertificateDer<'static>> =
+                rustls_pemfile::certs(&mut BufReader::new(EC_CRT.as_bytes()))
+                    .map(|c| c.unwrap())
+                    .collect();
+            assert_eq!(round_tripped, original, "{name} chain did not round-trip");
+        }
+    }
+
+    /// The two on-disk spellings of one EC key have to converge, because only
+    /// the PKCS#8 one survives the re-encode.
+    #[test]
+    fn sec1_and_pkcs8_spellings_of_one_key_agree() {
+        let (_, from_sec1) = pkcs8_identity(EC_CRT, EC_SEC1_KEY);
+        let (_, from_pkcs8) = pkcs8_identity(EC_CRT, EC_PKCS8_KEY);
+        assert_eq!(from_sec1, from_pkcs8);
+    }
+}
@@ -21,3 +21,4 @@ yaak-tls = { workspace = true }

 [dev-dependencies]
 tempfile = "3"
+tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
@@ -4,7 +4,6 @@ pub mod import;
 pub mod models_ops;
 pub mod plugin_events;
 pub mod render;
-pub mod responses;
 pub mod send;

 pub use error::Error;
@@ -1,53 +0,0 @@
-//! Where response bodies live, from a response id alone.
-//!
-//! [`send`](crate::send) writes each body to `<response dir>/<response id>`,
-//! and every reader has to find it again knowing only the id: commands take an
-//! id from the client and never a path, so a path the client chose can never be
-//! opened. [`is_response_id`] is the check that makes joining a client-supplied
-//! id onto the response directory safe.
-
-use std::path::{Path, PathBuf};
-
-/// The file a response's body is written to, and therefore read back from.
-pub fn response_body_path(response_dir: &Path, response_id: &str) -> PathBuf {
-    response_dir.join(response_id)
-}
-
-/// Whether a string is shaped like a response id, and can therefore be joined
-/// onto the response directory without escaping it.
-///
-/// Ids are `rs_<hex>`. Rejecting anything else outright, rather than trying to
-/// sanitize it, is what keeps "read the body of response X" from naming a file
-/// of the caller's choosing: no separators, no `..`, no absolute paths, no
-/// drive letters, no NUL.
-pub fn is_response_id(id: &str) -> bool {
-    !id.is_empty() && id.chars().all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-')
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn accepts_generated_ids() {
-        assert!(is_response_id("rs_A1b2C3d4"));
-        assert!(is_response_id("rs_with-dash"));
-    }
-
-    #[test]
-    fn rejects_anything_that_could_escape_the_directory() {
-        for id in [
-            "",
-            "..",
-            "../../etc/passwd",
-            "rs_1/../../secret",
-            "/etc/passwd",
-            r"C:\Windows\System32",
-            r"rs_1\..\secret",
-            "rs_1.txt",
-            "rs_1\0",
-        ] {
-            assert!(!is_response_id(id), "{id:?} should be rejected");
-        }
-    }
-}
@@ -58,6 +58,7 @@
    "crates-tauri/yaak-fonts",
    "crates-tauri/yaak-license",
    "crates-tauri/yaak-mac-window",
+    "crates/common/yaak-rpc-schema",
    "crates/yaak-crypto",
    "crates/yaak-git",
    "crates/yaak-models",
@@ -1,211 +0,0 @@
-import type { Unsubscribe } from "../types";
-
-/**
- * The wire to the Yaak Bridge: one `POST /rpc` per command, one WebSocket for
- * events in both directions.
- *
- * The hard requirement this file exists to satisfy: the connection is opened
- * asynchronously, but the host that uses it must be constructible
- * *synchronously*. Boot-time modules call commands while the module graph is
- * still evaluating (`lib/appInfo.ts` top-level-awaits one), so there is no
- * later moment to install a host, and a registry that waited for a socket would
- * deadlock. So every call made before the connection opens is queued here and
- * flushed when it does. The app's own top-level await then doubles as the
- * connection gate: nothing renders until the first command has answered, which
- * means it has answered over a live connection.
- */
-
-interface EventFrame {
-  event: string;
-  payload: unknown;
-}
-
-export interface BridgeInfo {
-  name: string;
-  version: string;
-  capabilities: Record<string, boolean>;
-  commands: string[];
-}
-
-/** How long to wait before retrying a dropped connection, and the ceiling. */
-const RECONNECT_BASE_MS = 250;
-const RECONNECT_MAX_MS = 5000;
-
-export class BridgeConnection {
-  readonly baseUrl: string;
-  readonly label: string;
-  /**
-   * Null when the user hasn't supplied one yet. The connection then never
-   * opens, so every call queues forever — which is exactly what the connect
-   * screen wants, and means "waiting for a token" and "waiting for the socket"
-   * are the same code path rather than two.
-   */
-  private readonly token: string | null;
-
-  private socket: WebSocket | null = null;
-  private connected = false;
-  private reconnectDelay = RECONNECT_BASE_MS;
-
-  /** Frames the page tried to send before the socket opened. */
-  private outboundQueue: EventFrame[] = [];
-  /** Resolvers for anything awaiting the first successful connection. */
-  private readyWaiters: Array<() => void> = [];
-  private listeners = new Map<string, Set<(payload: unknown) => void>>();
-
-  info: BridgeInfo | null = null;
-
-  constructor(baseUrl: string, token: string | null, label: string) {
-    this.baseUrl = baseUrl.replace(/\/$/, "");
-    this.token = token;
-    this.label = label;
-    if (token != null) this.openSocket();
-  }
-
-  get hasToken(): boolean {
-    return this.token != null;
-  }
-
-  /** Resolves once the events socket is open. */
-  ready(): Promise<void> {
-    if (this.connected) return Promise.resolve();
-    return new Promise((resolve) => this.readyWaiters.push(resolve));
-  }
-
-  /** A URL on the bridge with the token attached, for the browser to fetch directly. */
-  url(path: string): string {
-    const url = new URL(this.baseUrl + path);
-    url.searchParams.set("token", this.token ?? "");
-    return url.toString();
-  }
-
-  async fetch(path: string, init?: RequestInit): Promise<Response> {
-    const headers = new Headers(init?.headers);
-    headers.set("Authorization", `Bearer ${this.token ?? ""}`);
-    return fetch(this.baseUrl + path, { ...init, headers });
-  }
-
-  async loadInfo(): Promise<BridgeInfo> {
-    const res = await this.fetch("/bridge/info");
-    if (!res.ok) {
-      throw new Error(`Bridge rejected the connection (${res.status}). Is the token correct?`);
-    }
-    this.info = (await res.json()) as BridgeInfo;
-    return this.info;
-  }
-
-  /**
-   * Send a command and await its result.
-   *
-   * Waits for the connection first, so a command issued during module
-   * evaluation queues instead of failing. Errors are carried inside the
-   * envelope and rethrown here, so callers see the backend's own message —
-   * matching what Tauri's `invoke` does with a rejected command.
-   */
-  async rpc<T>(cmd: string, payload: Record<string, unknown> = {}): Promise<T> {
-    await this.ready();
-
-    const res = await this.fetch("/rpc", {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ id: crypto.randomUUID(), cmd, payload }),
-    });
-
-    if (!res.ok) {
-      throw new Error(`Bridge request failed (${res.status})`);
-    }
-
-    const body = (await res.json()) as
-      | { type: "Success"; id: string; payload: T }
-      | { type: "Error"; id: string; error: string };
-
-    if (body.type === "Error") {
-      throw new Error(body.error);
-    }
-    return body.payload;
-  }
-
-  listen(event: string, callback: (payload: unknown) => void): Unsubscribe {
-    let handlers = this.listeners.get(event);
-    if (handlers == null) {
-      handlers = new Set();
-      this.listeners.set(event, handlers);
-    }
-    handlers.add(callback);
-
-    // Synchronous, because callers unsubscribe from React cleanups.
-    return () => {
-      const current = this.listeners.get(event);
-      if (current == null) return;
-      current.delete(callback);
-      if (current.size === 0) this.listeners.delete(event);
-    };
-  }
-
-  emit(event: string, payload: unknown): void {
-    const frame: EventFrame = { event, payload };
-    if (this.socket != null && this.socket.readyState === WebSocket.OPEN) {
-      this.socket.send(JSON.stringify(frame));
-    } else {
-      this.outboundQueue.push(frame);
-    }
-  }
-
-  /** Tell the bridge who and where we are — what a desktop window's URL says. */
-  attach(): void {
-    this.emit("bridge_attach", { label: this.label, url: window.location.href });
-  }
-
-  private openSocket(): void {
-    const wsUrl = new URL(this.baseUrl.replace(/^http/, "ws") + "/events");
-    wsUrl.searchParams.set("token", this.token ?? "");
-
-    const socket = new WebSocket(wsUrl.toString());
-    this.socket = socket;
-
-    socket.onopen = () => {
-      this.connected = true;
-      this.reconnectDelay = RECONNECT_BASE_MS;
-      this.attach();
-
-      for (const frame of this.outboundQueue.splice(0)) {
-        socket.send(JSON.stringify(frame));
-      }
-      for (const resolve of this.readyWaiters.splice(0)) {
-        resolve();
-      }
-    };
-
-    socket.onmessage = (message) => {
-      let frame: EventFrame;
-      try {
-        frame = JSON.parse(String(message.data)) as EventFrame;
-      } catch {
-        console.warn("Bridge sent a malformed event frame");
-        return;
-      }
-      // Deliver the payload directly, not wrapped in Tauri's `{ payload }`.
-      for (const handler of this.listeners.get(frame.event) ?? []) {
-        try {
-          handler(frame.payload);
-        } catch (err) {
-          console.error("Bridge event handler threw", frame.event, err);
-        }
-      }
-    };
-
-    socket.onclose = () => {
-      this.connected = false;
-      this.socket = null;
-      // The server closes the socket when a tab falls too far behind to be
-      // consistent, so a reconnect has to re-read the workspace rather than
-      // resume. `bridge_reconnected` is what tells the app to do that.
-      window.setTimeout(() => this.openSocket(), this.reconnectDelay);
-      this.reconnectDelay = Math.min(this.reconnectDelay * 2, RECONNECT_MAX_MS);
-    };
-
-    socket.onerror = () => {
-      // `onclose` always follows, and it owns the retry.
-      socket.close();
-    };
-  }
-}
@@ -1,297 +0,0 @@
-import type {
-  DragDropEvent,
-  OsType,
-  Platform,
-  PlatformCapabilities,
-  PlatformWindow,
-  RpcPayload,
-  RpcStreamHandle,
-  Unsubscribe,
-} from "../types";
-import { BridgeConnection } from "./connection";
-
-/**
- * The browser host: the Yaak UI in a tab, with the real engine running in the
- * Yaak Bridge next to it.
- *
- * Everything the desktop gets from Tauri comes over one HTTP connection
- * instead. The parts a page genuinely cannot do — a native file dialog, a
- * second window, reading the clipboard unprompted — are not faked. They report
- * false through `capabilities` and throw if called anyway, so a missing feature
- * surfaces as a disabled control rather than a silent no-op.
- */
-
-/**
- * Until the bridge answers, assume nothing works.
- *
- * These are replaced wholesale by the server's own report as soon as
- * `/bridge/info` returns, which happens before the app's first render — the
- * boot sequence top-level-awaits a command, and that command cannot resolve
- * before the connection is up. Starting pessimistic means that if that ordering
- * ever changes, the UI hides a feature it should have shown instead of offering
- * one that will fail.
- */
-const NO_CAPABILITIES: PlatformCapabilities = {
-  grpc: false,
-  websocket: false,
-  git: false,
-  sync: false,
-  tlsOptions: false,
-  cookieJar: false,
-  localFiles: false,
-  timeline: false,
-  multiWindow: false,
-  plugins: false,
-  encryption: false,
-  updater: false,
-  clipboardRead: false,
-  systemFonts: false,
-  license: false,
-};
-
-function unsupported(what: string): Error {
-  return new Error(`${what} is not supported in the browser`);
-}
-
-/** Match `@tauri-apps/plugin-os` spellings so layout code needs no new branch. */
-function detectOsType(): OsType {
-  const platform = navigator.userAgent;
-  if (/Mac|iPhone|iPad|iPod/.test(platform)) return "macos";
-  if (/Win/.test(platform)) return "windows";
-  if (/Android/.test(platform)) return "android";
-  return "linux";
-}
-
-/**
- * The route that serves a response body, keyed by the response id.
- *
- * The bridge resolves the id against its own database, so this is the only
- * thing the page ever has to know about where a body lives.
- */
-function responseBodyRoute(responseId: string): string {
-  return `/responses/${encodeURIComponent(responseId)}/body`;
-}
-
-/**
- * Answer the Tauri host-plugin commands, which ride outside the RPC envelope.
- *
- * `set_title` has a real browser equivalent. `set_theme` paints the native
- * window frame behind the webview, which a tab has no equivalent of and does
- * not need. Everything else is a desktop-only feature; rejecting is correct,
- * and the callers already gate on the matching capability.
- */
-async function handleHostPluginCommand<T>(cmd: string, payload?: RpcPayload): Promise<T> {
-  switch (cmd) {
-    case "plugin:yaak-mac-window|set_title": {
-      const title = payload?.title;
-      document.title = typeof title === "string" ? title : "Yaak";
-      return undefined as T;
-    }
-    case "plugin:yaak-mac-window|set_theme":
-      return undefined as T;
-    default:
-      throw unsupported(`\`${cmd}\``);
-  }
-}
-
-function createWindow(connection: BridgeConnection): PlatformWindow {
-  const noop = async () => {};
-
-  return {
-    label: connection.label,
-
-    // A tab manages its own frame. These exist because the interface names
-    // them; the UI only reaches for them behind `multiWindow`.
-    show: noop,
-    close: noop,
-    minimize: noop,
-    maximize: noop,
-    unmaximize: noop,
-    isMaximized: async () => false,
-    isFullscreen: async () => document.fullscreenElement != null,
-    setZoom: noop,
-
-    // Null means "no opinion, let CSS decide". The desktop returns a real value
-    // because applying a theme forces the window appearance and poisons the
-    // media query; nothing does that here, so `prefers-color-scheme` is the
-    // honest answer and the theme package already falls back to it.
-    theme: async () => null,
-
-    onThemeChanged(callback) {
-      const media = window.matchMedia("(prefers-color-scheme: dark)");
-      const listener = () => callback(media.matches ? "dark" : "light");
-      media.addEventListener("change", listener);
-      return () => media.removeEventListener("change", listener);
-    },
-
-    onFocusChanged(callback) {
-      const onFocus = () => callback(true);
-      const onBlur = () => callback(false);
-      window.addEventListener("focus", onFocus);
-      window.addEventListener("blur", onBlur);
-      return () => {
-        window.removeEventListener("focus", onFocus);
-        window.removeEventListener("blur", onBlur);
-      };
-    },
-
-    // Native drag-and-drop reports OS paths, which a page never sees. The DOM's
-    // own drag events are a different thing and the components that need them
-    // use them directly.
-    onDragDrop(_callback: (event: DragDropEvent) => void): Unsubscribe {
-      return () => {};
-    },
-  };
-}
-
-/**
- * Keep the bridge told where the tab is.
- *
- * The desktop reads the workspace, environment, cookie jar and request straight
- * off the window's URL whenever a plugin asks. The bridge can't, so the tab
- * pushes it on every navigation. The router uses the History API, which fires
- * no event of its own on push, hence the wrapping.
- */
-function trackNavigation(connection: BridgeConnection): void {
-  const report = () => connection.attach();
-
-  for (const method of ["pushState", "replaceState"] as const) {
-    const original = history[method];
-    history[method] = function (this: History, ...args: Parameters<History["pushState"]>) {
-      const result = original.apply(this, args);
-      report();
-      return result;
-    };
-  }
-
-  window.addEventListener("popstate", report);
-  window.addEventListener("hashchange", report);
-}
-
-export function createBridgePlatform(baseUrl: string, token: string | null): Platform {
-  const label = `tab_${crypto.randomUUID().slice(0, 8)}`;
-  const connection = new BridgeConnection(baseUrl, token, label);
-
-  // Mutated in place once the bridge reports, because `platform.capabilities`
-  // hands out this object and callers hold the reference.
-  const capabilities: PlatformCapabilities = { ...NO_CAPABILITIES };
-
-  if (connection.hasToken) {
-    void connection
-      .loadInfo()
-      .then((info) => Object.assign(capabilities, info.capabilities))
-      .catch((err) => console.error("Failed to read bridge capabilities", err));
-  }
-
-  trackNavigation(connection);
-
-  // Two host requests the plugin runtime makes that only a page can carry out.
-  connection.listen("bridge_copy_text", (payload) => {
-    const text = (payload as { text?: string } | null)?.text;
-    if (typeof text === "string") void navigator.clipboard.writeText(text);
-  });
-  connection.listen("bridge_open_url", (payload) => {
-    const url = (payload as { url?: string } | null)?.url;
-    if (typeof url === "string") window.open(url, "_blank", "noopener,noreferrer");
-  });
-
-  const platformWindow = createWindow(connection);
-
-  return {
-    capabilities,
-    window: platformWindow,
-
-    clipboard: {
-      writeText: (text) => navigator.clipboard.writeText(text),
-      // Reading needs a permission prompt the moment the page paints, which is
-      // a bad ask for an app people paste bearer tokens into. `clipboardRead`
-      // is false and the one caller is gated on it.
-      readText: async () => {
-        throw unsupported("Reading the clipboard");
-      },
-      clear: async () => {
-        throw unsupported("Clearing the clipboard");
-      },
-    },
-
-    dialog: {
-      open: (async () => null) as Platform["dialog"]["open"],
-      save: async () => null,
-    },
-
-    files: {
-      readDir: async () => {
-        throw unsupported("Browsing the filesystem");
-      },
-
-      // App resources are served by the page's own origin, so the path the
-      // caller resolved is already a URL a tab can load.
-      url: (path) => path,
-
-      basename: async (path) => path.split(/[/\\]/).pop() ?? path,
-      resolveResource: async (path) => path,
-
-      // The route takes the response id and looks the body up itself, so the
-      // page never names a file — the same reason the desktop asks the backend
-      // for the path instead of building one.
-      async readResponseBody(responseId) {
-        const res = await connection.fetch(responseBodyRoute(responseId));
-        if (res.status === 404) return null;
-        if (!res.ok) {
-          throw new Error(`Failed to read response body (${res.status})`);
-        }
-        return new Uint8Array(await res.arrayBuffer());
-      },
-
-      // The `<img src>`/`<video src>` equivalent of Tauri's `convertFileSrc`.
-      // The token rides in the query because the browser makes these requests
-      // itself and the page cannot add a header to them.
-      responseBodyUrl: async (responseId) => connection.url(responseBodyRoute(responseId)),
-    },
-
-    rpc: <T,>(cmd: string, payload?: RpcPayload): Promise<T> => {
-      // `plugin:`-prefixed commands are Tauri host plugins, not engine
-      // commands, so they never reach the RpcRouter. Two of them are window
-      // chrome the tab can do itself; the rest belong to features this host
-      // reports false for, and saying so beats a confusing "unknown command".
-      if (cmd.startsWith("plugin:")) {
-        return handleHostPluginCommand<T>(cmd, payload);
-      }
-      return connection.rpc<T>(cmd, payload);
-    },
-
-    async rpcStream<T, M>(
-      cmd: string,
-      payload: RpcPayload,
-      onMessage: (message: M) => void,
-    ): Promise<RpcStreamHandle<T>> {
-      // Caller-minted id, subscribed before dispatch, exactly as on the
-      // desktop: the command can emit its first message before it returns.
-      const streamId = crypto.randomUUID();
-      const unlisten = connection.listen(`stream_${streamId}`, (p) => onMessage(p as M));
-      try {
-        const result = await connection.rpc<T>(cmd, { ...payload, streamId });
-        return { result, unlisten };
-      } catch (err) {
-        unlisten();
-        throw err;
-      }
-    },
-
-    listen: <T,>(event: string, callback: (payload: T) => void): Unsubscribe =>
-      connection.listen(event, (payload) => callback(payload as T)),
-
-    emit: async (event, payload) => connection.emit(event, payload),
-
-    openUrl: async (url) => {
-      window.open(url, "_blank", "noopener,noreferrer");
-    },
-
-    revealItemInDir: async () => {
-      throw unsupported("Revealing a file");
-    },
-
-    osType: detectOsType,
-    appIdentifier: async () => "app.yaak.bridge",
-  };
-}
@@ -1,108 +0,0 @@
-/**
- * Deciding which host to install, and getting a bridge token when there isn't
- * one yet.
- *
- * Dev-grade on purpose. The token is a shared secret the bridge prints at
- * startup, passed in the URL and kept for the session. OTP pairing and request
- * encryption replace this whole file; the seam is that nothing outside it knows
- * how the token was obtained.
- */
-
-export interface BridgeConfig {
-  url: string;
-  token: string;
-}
-
-const TOKEN_STORAGE_KEY = "yaak.bridge.token";
-const TOKEN_QUERY_PARAM = "bridgeToken";
-
-declare global {
-  interface Window {
-    __TAURI_INTERNALS__?: unknown;
-  }
-
-  // Declared here rather than by depending on Vite's types: this package is
-  // consumed by a bundler that provides them, and only this one variable.
-  interface ImportMeta {
-    readonly env?: Record<string, string | undefined>;
-  }
-}
-
-function bridgeUrl(): string {
-  // Set when the frontend runs on a Vite dev server and the bridge is on its
-  // own port. When the bridge serves the built app, they share an origin.
-  const configured = import.meta.env?.VITE_YAAK_BRIDGE_URL;
-  return (configured ?? window.location.origin).replace(/\/$/, "");
-}
-
-/**
- * The bridge token, or null if the user hasn't supplied one.
- *
- * A token in the URL is consumed and stashed: leaving it in the address bar
- * means it lands in the router's own history entries and in anything the user
- * copies out of the bar.
- */
-function readToken(): string | null {
-  const url = new URL(window.location.href);
-  const fromQuery = url.searchParams.get(TOKEN_QUERY_PARAM);
-
-  if (fromQuery != null && fromQuery !== "") {
-    sessionStorage.setItem(TOKEN_STORAGE_KEY, fromQuery);
-    url.searchParams.delete(TOKEN_QUERY_PARAM);
-    history.replaceState(null, "", url.toString());
-    return fromQuery;
-  }
-
-  return sessionStorage.getItem(TOKEN_STORAGE_KEY);
-}
-
-/** Whether this build should talk to a bridge at all. */
-export function shouldUseBridge(): boolean {
-  if (typeof window === "undefined") return false;
-  // Running inside the desktop app: Tauri always wins.
-  if (window.__TAURI_INTERNALS__ != null) return false;
-  return true;
-}
-
-export function bridgeConfig(): BridgeConfig | null {
-  const token = readToken();
-  if (token == null) return null;
-  return { url: bridgeUrl(), token };
-}
-
-/**
- * Put the connect form on screen.
- *
- * Synchronous, and it does not stop anything by itself — the caller pairs it
- * with a host that never connects, so the app's own boot-time await is what
- * holds. Submitting reloads with the token in the query, which `readToken`
- * then consumes.
- */
-export function promptForToken(): void {
-  document.body.innerHTML = `
-    <div style="font-family: system-ui, sans-serif; max-width: 26rem; margin: 15vh auto; padding: 0 1.5rem; color: #d5d3e0">
-      <h1 style="font-size: 1.25rem; margin: 0 0 0.5rem">Connect to the Yaak Bridge</h1>
-      <p style="margin: 0 0 1.25rem; line-height: 1.5; color: #9a97ad">
-        Paste the token the bridge printed when it started.
-      </p>
-      <form id="yaak-bridge-connect" style="display: flex; gap: 0.5rem">
-        <input name="token" autofocus autocomplete="off" spellcheck="false" placeholder="Bridge token"
-          style="flex: 1; padding: 0.5rem 0.65rem; border-radius: 0.375rem; border: 1px solid #3b3950; background: #232135; color: inherit; font-family: ui-monospace, monospace" />
-        <button type="submit"
-          style="padding: 0.5rem 1rem; border-radius: 0.375rem; border: 0; background: #6d5ef0; color: white; font-weight: 500; cursor: pointer">
-          Connect
-        </button>
-      </form>
-    </div>
-  `;
-  document.documentElement.style.background = "#1b1a29";
-
-  document.getElementById("yaak-bridge-connect")?.addEventListener("submit", (e) => {
-    e.preventDefault();
-    const token = new FormData(e.target as HTMLFormElement).get("token");
-    if (typeof token !== "string" || token === "") return;
-    const url = new URL(window.location.href);
-    url.searchParams.set(TOKEN_QUERY_PARAM, token);
-    window.location.href = url.toString();
-  });
-}
@@ -1,30 +1,14 @@
-import { createBridgePlatform } from "./bridge";
-import { bridgeConfig, promptForToken, shouldUseBridge } from "./connect";
 import { setPlatform } from "./registry";
 import { createTauriPlatform } from "./tauri";

-// This line is the swap point, and it has to run synchronously: several modules
-// call commands while the module graph is still evaluating, so there is no
-// later moment to install a host in.
+// Desktop is the only host today, so it is installed unconditionally and
+// synchronously — several modules call commands while the module graph is still
+// evaluating, so there is no later moment to do this in.
 //
-// Both hosts are constructible without waiting for anything. The bridge host
-// opens its connection in the background and queues calls made before it lands,
-// which is why picking a host here does not mean blocking on one.
-if (shouldUseBridge()) {
-  const config = bridgeConfig();
-  if (config == null) {
-    // No token yet: put the connect form on screen and install a host that
-    // never connects. Boot then stalls at its own top-level await rather than
-    // failing somewhere that doesn't explain itself — and it stalls in the one
-    // place already designed to wait, which keeps this file synchronous.
-    promptForToken();
-    setPlatform(createBridgePlatform(window.location.origin, null));
-  } else {
-    setPlatform(createBridgePlatform(config.url, config.token));
-  }
-} else {
-  setPlatform(createTauriPlatform());
-}
+// This line is the swap point. A browser build selects its own host here, and
+// because nothing else in the app imports a host directly, that is the whole
+// change.
+setPlatform(createTauriPlatform());

 export * from "./capabilities";
 export { platform, setPlatform } from "./registry";
@@ -49,6 +49,9 @@ export const platform: Platform = {
  get files() {
    return host().files;
  },
+  get blobs() {
+    return host().blobs;
+  },
  rpc: (cmd, payload) => host().rpc(cmd, payload),
  rpcStream: (cmd, payload, onMessage) => host().rpcStream(cmd, payload, onMessage),
  listen: (event, callback) => host().listen(event, callback),
@@ -5,7 +5,7 @@ import { basename, resolveResource } from "@tauri-apps/api/path";
 import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
 import { clear, readText, writeText } from "@tauri-apps/plugin-clipboard-manager";
 import { open, save } from "@tauri-apps/plugin-dialog";
-import { readDir, readFile } from "@tauri-apps/plugin-fs";
+import { readDir, readFile, readTextFile } from "@tauri-apps/plugin-fs";
 import { openUrl, revealItemInDir } from "@tauri-apps/plugin-opener";
 import { type as osType } from "@tauri-apps/plugin-os";
 import type {
@@ -105,14 +105,15 @@ async function rpc<T>(cmd: string, payload?: RpcPayload): Promise<T> {
 }

 /**
- * Where the backend put a response's body, or null if it has none.
+ * Where this host keeps the bytes stored under an id, or null if it has none.
 *
- * The app holds response ids and nothing else; a path exists for exactly as
- * long as it takes this host to open the file, which is the one thing a desktop
- * host can do that a tab cannot.
+ * The desktop stores them as files the engine wrote, so answering means asking
+ * the backend. Callers hold ids and nothing else; the path exists for exactly
+ * as long as it takes to open the file, which is the one thing a desktop host
+ * can do that a tab cannot.
 */
-function responseBodyPath(responseId: string): Promise<string | null> {
-  return rpc<string | null>("cmd_http_response_body_path", { responseId });
+function storedBodyPath(id: string): Promise<string | null> {
+  return rpc<string | null>("cmd_http_response_body_path", { responseId: id });
 }

 export function createTauriPlatform(): Platform {
@@ -136,17 +137,20 @@ export function createTauriPlatform(): Platform {

    files: {
      readDir: (path) => readDir(path),
+      readText: (path) => readTextFile(path),
      url: (path) => convertFileSrc(path),
      basename: (path) => basename(path),
      resolveResource: (path) => resolveResource(path),
+    },

-      async readResponseBody(responseId) {
-        const path = await responseBodyPath(responseId);
+    blobs: {
+      async read(id) {
+        const path = await storedBodyPath(id);
        return path == null ? null : readFile(path);
      },

-      async responseBodyUrl(responseId) {
-        const path = await responseBodyPath(responseId);
+      async url(id) {
+        const path = await storedBodyPath(id);
        return path == null ? null : convertFileSrc(path);
      },
    },
@@ -137,15 +137,19 @@ export interface PlatformDialog {
 * A path here is an opaque handle, not something to parse or construct: the UI
 * only ever passes one back to `url` or `readDir`. A host without a filesystem
 * can mint handles of its own (a blob id, a URL) and stay compatible.
- *
- * Response bodies are addressed by response id instead, because they are the
- * one thing every host stores somewhere different. The desktop reads the file
- * the engine wrote; the bridge fetches it over HTTP. Neither is ever handed a
- * location the page chose.
 */
 export interface PlatformFiles {
  readDir(path: string): Promise<DirEntry[]>;

+  /**
+   * The text of a file the user picked, decoded as UTF-8.
+   *
+   * Only for paths the host itself handed us — a dialog result or a drag-drop
+   * payload — never one the page assembled. A host without a filesystem reads
+   * whatever its own handle points at.
+   */
+  readText(path: string): Promise<string>;
+
  /** A URL the page can load a file from, for `<img>`, `<video>`, and friends. */
  url(path: string): string;

@@ -153,19 +157,31 @@ export interface PlatformFiles {

  /** Resolve a path bundled with the app itself, rather than one from the backend. */
  resolveResource(path: string): Promise<string>;
+}

-  /** The bytes of a stored response body, or null if the response has none. */
-  readResponseBody(responseId: string): Promise<Uint8Array<ArrayBuffer> | null>;
+/**
+ * Content the backend stored, addressed by the id it stored it under.
+ *
+ * Where those bytes actually live is the one thing every host answers
+ * differently — a file the engine wrote, a row in a database, a URL on the
+ * other end of a socket — so finding them is the host's job and nobody else's.
+ * The caller passes an id and never a location, which is also what keeps a page
+ * from naming something the backend never wrote.
+ *
+ * What the content *means* is the app's business, not this package's.
+ */
+export interface PlatformBlobs {
+  /** The bytes, or null if the host has nothing stored under that id. */
+  read(id: string): Promise<Uint8Array<ArrayBuffer> | null>;

  /**
-   * A URL the media viewers can point an element at, or null if the response
-   * has no stored body.
+   * A URL an element can load the content from, for `<img>`, `<video>` and
+   * friends, or null if the host has nothing stored under that id.
   *
-   * Asynchronous because the host may have to ask the backend where the body
-   * is: only the host is allowed to know that, and only the moment before it
-   * opens it.
+   * Asynchronous because the host may have to ask its backend where the bytes
+   * are, and it only does that the moment before it reads them.
   */
-  responseBodyUrl(responseId: string): Promise<string | null>;
+  url(id: string): Promise<string | null>;
 }

 export interface Platform {
@@ -174,6 +190,7 @@ export interface Platform {
  readonly clipboard: PlatformClipboard;
  readonly dialog: PlatformDialog;
  readonly files: PlatformFiles;
+  readonly blobs: PlatformBlobs;

  /** Call a backend command and await its result. */
  rpc<T>(cmd: string, payload?: RpcPayload): Promise<T>;
Author	SHA1	Message	Date
Gregory SchierandGitHub	cdbbef34f8	Fix native TLS client certificates on Linux (#554 )	2026-08-15 11:36:36 -07:00
Gregory Schier GitHub Claude Fable 5	4838353585	Move the RPC wire schema into a Tauri-free crate (#553 ) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>	2026-08-15 11:25:27 -07:00
Gregory SchierandGitHub	93001e3da7	Extract generic model writes into yaak::models_ops (#552 )	2026-08-15 11:01:41 -07:00
VDShelk GitHub Claude Opus 4.7 Gregory Schier	b31c066717	Load GraphQL schema from file for autocomplete (#462 ) Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: Gregory Schier <gschier1990@gmail.com>	2026-08-15 10:14:13 -07:00
Gregory SchierandGitHub	5d1d24870a	Import from a URL in the Import Data dialog (#551 )	2026-08-15 10:03:43 -07:00
Gregory Schier	6f0d0ef275	Don't save response when the file dialog is cancelled	2026-08-15 09:06:07 -07:00
Gregory SchierandGitHub	85a9b2a908	Address response bodies by response id instead of a filesystem path (#550 )	2026-08-15 08:21:23 -07:00
Gregory SchierandGitHub	f3f05502d1	Make the HTTP send path runnable without a database (#545 )	2026-08-15 07:17:17 -07:00
pixel-hawkandGitHub	2e0f7d1818	Add response filter history with pinning (#338 )	2026-08-14 22:44:11 -07:00
Gregory SchierandGitHub	dc793181bb	Add submenuTrigger option for dropdown items (#548 )	2026-08-14 22:40:07 -07:00
Gregory SchierandGitHub	7dfa7e07e3	Own response filter state where the filter runs (#549 )	2026-08-14 22:38:38 -07:00