Address response bodies by response id instead of a filesystem path

The body commands took a path from the client, so a token holder could read any file the process could. They now take a response id and resolve the location themselves, and the UI never sees a path at all: the desktop host asks the backend where the file is, and the bridge fetches /responses/:id/body. Ephemeral responses (GraphQL introspection) never reach the database, so resolution falls back to the path send writes them to.
Add the Yaak Bridge so a browser tab can run the real engine
2026-08-19 09:55:15 +02:00 · 2026-08-14 17:02:05 -07:00 · 2026-08-14 15:17:26 -07:00
212 changed files with 11018 additions and 20392 deletions
@@ -103,18 +103,6 @@ jobs:
        run: |
          sudo apt-get update
          sudo apt-get install -y cmake ninja-build libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev libnss3 patchelf xdg-utils
-          # crates/yaak-web compiles SQLite to wasm via sqlite-wasm-rs, whose C shim
-          # uses C23 [[noreturn]] and expects a freestanding wasm32 target. Ubuntu
-          # 22.04 ships only clang <=15: 14 rejects the attribute, and 15 falls
-          # through to host glibc headers ("bits/libc-header-start.h" not found).
-          # clang-18 handles it (it is what ubuntu-24.04 uses). Install it from
-          # apt.llvm.org since 22.04's repos stop at 15. Only the wasm build uses
-          # this compiler, so the shipped binary keeps 22.04's glibc floor.
-          wget -qO /tmp/llvm.sh https://apt.llvm.org/llvm.sh
-          chmod +x /tmp/llvm.sh
-          sudo /tmp/llvm.sh 18
-          echo "CC_wasm32_unknown_unknown=/usr/bin/clang-18" >> "$GITHUB_ENV"
-          echo "AR_wasm32_unknown_unknown=/usr/bin/llvm-ar-18" >> "$GITHUB_ENV"

      - name: Install Protoc for plugin-runtime
        uses: arduino/setup-protoc@v3
@@ -2,11 +2,9 @@
 resolver = "2"
 members = [
  "crates/yaak",
-  "crates/yaak-commands",
  # 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",
@@ -21,13 +19,14 @@ members = [
  "crates/yaak-templates",
  "crates/yaak-tls",
  "crates/yaak-ws",
-  "crates/yaak-web",
  "crates/yaak-api",
  "crates/yaak-proxy",
  # Proxy-specific crates
  "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",
@@ -66,12 +65,10 @@ 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" }
 yaak = { path = "crates/yaak" }
-yaak-commands = { path = "crates/yaak-commands" }
 yaak-common = { path = "crates/yaak-common" }
 yaak-crypto = { path = "crates/yaak-crypto" }
 yaak-git = { path = "crates/yaak-git" }
@@ -44,25 +44,6 @@ After bootstrapping, start the app in development mode:
 npm start
 ```

-## Run the App in a Browser
-
-The client can also run as a plain web page, with no Tauri and no local process
-behind it. Set `YAAK_TARGET=web` and start the frontend on its own:
-
-```shell
-YAAK_TARGET=web npm run dev --workspace @yaakapp/yaak-client
-```
-
-That flag picks the browser host in `packages/platform/src/web/`, which answers
-commands from an IndexedDB database the page owns instead of from the Rust
-engine. Data persists across reloads and is shared between tabs on the same
-origin. Sending HTTP is not available yet — the Send button reports that and
-everything else about the request is still saved. `packages/platform/src/web/README.md`
-lists which commands the browser host implements and which it declines.
-
-Desktop builds are unaffected: without the flag the platform package installs
-the Tauri host exactly as before.
-
 ## SQLite Migrations

 New migrations can be created from the `src-tauri/` directory:
@@ -1,4 +1,3 @@
-import { platform } from "@yaakapp-internal/platform";
 import type { SettingsTab } from "../components/Settings/Settings";
 import { activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
 import { createFastMutation } from "../hooks/useFastMutation";
@@ -15,19 +14,11 @@ export const openSettings = createFastMutation<void, string, SettingsTabWithSubt
    const workspaceId = jotaiStore.get(activeWorkspaceIdAtom);
    if (workspaceId == null) return;

-    const to = "/workspaces/$workspaceId/settings" as const;
-    const params = { workspaceId };
-    const search = { tab: (tab ?? undefined) as SettingsTab | undefined };
-
-    // Settings is its own window where the host has windows to give. Where it
-    // doesn't — a browser tab — the same route opens in place, which is the
-    // whole difference: it is already a route, not a separate app.
-    if (!platform.capabilities.multiWindow) {
-      await router.navigate({ to, params, search });
-      return;
-    }
-
-    const location = router.buildLocation({ to, params, search });
+    const location = router.buildLocation({
+      to: "/workspaces/$workspaceId/settings",
+      params: { workspaceId },
+      search: { tab: (tab ?? undefined) as SettingsTab | undefined },
+    });

    await rpc("cmd_new_child_window", {
      url: location.href,
@@ -1,4 +1,3 @@
-import { platform } from "@yaakapp-internal/platform";
 import { createFastMutation } from "../hooks/useFastMutation";
 import { getRecentCookieJars } from "../hooks/useRecentCookieJars";
 import { getRecentEnvironments } from "../hooks/useRecentEnvironments";
@@ -25,9 +24,7 @@ export const switchWorkspace = createFastMutation<
      request_id: requestId,
    };

-    // A host without windows opens the workspace here instead. Refusing would
-    // strand the user on the workspace they were trying to leave.
-    if (inNewWindow && platform.capabilities.multiWindow) {
+    if (inNewWindow) {
      const location = router.buildLocation({
        to: "/workspaces/$workspaceId",
        params: { workspaceId },
@@ -410,7 +410,7 @@ function EnsureCompleteResponse({
  Component,
 }: {
  response: HttpResponse;
-  Component: ComponentType<{ bodyUrl: string }>;
+  Component: ComponentType<{ url: 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 bodyUrl={bodyUrl.data} />;
+  return <Component url={bodyUrl.data} />;
 }

 function HttpSvgViewer({ response }: { response: HttpResponse }) {
@@ -1,304 +1,57 @@
-import {
-  type Folder,
-  type ImportDestination,
-  type ImportPlan,
-  modelTypeLabel,
-  type Workspace,
-} from "@yaakapp-internal/models";
-import { HStack, Icon, VStack } from "@yaakapp-internal/ui";
-import { platform } from "@yaakapp-internal/platform";
-import classNames from "classnames";
-import { useEffect, useRef, useState } from "react";
+import { VStack } from "@yaakapp-internal/ui";
+import { useState } from "react";
 import { useLocalStorage } from "react-use";
-import { pluralizeCount } from "../lib/pluralize";
 import { CommercialUseBanner } from "./CommercialUseBanner";
 import { Button } from "./core/Button";
-import { Checkbox } from "./core/Checkbox";
-import { PlainInput } from "./core/PlainInput";
-import { RadioCards } from "./core/RadioCards";
+import { SelectFile } from "./SelectFile";

 interface Props {
-  currentWorkspace: Workspace | null;
-  selectedFolder: Folder | null;
-  planFile: (filePath: string, destination: ImportDestination) => Promise<ImportPlan>;
-  planUrl: (url: string, destination: ImportDestination) => Promise<ImportPlan>;
-  commit: (plan: ImportPlan) => Promise<void>;
-  cancel: () => void;
-  onError: (err: unknown) => void;
+  importData: (filePath: string) => Promise<void>;
 }

-type DestinationChoice = "new_workspace" | "current_workspace";
-
-/**
- * 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({
-  currentWorkspace,
-  selectedFolder,
-  planFile,
-  planUrl,
-  commit,
-  cancel,
-  onError,
-}: Props) {
+export function ImportDataDialog({ importData }: Props) {
  const [isLoading, setIsLoading] = useState<boolean>(false);
-  const [plan, setPlan] = useState<ImportPlan | null>(null);
-  const [destinationChoice, setDestinationChoice] = useState<DestinationChoice>(
-    currentWorkspace == null ? "new_workspace" : "current_workspace",
-  );
-  const [targetSelectedFolder, setTargetSelectedFolder] = useState(selectedFolder != 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 destination = (): ImportDestination => {
-    if (destinationChoice === "current_workspace" && currentWorkspace != null) {
-      return {
-        type: "current_workspace",
-        workspaceId: currentWorkspace.id,
-        folderId: targetSelectedFolder ? selectedFolder?.id : undefined,
-      };
-    }
-    return { type: "new_workspace" };
-  };
-
-  const handlePreview = async () => {
-    setIsLoading(true);
-    try {
-      const nextPlan =
-        filePath != null
-          ? await planFile(filePath, destination())
-          : await planUrl(trimmedSource, destination());
-      setPlan(nextPlan);
-    } catch (err) {
-      onError(err);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const handleCommit = async () => {
-    if (plan == null) return;
-    setIsLoading(true);
-    try {
-      await commit(plan);
-    } catch (err) {
-      onError(err);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  if (plan != null) {
-    const counts = [
-      [plan.resources.workspaces[0]?.resource, plan.resources.workspaces.length],
-      [plan.resources.environments[0]?.resource, plan.resources.environments.length],
-      [plan.resources.folders[0]?.resource, plan.resources.folders.length],
-      [plan.resources.httpRequests[0]?.resource, plan.resources.httpRequests.length],
-      [plan.resources.grpcRequests[0]?.resource, plan.resources.grpcRequests.length],
-      [plan.resources.websocketRequests[0]?.resource, plan.resources.websocketRequests.length],
-    ] as const;
-    const destinationLabel =
-      plan.destination.type === "new_workspace"
-        ? "New workspace"
-        : selectedFolder != null && plan.destination.folderId === selectedFolder.id
-          ? `${currentWorkspace?.name ?? "Current workspace"} / ${selectedFolder.name}`
-          : (currentWorkspace?.name ?? "Current workspace");
-
-    return (
-      <VStack space={4} className="pb-4">
-        <div className="rounded-lg border border-border-subtle divide-y divide-border-subtle">
-          <PreviewRow label="Detected format" value={plan.importer} />
-          <PreviewRow label="Destination" value={destinationLabel} />
-        </div>
-
-        <div>
-          <div className="text-sm font-semibold mb-1">Resources</div>
-          <ul className="list-disc pl-6 text-sm text-text-subtle">
-            {counts.map(([model, count]) =>
-              model == null ? null : (
-                <li key={model.model}>{pluralizeCount(modelTypeLabel(model), count)}</li>
-              ),
-            )}
-          </ul>
-        </div>
-
-        {plan.warnings.length > 0 && (
-          <div>
-            <div className="text-sm font-semibold mb-1">Import details</div>
-            <div className="rounded-lg border border-border-subtle divide-y divide-border-subtle">
-              {plan.warnings.map((warning) => (
-                <div
-                  key={`${warning.title}:${warning.detail}`}
-                  className="flex items-start gap-2.5 px-3 py-2.5"
-                >
-                  <Icon icon="info" color="info" size="sm" className="mt-0.5" />
-                  <div className="min-w-0">
-                    <div className="text-sm font-medium">{warning.title}</div>
-                    <div className="text-xs text-text-subtle mt-0.5">{warning.detail}</div>
-                  </div>
-                </div>
-              ))}
-            </div>
-          </div>
-        )}
-
-        <HStack space={2} justifyContent="end">
-          <Button color="secondary" variant="border" disabled={isLoading} onClick={cancel}>
-            Cancel
-          </Button>
-          <Button color="primary" isLoading={isLoading} onClick={handleCommit}>
-            {isLoading ? "Importing" : "Confirm Import"}
-          </Button>
-        </HStack>
-      </VStack>
-    );
-  }
+  const [filePath, setFilePath] = useLocalStorage<string | null>("importFilePath", null);

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

-      <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>
-
-      <PlainInput
-        label="Or enter a file path or URL"
-        size="sm"
-        placeholder="https://example.com/openapi.json"
-        defaultValue={source ?? ""}
-        forceUpdateKey={String(forceUpdateKey)}
-        onChange={setSource}
-      />
-
+      <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}>
-        <div className="text-sm font-semibold">Import destination</div>
-        <RadioCards
-          name="import-destination"
-          value={destinationChoice}
-          onChange={setDestinationChoice}
-          options={[
-            {
-              value: "new_workspace",
-              label: "New workspace",
-              description: "Create imported resources in a separate workspace.",
-            },
-            ...(currentWorkspace == null
-              ? []
-              : [
-                  {
-                    value: "current_workspace" as const,
-                    label: currentWorkspace.name,
-                    description: "Add resources without changing this workspace's settings.",
-                  },
-                ]),
-          ]}
+        <SelectFile
+          filePath={filePath ?? null}
+          onChange={({ filePath }) => setFilePath(filePath)}
        />
-        {destinationChoice === "current_workspace" && selectedFolder != null && (
-          <Checkbox
-            checked={targetSelectedFolder}
-            title={`Place root resources in selected folder “${selectedFolder.name}”`}
-            onChange={setTargetSelectedFolder}
-          />
+        {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>
        )}
      </VStack>
-
-      <HStack space={2} justifyContent="end">
-        <Button color="secondary" variant="border" disabled={isLoading} onClick={cancel}>
-          Cancel
-        </Button>
-        <Button
-          color="primary"
-          disabled={trimmedSource === "" || isLoading}
-          isLoading={isLoading}
-          onClick={handlePreview}
-        >
-          {isLoading ? "Analyzing" : "Preview Import"}
-        </Button>
-      </HStack>
    </VStack>
  );
 }
-
-function PreviewRow({ label, value }: { label: string; value: string }) {
-  return (
-    <div className="flex items-start justify-between gap-4 px-3 py-2 text-sm">
-      <span className="text-text-subtle">{label}</span>
-      <span className="text-right font-medium">{value}</span>
-    </div>
-  );
-}
@@ -10,13 +10,11 @@ export interface DialogProps {
  children: ReactNode;
  open: boolean;
  onClose?: () => void;
-  /** Block dismissal from the backdrop, Escape key, and built-in close button. */
-  disableClose?: boolean;
+  disableBackdropClose?: boolean;
  title?: ReactNode;
  description?: ReactNode;
  className?: string;
  size?: DialogSize;
-  /** Hide the built-in close button without changing backdrop or Escape behavior. */
  hideX?: boolean;
  noPadding?: boolean;
  noScroll?: boolean;
@@ -29,7 +27,7 @@ export function Dialog({
  size = "full",
  open,
  onClose,
-  disableClose,
+  disableBackdropClose,
  title,
  description,
  hideX,
@@ -44,7 +42,7 @@ export function Dialog({
  );

  return (
-    <Overlay open={open} onClose={disableClose ? undefined : onClose} portalName="dialog">
+    <Overlay open={open} onClose={disableBackdropClose ? undefined : onClose} portalName="dialog">
      <div
        role="dialog"
        className={classNames(
@@ -60,7 +58,7 @@ export function Dialog({
          // NOTE: We handle Escape on the element itself so that it doesn't close multiple
          //   dialogs and can be intercepted by children if needed.
          if (e.key === "Escape") {
-            if (!disableClose) onClose?.();
+            onClose?.();
            e.stopPropagation();
            e.preventDefault();
          }
@@ -112,7 +110,7 @@ export function Dialog({
          </div>

          {/*Put close at the end so that it's the last thing to be tabbed to*/}
-          {!disableClose && !hideX && (
+          {!hideX && (
            <div className="ml-auto absolute right-1 top-1">
              <IconButton
                className="opacity-70 hover:opacity-100"
@@ -36,16 +36,12 @@ 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 = {
@@ -70,12 +66,6 @@ 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"];
 };

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

-        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();
-        }
+        if (!item.keepOpenOnSelect) handleCloseAll();
      },
-      [handleCloseAll, handleClose, isSubmenu, setSelectedIndex],
+      [handleCloseAll, setSelectedIndex],
    );

    useImperativeHandle(ref, () => {
@@ -645,7 +629,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 && item.submenuTrigger !== "button") {
+        if (item.submenu) {
          const parent = document.activeElement as HTMLButtonElement;
          if (parent) {
            setActiveSubmenu({ item, parent, viaKeyboard: true });
@@ -664,11 +648,9 @@ const Menu = forwardRef<Omit<DropdownRef, "open" | "isOpen" | "toggle" | "items"
          clearTimeout(submenuTimeoutRef.current);
        }

-        if (item.submenu && !item.submenuOpenOnClick && item.submenuTrigger !== "button") {
+        if (item.submenu && !item.submenuOpenOnClick) {
          setActiveSubmenu({ item, parent });
-        } 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
+        } else if (activeSubmenu) {
          submenuTimeoutRef.current = window.setTimeout(() => {
            const submenuEl = submenuRef.current;
            if (!submenuEl || !activeSubmenu) {
@@ -794,7 +776,6 @@ 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>
@@ -816,7 +797,6 @@ 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}
@@ -888,7 +868,6 @@ 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;
 }
@@ -900,7 +879,6 @@ function MenuItem({
  onHover,
  item,
  onSelect,
-  onOpenSubmenu,
  isParentOfActiveSubmenu,
  ...props
 }: MenuItemProps) {
@@ -936,22 +914,19 @@ function MenuItem({
    e.currentTarget.focus();
  };

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

-  const rightSlot =
-    item.submenu && !hasButtonSubmenu ? (
-      <Icon icon="chevron_right" color="secondary" />
-    ) : (
-      (item.rightSlot ?? <Hotkey variant="text" action={item.hotKeyAction ?? null} />)
-    );
-
-  const button = (
+  return (
    <Button
      ref={initRef}
      size="sm"
      tabIndex={-1}
-      onMouseEnter={hasButtonSubmenu ? undefined : handleMouseEnter}
-      onMouseLeave={hasButtonSubmenu ? undefined : (e) => e.currentTarget.blur()}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={(e) => e.currentTarget.blur()}
      disabled={item.disabled}
      onFocus={handleFocus}
      onClick={handleClick}
@@ -972,7 +947,6 @@ 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!",
@@ -985,52 +959,6 @@ 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,29 +1,9 @@
 import type { Diagnostic } from "@codemirror/lint";
 import type { EditorView } from "@codemirror/view";
-import { type ParseError, parse, printParseErrorCode } from "jsonc-parser";
+import { parse as jsonLintParse } from "@prantlf/jsonlint";

 const TEMPLATE_SYNTAX_REGEX = /\$\{\[[\s\S]*?]}/g;

-// jsonc-parser reports error codes, so these are the words the editor shows for them
-const MESSAGES: Record<string, string> = {
-  InvalidSymbol: "Invalid symbol",
-  InvalidNumberFormat: "Invalid number format",
-  PropertyNameExpected: "Property name expected",
-  ValueExpected: "Value expected",
-  ColonExpected: "Colon expected",
-  CommaExpected: "Comma expected",
-  CloseBraceExpected: "Closing brace expected",
-  CloseBracketExpected: "Closing bracket expected",
-  EndOfFileExpected: "End of file expected",
-  InvalidCommentToken: "Comments are not allowed",
-  UnexpectedEndOfComment: "Unexpected end of comment",
-  UnexpectedEndOfString: "Unexpected end of string",
-  UnexpectedEndOfNumber: "Unexpected end of number",
-  InvalidUnicode: "Invalid unicode sequence",
-  InvalidEscapeCharacter: "Invalid escape character",
-  InvalidCharacter: "Invalid character",
-};
-
 interface JsonLintOptions {
  allowComments?: boolean;
  allowTrailingCommas?: boolean;
@@ -31,28 +11,34 @@ interface JsonLintOptions {

 export function jsonParseLinter(options?: JsonLintOptions) {
  return (view: EditorView): Diagnostic[] => {
-    const doc = view.state.doc.toString();
-    // We need lint to not break on stuff like {"foo:" ${[ ... ]}} so we'll replace all template
-    // syntax with repeating `1` characters, so it's valid JSON and the position is still correct.
-    const escapedDoc = doc.replace(TEMPLATE_SYNTAX_REGEX, (m) => "1".repeat(m.length));
+    try {
+      const doc = view.state.doc.toString();
+      // We need lint to not break on stuff like {"foo:" ${[ ... ]}} so we'll replace all template
+      // syntax with repeating `1` characters, so it's valid JSON and the position is still correct.
+      const escapedDoc = doc.replace(TEMPLATE_SYNTAX_REGEX, (m) => "1".repeat(m.length));
+      jsonLintParse(escapedDoc, {
+        mode: (options?.allowComments ?? true) ? "cjson" : "json",
+        ignoreTrailingCommas: options?.allowTrailingCommas ?? false,
+      });
+      // oxlint-disable-next-line no-explicit-any
+    } catch (err: any) {
+      if (!("location" in err)) {
+        return [];
+      }

-    const errors: ParseError[] = [];
-    parse(escapedDoc, errors, {
-      allowTrailingComma: options?.allowTrailingCommas ?? false,
-      disallowComments: !(options?.allowComments ?? true),
-    });
-
-    // Later errors are mostly consequences of the first one, so only that one is shown
-    const error = errors[0];
-    if (error == null) return [];
-
-    return [
-      {
-        from: error.offset,
-        to: error.offset + error.length,
-        severity: "error",
-        message: MESSAGES[printParseErrorCode(error.error)] ?? "Invalid JSON",
-      },
-    ];
+      // const line = location?.start?.line;
+      // const column = location?.start?.column;
+      if (err.location.start.offset) {
+        return [
+          {
+            from: err.location.start.offset,
+            to: err.location.start.offset,
+            severity: "error",
+            message: err.message,
+          },
+        ];
+      }
+    }
+    return [];
  };
 }
@@ -1,31 +1,13 @@
 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({
@@ -34,31 +16,15 @@ 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",
@@ -86,8 +86,10 @@ export async function promptDivergedStrategy({
    showDialog({
      id: "git-diverged",
      title: "Branches Diverged",
+      hideX: true,
      size: "sm",
-      disableClose: true,
+      disableBackdropClose: true,
+      onClose: () => resolve("cancel"),
      render: ({ hide }) =>
        DivergedDialog({
          remote,
@@ -1,5 +1,4 @@
 import type { HttpRequest } from "@yaakapp-internal/models";
-import { platform } from "@yaakapp-internal/platform";

 import { useAtom } from "jotai";
 import { useCallback, useEffect, useMemo } from "react";
@@ -12,7 +11,6 @@ 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";
@@ -20,7 +18,6 @@ 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"> & {
@@ -31,10 +28,6 @@ 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.
@@ -45,41 +38,9 @@ function GraphQLEditorInner({ request, onChange, baseRequest, ...extraEditorProp
  const [autoIntrospectDisabled, setAutoIntrospectDisabled] = useLocalStorage<
    Record<string, boolean>
  >("graphQLAutoIntrospectDisabled", {});
-  const {
-    schema,
-    isLoading,
-    error,
-    refetch,
-    clear,
-    loadFromFile,
-    reloadFromFile,
-    removeSchemaFile,
-    filePath,
-  } = useIntrospectGraphQL(baseRequest, {
+  const { schema, isLoading, error, refetch, clear } = 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;
@@ -199,37 +160,14 @@ function GraphQLEditorInner({ request, onChange, baseRequest, ...extraEditorProp
              ...((schema != null
                ? [
                    {
-                      label: "Clear Schema",
+                      label: "Clear",
                      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: (
@@ -272,33 +210,25 @@ function GraphQLEditorInner({ request, onChange, baseRequest, ...extraEditorProp
                type: "content",
              },
              {
-                // 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();
+                hidden: schema == null,
+                label: `${isDocOpen ? "Hide" : "Show"} Documentation`,
+                leftSlot: <Icon icon="book_open_text" />,
+                onSelect: () => {
+                  setGraphqlDocStateAtomValue((v) => ({
+                    ...v,
+                    [request.id]: isDocOpen ? undefined : null,
+                  }));
                },
              },
              {
-                label: filePath == null ? "Load Schema from File…" : "Load a Different File…",
-                leftSlot: <Icon icon="import" />,
-                onSelect: handleLoadFromFile,
+                label: "Introspect Schema",
+                leftSlot: <Icon icon="refresh" spin={isLoading} />,
+                keepOpenOnSelect: true,
+                onSelect: refetch,
              },
+              { type: "separator", label: "Setting" },
              {
-                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",
+                label: "Automatic Introspection",
                keepOpenOnSelect: true,
                onSelect: () => {
                  setAutoIntrospectDisabled({
@@ -331,29 +261,6 @@ 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,
@@ -365,11 +272,6 @@ 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 for the body the host already stored. */
-  bodyUrl?: string;
+  /** A URL the host resolved, for a body it already stored. */
+  url?: string;
  data?: Uint8Array;
  mimeType?: string;
 }

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

  useEffect(() => {
-    if (bodyUrl) {
-      setSrc(bodyUrl);
+    if (url) {
+      setSrc(url);
    } 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({ bodyUrl, data, mimeType }: Props) {
    } else {
      setSrc(undefined);
    }
-  }, [bodyUrl, data, mimeType]);
+  }, [url, data, mimeType]);

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

 function HttpTextViewer({ response, text, language, pretty, className }: HttpTextViewerProps) {
-  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 [currentFilter, setCurrentFilter] = useState<string | null>(null);
+  const filteredBody = useResponseBodyText({ response, filter: currentFilter });
  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={[
@@ -95,12 +98,7 @@ function HttpTextViewer({ response, text, language, pretty, className }: HttpTex
          className="border !border-border-subtle"
        />,
      ]}
-      filter={filter}
-      filterResult={{
-        data: filteredBody.data,
-        isPending: filteredBody.isPending,
-        error: !!filteredBody.error,
-      }}
+      onFilter={filterCallback}
    />
  );
 }
@@ -3,8 +3,8 @@ import { useEffect, useState } from "react";

 type Props = { className?: string; mimeType?: string } & (
  | {
-      /** A URL for the body the host already stored. */
-      bodyUrl: string;
+      /** A URL the host resolved, for a body it already stored. */
+      url: 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 bodyUrl = "bodyUrl" in props ? props.bodyUrl : null;
+  const url = "url" in props ? props.url : null;
  const data = "data" in props ? props.data : null;

  useEffect(() => {
-    if (bodyUrl != null) {
-      setSrc(bodyUrl);
+    if (url != null) {
+      setSrc(url);
    } 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);
    }
-  }, [bodyUrl, data, mimeType]);
+  }, [url, data, mimeType]);

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

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

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

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

@@ -36,8 +36,8 @@ export function PdfViewer({ bodyUrl, 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 (bodyUrl) {
-      return bodyUrl;
+    if (url) {
+      return url;
    }
    if (data) {
      // Create a copy to avoid "Buffer is already detached" errors
@@ -45,7 +45,7 @@ export function PdfViewer({ bodyUrl, data }: Props) {
      return { data: new Uint8Array(data) };
    }
    return undefined;
-  }, [bodyUrl, data]);
+  }, [url, data]);

  const onDocumentLoadSuccess = ({ numPages: nextNumPages }: PDFDocumentProxy): void => {
    setNumPages(nextNumPages);
@@ -1,96 +0,0 @@
-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,15 +1,14 @@
+import classNames from "classnames";
 import type { ReactNode } from "react";
 import { Children, useCallback, useMemo } from "react";
-import { Banner, HStack, Icon, InlineCode } from "@yaakapp-internal/ui";
+import { createGlobalState } from "react-use";
+import { useDebouncedValue } 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];

@@ -17,45 +16,57 @@ interface Props {
  text: string;
  language: EditorProps["language"];
  stateKey: string | null;
+  filterStateKey?: string | null;
  pretty?: boolean;
  className?: string;
  footerActions?: ReactNode;
-  filter?: ResponseFilterApi;
-  filterResult?: {
+  onFilter?: (filter: string) => {
    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,
-  filter,
-  filterResult,
+  onFilter,
 }: Props) {
-  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);
-      }
+  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 }));
    },
-    [filter],
+    [filterKey, setFilterTextMap],
  );

+  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);

@@ -65,8 +76,8 @@ export function TextViewer({
      nodes.push(
        <div key="input" className="w-full opacity-100!">
          <Input
-            key={filter.stateKey ?? "filter"}
-            validate={!resultError}
+            key={filterKey ?? "filter"}
+            validate={!filteredResponse.error}
            hideLabel
            autoFocus
            containerClassName="bg-surface"
@@ -74,62 +85,39 @@ export function TextViewer({
            placeholder={language === "json" ? "JSONPath expression" : "XPath expression"}
            label="Filter expression"
            name="filter"
-            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>
-            }
+            defaultValue={filterText}
+            onKeyDown={(e) => e.key === "Escape" && toggleSearch()}
+            onChange={setFilterText}
+            stateKey={filterKey ? `filter.${filterKey}` : null}
          />
        </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,
-    filter,
-    filterResult?.isPending,
-    resultError,
+    filterKey,
+    filterText,
+    filteredResponse.error,
+    filteredResponse.isPending,
    isSearching,
    language,
-    handleFilterKeyDown,
+    setFilterText,
+    toggleSearch,
  ]);

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

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

  return (
-    <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>
+    <Editor
+      readOnly
+      className={className}
+      defaultValue={body}
+      language={language}
+      actions={actions}
+      extraExtensions={extraExtensions}
+      stateKey={stateKey}
+    />
  );
 }

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

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

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

  useEffect(() => {
-    if (bodyUrl) {
-      setSrc(bodyUrl);
+    if (url) {
+      setSrc(url);
    } 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({ bodyUrl, data, mimeType }: Props) {
    } else {
      setSrc(undefined);
    }
-  }, [bodyUrl, data, mimeType]);
+  }, [url, data, mimeType]);

  // oxlint-disable-next-line jsx-a11y/media-has-caption
  return <video className="w-full" controls src={src} />;
@@ -1,18 +0,0 @@
-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 });
-}
@@ -333,9 +333,7 @@ export function formatHotkeyString(trigger: string): string[] {
      } else if (p === "Alt") {
        labelParts.push("⌥");
      } else if (p === "Enter") {
-        // U+21A9 has an emoji presentation, which Chromium's font fallback picks
-        // (a blue glyph among monochrome ones). U+FE0E forces the text form.
-        labelParts.push("↩︎");
+        labelParts.push("↩");
      } else if (p === "Tab") {
        labelParts.push("⇥");
      } else if (p === "Backspace") {
@@ -1,14 +1,13 @@
 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, useRef, useState } from "react";
-import { tryBuildIntrospectionFromFile } from "../lib/graphqlSchema";
+import { useCallback, useEffect, useMemo, useState } from "react";
 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";

@@ -32,11 +31,6 @@ 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", {
@@ -61,7 +55,7 @@ export function useIntrospectGraphQL(
        bodyType: "application/json",
        body: { text: introspectionRequestBody },
      };
-      const { response, body } = await minPromiseMillis(
+      const response = await minPromiseMillis(
        sendEphemeralRequest(args, activeEnvironment?.id ?? null),
        700,
      );
@@ -70,16 +64,14 @@ export function useIntrospectGraphQL(
        return setError(response.error);
      }

-      // 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));
+      const bodyText = await getResponseBodyText({ response, filter: null });
      if (response.status < 200 || response.status >= 300) {
        return setError(
          `Request failed with status ${response.status}.\nThe response text is:\n\n${bodyText}`,
        );
      }

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

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

-    // 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,
-  ]);
+  }, [baseRequest.id, debouncedRequest.url, debouncedRequest.method, activeEnvironment?.id]);

-  // 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;
@@ -215,17 +113,7 @@ export function useIntrospectGraphQL(
    }
  }, [introspection.data?.content]);

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

 function useIntrospectionResult(request: HttpRequest) {
@@ -1,67 +0,0 @@
-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,25 +2,6 @@ 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,
@@ -30,7 +11,14 @@ export function useResponseBodyText({
 }) {
  return useQuery({
    placeholderData: (prev) => prev, // Keep previous data on refetch
-    ...responseBodyTextQuery({ response, filter }),
+    queryKey: [
+      "response_body_text",
+      response.id,
+      response.updatedAt,
+      response.contentLength,
+      filter ?? "",
+    ],
+    queryFn: () => getResponseBodyText({ response, filter }),
  });
 }

@@ -18,7 +18,6 @@ export function useResponseBodyUrl(response: HttpResponse | null) {
  return useQuery({
    queryKey: ["response_body_url", responseId, response?.updatedAt ?? ""],
    enabled: responseId != null,
-    // A response body is stored under the response's own id
-    queryFn: () => (responseId == null ? null : platform.blobs.url(responseId)),
+    queryFn: () => (responseId == null ? null : platform.files.responseBodyUrl(responseId)),
  });
 }
@@ -1,129 +0,0 @@
-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,10 +25,6 @@ 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: (
@@ -14,8 +14,9 @@ export function showAlert({ id, title, body, size = "sm" }: AlertArgs) {
  showDialog({
    id,
    title,
+    hideX: true,
    size,
-    disableClose: true,
+    disableBackdropClose: true, // Prevent accidental dismisses
    render: ({ hide }) => Alert({ onHide: hide, body }),
  });
 }
@@ -18,8 +18,9 @@ export async function showConfirm({
  return new Promise((onResult: ConfirmProps["onResult"]) => {
    showDialog({
      ...extraProps,
+      hideX: true,
      size,
-      disableClose: true,
+      disableBackdropClose: true, // Prevent accidental dismisses
      render: ({ hide }) => Confirm({ onHide: hide, color, onResult, confirmText, requireTyping }),
    });
  });
@@ -1,85 +0,0 @@
-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/);
-    }
-  });
-});
@@ -1,51 +0,0 @@
-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);
-}
@@ -1,8 +1,7 @@
-import type { BatchUpsertResult, ImportDestination, ImportPlan } from "@yaakapp-internal/models";
+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 { activeFolderAtom } from "../hooks/useActiveFolder";
 import { activeWorkspaceAtom } from "../hooks/useActiveWorkspace";
 import { createFastMutation } from "../hooks/useFastMutation";
 import { showAlert } from "./alert";
@@ -24,50 +23,38 @@ export const importData = createFastMutation({
  },
  mutationFn: async () => {
    return new Promise<void>((resolve, reject) => {
-      const currentWorkspace = jotaiStore.get(activeWorkspaceAtom);
-      const selectedFolder = jotaiStore.get(activeFolderAtom);
      showDialog({
        id: "import",
        title: "Import Data",
        size: "sm",
-        disableClose: true,
        render: ({ hide }) => {
-          const cancel = () => {
-            hide();
-            resolve();
-          };
-          const fail = (err: unknown) => {
-            hide();
-            reject(err);
-          };
-          const commit = async (plan: ImportPlan) => {
-            const imported = await rpc<BatchUpsertResult>("cmd_commit_import", { plan });
-            hide();
-            await finishImport(imported);
-            resolve();
-          };
-          return (
-            <ImportDataDialog
-              currentWorkspace={currentWorkspace}
-              selectedFolder={selectedFolder}
-              planFile={(filePath: string, destination: ImportDestination) =>
-                rpc<ImportPlan>("cmd_import_data", { filePath, destination })
+          const importAndHide = async (filePath: string) => {
+            try {
+              const didImport = await performImport(filePath);
+              if (!didImport) {
+                return;
              }
-              planUrl={(url: string, destination: ImportDestination) =>
-                rpc<ImportPlan>("cmd_import_url", { url, destination })
-              }
-              commit={commit}
-              cancel={cancel}
-              onError={fail}
-            />
-          );
+              resolve();
+            } catch (err) {
+              reject(err);
+            } finally {
+              hide();
+            }
+          };
+          return <ImportDataDialog importData={importAndHide} />;
        },
      });
    });
  },
 });

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

  showDialog({
@@ -116,4 +103,6 @@ async function finishImport(imported: BatchUpsertResult): Promise<void> {
      search: { environment_id: environmentId },
    });
  }
+
+  return true;
 }
@@ -25,8 +25,13 @@ export async function showPromptForm({
      id,
      title,
      description,
+      hideX: true,
      size: size ?? "sm",
-      disableClose: true,
+      disableBackdropClose: true, // Prevent accidental dismisses
+      onClose: () => {
+        // Click backdrop, close, or escape
+        resolve(null);
+      },
      render: ({ hide }) =>
        Prompt({
          onCancel: () => {
@@ -68,8 +68,7 @@ export async function getResponseBodySseSummary(
 export async function getResponseBodyBytes(
  response: HttpResponse,
 ): Promise<Uint8Array<ArrayBuffer> | null> {
-  // A response body is stored under the response's own id
-  return platform.blobs.read(response.id);
+  return platform.files.readResponseBody(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/rpc-schema";
+import type { RpcSchema } from "@yaakapp-internal/tauri-client";

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

 export async function sendEphemeralRequest(
  request: HttpRequest,
  environmentId: string | null,
-): Promise<EphemeralHttpResponse> {
+): Promise<HttpResponse> {
  // Remove some things that we don't want to associate
  const newRequest = { ...request };
  return rpc("cmd_send_ephemeral_request", {
@@ -23,6 +23,7 @@
    "@lezer/highlight": "^1.1.3",
    "@lezer/lr": "^1.3.3",
    "@mjackson/multipart-parser": "^0.10.1",
+    "@prantlf/jsonlint": "^16.0.0",
    "@replit/codemirror-emacs": "^6.1.0",
    "@replit/codemirror-vim": "^6.3.0",
    "@replit/codemirror-vscode-keymap": "^6.0.2",
@@ -53,7 +54,6 @@
    "jotai": "^2.18.0",
    "jotai-family": "^1.0.1",
    "js-md5": "^0.8.3",
-    "jsonc-parser": "^3.3.1",
    "lucide-react": "^0.525.0",
    "mime": "^4.0.4",
    "motion": "^12.4.7",
@@ -93,12 +93,14 @@
    "@yaakapp-internal/theme": "^1.0.0",
    "@yaakapp-internal/ui": "^1.0.0",
    "babel-plugin-react-compiler": "^1.0.0",
+    "decompress": "^4.2.1",
    "internal-ip": "^8.0.0",
    "rollup": "^4.60.3",
-    "vite": "npm:@voidzero-dev/vite-plus-core@^0.2.9",
+    "vite": "npm:@voidzero-dev/vite-plus-core@^0.2.1",
    "vite-plugin-static-copy": "^3.3.0",
    "vite-plugin-svgr": "^4.5.0",
+    "vite-plugin-top-level-await": "^1.5.0",
    "vite-plugin-wasm": "^3.5.0",
-    "vite-plus": "^0.2.9"
+    "vite-plus": "^0.2.1"
  }
 }
@@ -46,9 +46,9 @@ const WorkspacesWorkspaceIdRequestsRequestIdRoute =

 export interface FileRoutesByFullPath {
  '/': typeof IndexRoute
-  '/workspaces/': typeof WorkspacesIndexRoute
+  '/workspaces': typeof WorkspacesIndexRoute
  '/workspaces/$workspaceId/settings': typeof WorkspacesWorkspaceIdSettingsRoute
-  '/workspaces/$workspaceId/': typeof WorkspacesWorkspaceIdIndexRoute
+  '/workspaces/$workspaceId': typeof WorkspacesWorkspaceIdIndexRoute
  '/workspaces/$workspaceId/requests/$requestId': typeof WorkspacesWorkspaceIdRequestsRequestIdRoute
 }
 export interface FileRoutesByTo {
@@ -70,9 +70,9 @@ export interface FileRouteTypes {
  fileRoutesByFullPath: FileRoutesByFullPath
  fullPaths:
    | '/'
-    | '/workspaces/'
+    | '/workspaces'
    | '/workspaces/$workspaceId/settings'
-    | '/workspaces/$workspaceId/'
+    | '/workspaces/$workspaceId'
    | '/workspaces/$workspaceId/requests/$requestId'
  fileRoutesByTo: FileRoutesByTo
  to:
@@ -110,14 +110,14 @@ declare module '@tanstack/react-router' {
    '/workspaces/': {
      id: '/workspaces/'
      path: '/workspaces'
-      fullPath: '/workspaces/'
+      fullPath: '/workspaces'
      preLoaderRoute: typeof WorkspacesIndexRouteImport
      parentRoute: typeof rootRouteImport
    }
    '/workspaces/$workspaceId/': {
      id: '/workspaces/$workspaceId/'
      path: '/workspaces/$workspaceId'
-      fullPath: '/workspaces/$workspaceId/'
+      fullPath: '/workspaces/$workspaceId'
      preLoaderRoute: typeof WorkspacesWorkspaceIdIndexRouteImport
      parentRoute: typeof rootRouteImport
    }
@@ -6,6 +6,7 @@ import path from "node:path";
 import { defineConfig, normalizePath } from "vite-plus";
 import { viteStaticCopy } from "vite-plugin-static-copy";
 import svgr from "vite-plugin-svgr";
+import topLevelAwait from "vite-plugin-top-level-await";
 import wasm from "vite-plugin-wasm";

 const require = createRequire(import.meta.url);
@@ -16,38 +17,9 @@ const standardFontsDir = normalizePath(
  path.join(path.dirname(require.resolve("pdfjs-dist/package.json")), "standard_fonts"),
 );

-/**
- * Which host the platform package installs. `web` builds Yaak to run in a plain
- * browser tab, with its own IndexedDB store instead of the Rust engine; anything
- * else builds the desktop app exactly as before.
- */
-const yaakTarget = process.env.YAAK_TARGET === "web" ? "web" : "desktop";
-
 // https://vitejs.dev/config/
 export default defineConfig(async () => {
  return {
-    resolve: {
-      alias:
-        yaakTarget === "web"
-          ? {
-              // Resolve the platform package to its browser entry, so a web
-              // build never pulls `@tauri-apps/*` into the graph at all. A
-              // build-time branch inside the package would not manage that:
-              // the dead branch folds away, but the imports it guarded stay.
-              "@yaakapp-internal/platform": path.resolve(
-                import.meta.dirname,
-                "../../packages/platform/src/index.web.ts",
-              ),
-            }
-          : {},
-    },
-    // The browser host runs the model layer in a worker; that bundle needs the
-    // same wasm handling as the main one. Top-level await needs no transform
-    // because the build targets esnext.
-    worker: {
-      format: "es" as const,
-      plugins: () => [wasm()],
-    },
    plugins: [
      wasm(),
      tanstackRouter({
@@ -58,6 +30,7 @@ export default defineConfig(async () => {
      }),
      svgr(),
      react(),
+      topLevelAwait(),
      viteStaticCopy({
        targets: [
          { src: cMapsDir, dest: "" },
@@ -31,7 +31,7 @@
    "@vitejs/plugin-react": "^6.0.1",
    "babel-plugin-react-compiler": "^1.0.0",
    "typescript": "^5.8.3",
-    "vite": "npm:@voidzero-dev/vite-plus-core@^0.2.9",
-    "vite-plus": "^0.2.9"
+    "vite": "npm:@voidzero-dev/vite-plus-core@^0.2.1",
+    "vite-plus": "^0.2.1"
  }
 }
@@ -5,7 +5,8 @@ use std::fs;
 use std::io::ErrorKind;
 use yaak::export::{self, ExportDataParams};
 use yaak::import;
-use yaak_models::util::{BatchUpsertResult, ImportDestination};
+use yaak_core::WorkspaceContext;
+use yaak_models::util::BatchUpsertResult;
 use yaak_plugins::events::{ImportResources, PluginContext};

 type CommandResult<T = ()> = std::result::Result<T, String>;
@@ -50,7 +51,6 @@ async fn import(ctx: &CliContext, args: ImportArgs) -> CommandResult<BatchUpsert
        .import_data(&plugin_context, &file_contents)
        .await
        .map_err(|e| format!("Failed to import data: {e}"))?;
-    let importer = import_result.importer;
    let resources = import_result.resources;
    let workspace_id = args.workspace_id;
    if workspace_id.is_none() && resources_need_current_workspace(&resources) {
@@ -59,13 +59,13 @@ async fn import(ctx: &CliContext, args: ImportArgs) -> CommandResult<BatchUpsert
                .to_string(),
        );
    }
-    let destination = match workspace_id {
-        Some(workspace_id) => ImportDestination::CurrentWorkspace { workspace_id, folder_id: None },
-        None => ImportDestination::NewWorkspace,
+    let workspace_context = WorkspaceContext {
+        workspace_id,
+        environment_id: None,
+        cookie_jar_id: None,
+        request_id: None,
    };
-    let plan = import::plan_import_resources(ctx.query_manager(), importer, destination, resources)
-        .map_err(|e| format!("Failed to plan import: {e}"))?;
-    let imported = import::commit_import_plan(ctx.query_manager(), plan)
+    let imported = import::import_resources(ctx.query_manager(), workspace_context, resources)
        .map_err(|e| format!("Failed to import data: {e}"))?;
    Ok(imported)
 }
@@ -181,11 +181,7 @@ async fn dev(args: PluginPathArg) -> CommandResult {
                    ui::info(&format!("Rebuilding plugin {display_path}"));
                }
                WatcherEvent::Event(BundleEvent::BundleEnd(_)) => {
-                    // Assets are staged on every rebuild, so a changed asset or
-                    // declaration is picked up without restarting.
-                    let result = copy_build_assets(&watch_root)
-                        .and_then(|()| generate_plugin_metadata(&watch_root));
-                    match result {
+                    match generate_plugin_metadata(&watch_root) {
                        Ok(()) => ui::success(&format!(
                            "Generated plugin metadata at {}",
                            watch_root.join("build/metadata.json").display()
@@ -412,7 +408,6 @@ struct PublishResponse {

 async fn build_plugin_bundle(plugin_dir: &Path) -> CommandResult<Vec<String>> {
    prepare_build_output_dir(plugin_dir)?;
-    copy_build_assets(plugin_dir)?;
    let mut bundler = Bundler::new(bundler_options(plugin_dir, false))
        .map_err(|err| format!("Failed to initialize Rolldown: {err}"))?;
    let output = bundler.write().await.map_err(|err| format!("Plugin build failed:\n{err}"))?;
@@ -503,63 +498,6 @@ fn prepare_build_output_dir(plugin_dir: &Path) -> CommandResult {
        .map_err(|e| format!("Failed to create build directory {}: {e}", build_dir.display()))
 }

-#[derive(Deserialize, Default)]
-struct PluginManifest {
-    #[serde(default)]
-    yaak: PluginManifestConfig,
-}
-
-#[derive(Deserialize, Default)]
-struct PluginManifestConfig {
-    /// Files to place beside the bundle, as paths relative to the plugin
-    /// directory. Publishing ships everything in `build/`, so these travel with
-    /// the plugin.
-    #[serde(default, rename = "buildAssets")]
-    build_assets: Vec<String>,
-}
-
-/// Copy the plugin's declared assets into `build/`.
-///
-/// This runs after the directory is cleared and before the bundle is written,
-/// because a bundle may read an asset from its own directory at import time and
-/// metadata generation imports the bundle.
-fn copy_build_assets(plugin_dir: &Path) -> CommandResult {
-    let manifest_path = plugin_dir.join("package.json");
-    let manifest: PluginManifest = serde_json::from_str(
-        &fs::read_to_string(&manifest_path)
-            .map_err(|e| format!("Failed to read {}: {e}", manifest_path.display()))?,
-    )
-    .map_err(|e| format!("Failed to parse {}: {e}", manifest_path.display()))?;
-
-    let build_dir = plugin_dir.join("build");
-    let mut names = HashSet::new();
-    for asset in manifest.yaak.build_assets {
-        let src = plugin_dir.join(&asset);
-        let name = src
-            .file_name()
-            .ok_or_else(|| format!("yaak.buildAssets entry is not a file path: {asset}"))?;
-        // A copy that later gets overwritten would pass the build and fail on
-        // load, so anything the build itself writes, or a second asset with
-        // the same name, is rejected up front. Names are compared without
-        // case, because a plugin is installed on case-insensitive filesystems
-        // wherever it was built.
-        let key = name.to_string_lossy().to_lowercase();
-        if key == "index.js" || key == "metadata.json" {
-            return Err(format!("Build asset {asset} would be overwritten by the build output"));
-        }
-        if !names.insert(key) {
-            return Err(format!("Two build assets share the name {}", name.display()));
-        }
-        if !src.is_file() {
-            return Err(format!("Build asset does not exist: {}", src.display()));
-        }
-        fs::copy(&src, build_dir.join(name))
-            .map_err(|e| format!("Failed to copy build asset {}: {e}", src.display()))?;
-    }
-
-    Ok(())
-}
-
 fn bundler_options(plugin_dir: &Path, watch: bool) -> BundlerOptions {
    BundlerOptions {
        input: Some(vec![InputItem { import: "./src/index.ts".to_string(), ..Default::default() }]),
@@ -812,10 +750,7 @@ describe("Example Plugin", () => {

 #[cfg(test)]
 mod tests {
-    use super::{
-        copy_build_assets, create_publish_archive, generate_plugin_metadata,
-        prepare_build_output_dir,
-    };
+    use super::{create_publish_archive, generate_plugin_metadata};
    use serde_json::Value;
    use std::collections::HashSet;
    use std::fs;
@@ -860,100 +795,6 @@ mod tests {
        assert!(!names.contains("ignored/secret.txt"));
    }

-    #[test]
-    fn prepare_build_output_dir_clears_stale_output() {
-        let dir = TempDir::new().expect("temp dir");
-        let root = dir.path();
-        let build = root.join("build");
-        fs::create_dir_all(&build).expect("create build");
-        fs::write(build.join("index.js"), "stale").expect("write index.js");
-        fs::write(build.join("left-behind.js"), "stale").expect("write extra");
-
-        prepare_build_output_dir(root).expect("prepare build dir");
-
-        // Publishing ships everything under build/, so nothing may survive.
-        assert!(build.is_dir());
-        assert_eq!(fs::read_dir(&build).expect("read build").count(), 0);
-    }
-
-    #[test]
-    fn copy_build_assets_places_declared_files_beside_the_bundle() {
-        let dir = TempDir::new().expect("temp dir");
-        let root = dir.path();
-        fs::create_dir_all(root.join("build")).expect("create build");
-        fs::create_dir_all(root.join("vendor")).expect("create vendor");
-        fs::write(root.join("vendor/core_bg.wasm"), "asset").expect("write asset");
-        fs::write(
-            root.join("package.json"),
-            r#"{"yaak":{"buildAssets":["vendor/core_bg.wasm"]}}"#,
-        )
-        .expect("write package.json");
-
-        copy_build_assets(root).expect("copy assets");
-
-        assert_eq!(
-            fs::read_to_string(root.join("build/core_bg.wasm")).expect("read copied asset"),
-            "asset"
-        );
-    }
-
-    #[test]
-    fn copy_build_assets_is_a_noop_without_declarations() {
-        let dir = TempDir::new().expect("temp dir");
-        let root = dir.path();
-        fs::create_dir_all(root.join("build")).expect("create build");
-        fs::write(root.join("package.json"), r#"{"name":"demo"}"#).expect("write package.json");
-
-        copy_build_assets(root).expect("copy assets");
-
-        assert_eq!(fs::read_dir(root.join("build")).expect("read build").count(), 0);
-    }
-
-    #[test]
-    fn copy_build_assets_rejects_names_the_build_writes() {
-        let dir = TempDir::new().expect("temp dir");
-        let root = dir.path();
-        fs::create_dir_all(root.join("build")).expect("create build");
-        fs::write(root.join("index.js"), "asset").expect("write asset");
-        fs::write(root.join("package.json"), r#"{"yaak":{"buildAssets":["index.js"]}}"#)
-            .expect("write package.json");
-
-        let err = copy_build_assets(root).expect_err("reserved name should fail");
-        assert!(err.contains("overwritten by the build output"), "unexpected error: {err}");
-    }
-
-    #[test]
-    fn copy_build_assets_rejects_duplicate_names() {
-        let dir = TempDir::new().expect("temp dir");
-        let root = dir.path();
-        fs::create_dir_all(root.join("build")).expect("create build");
-        fs::create_dir_all(root.join("a")).expect("create a");
-        fs::create_dir_all(root.join("b")).expect("create b");
-        // Differ only by case: one file on macOS and Windows.
-        fs::write(root.join("a/core.wasm"), "one").expect("write a");
-        fs::write(root.join("b/Core.wasm"), "two").expect("write b");
-        fs::write(
-            root.join("package.json"),
-            r#"{"yaak":{"buildAssets":["a/core.wasm","b/Core.wasm"]}}"#,
-        )
-        .expect("write package.json");
-
-        let err = copy_build_assets(root).expect_err("duplicate name should fail");
-        assert!(err.contains("share the name"), "unexpected error: {err}");
-    }
-
-    #[test]
-    fn copy_build_assets_fails_on_a_missing_asset() {
-        let dir = TempDir::new().expect("temp dir");
-        let root = dir.path();
-        fs::create_dir_all(root.join("build")).expect("create build");
-        fs::write(root.join("package.json"), r#"{"yaak":{"buildAssets":["nope.wasm"]}}"#)
-            .expect("write package.json");
-
-        let err = copy_build_assets(root).expect_err("missing asset should fail");
-        assert!(err.contains("Build asset does not exist"), "unexpected error: {err}");
-    }
-
    #[test]
    fn generate_plugin_metadata_detects_api_types() {
        let dir = TempDir::new().expect("temp dir");
@@ -1,7 +1,5 @@
 use crate::context::CliExecutionContext;
 use arboard::Clipboard;
-use base64::Engine;
-use base64::prelude::BASE64_STANDARD;
 use console::Term;
 use inquire::{Confirm, Editor, Password, PasswordDisplayMode, Select, Text};
 use serde_json::Value;
@@ -14,7 +12,6 @@ use yaak::plugin_events::{
    GroupedPluginEvent, HostRequest, SharedPluginEventContext, handle_shared_plugin_event,
 };
 use yaak::render::{render_grpc_request, render_http_request};
-use yaak::response_body::FileResponseBodyStore;
 use yaak::send::{SendHttpRequestWithPluginsParams, send_http_request_with_plugins};
 use yaak_crypto::manager::EncryptionManager;
 use yaak_http::cookies::get_cookie_value_from_jar;
@@ -134,7 +131,6 @@ async fn build_plugin_reply(

    match handle_shared_plugin_event(
        &host_context.query_manager,
-        &FileResponseBodyStore::new(&host_context.query_manager),
        &event.payload,
        SharedPluginEventContext { plugin_name, workspace_id: shared_workspace_id },
    ) {
@@ -227,15 +223,7 @@ async fn build_plugin_reply(
                .await
                {
                    Ok(result) => Some(InternalEventPayload::SendHttpRequestResponse(
-                        SendHttpRequestResponse {
-                            http_response: result.response,
-                            // Nothing saved this body, so the reply is the only
-                            // place the plugin can get it.
-                            body: result
-                                .response_body
-                                .returned_bytes()
-                                .map(|b| BASE64_STANDARD.encode(b)),
-                        },
+                        SendHttpRequestResponse { http_response: result.response },
                    )),
                    Err(err) => Some(InternalEventPayload::ErrorResponse(ErrorResponse {
                        error: format!("Failed to send HTTP request in CLI: {err}"),
@@ -81,21 +81,14 @@ fn import_reads_yaak_workspace_file() {

    let query_manager = query_manager(data_dir);
    let db = query_manager.connect();
-    let workspaces = db.list_workspaces().expect("list imported workspaces");
-    let workspace = workspaces
-        .iter()
-        .find(|workspace| workspace.name == "Imported Workspace")
-        .expect("workspace imported");
-    assert_ne!(workspace.id, "wrk_import");
-
-    let requests = db.list_http_requests(&workspace.id).expect("list imported requests");
-    let request = requests
-        .iter()
-        .find(|request| request.name == "Imported Request")
-        .expect("request imported");
-    assert_ne!(request.id, "req_import");
-    assert_eq!(request.workspace_id, workspace.id);
-    assert_eq!(request.url, "https://example.com");
+    assert_eq!(
+        db.get_workspace("wrk_import").expect("workspace imported").name,
+        "Imported Workspace"
+    );
+    assert_eq!(
+        db.get_http_request("req_import").expect("request imported").url,
+        "https://example.com"
+    );
 }

 fn write_postman_environment_fixture(path: &std::path::Path) {
@@ -10,9 +10,9 @@ chrono = { workspace = true, features = ["serde"] }
 log = { workspace = true }
 include_dir = "0.7"
 r2d2 = "0.8.10"
-r2d2_sqlite = "0.32"
-rusqlite = { version = "0.38", features = ["bundled", "chrono"] }
-sea-query = { version = "1.0", features = ["with-chrono", "attr"] }
+r2d2_sqlite = "0.25.0"
+rusqlite = { version = "0.32.1", features = ["bundled", "chrono"] }
+sea-query = { version = "0.32.1", features = ["with-chrono", "attr"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 ts-rs = { workspace = true, features = ["chrono-impl"] }
@@ -0,0 +1,47 @@
+[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 }
@@ -0,0 +1,94 @@
+# 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.
@@ -0,0 +1,117 @@
+//! 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);
+        }
+    }
+}
@@ -0,0 +1,355 @@
+//! 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"));
+    }
+}
@@ -0,0 +1,121 @@
+//! 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()
+}
@@ -0,0 +1,125 @@
+//! 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
+}
@@ -0,0 +1,582 @@
+//! 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
+}
@@ -0,0 +1,147 @@
+//! 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)"),
+    }
+}
@@ -0,0 +1,140 @@
+//! 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);
+    }
+}
@@ -0,0 +1,244 @@
+//! 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(())
+}
@@ -39,7 +39,7 @@ md5 = "0.8.0"
 notify = "8.0.0"
 pretty_graphql = "0.2"
 r2d2 = "0.8.10"
-r2d2_sqlite = "0.32"
+r2d2_sqlite = "0.25.0"
 mime_guess = "2.0.5"
 rand = "0.9.0"
 reqwest = { workspace = true, features = [
@@ -73,14 +73,12 @@ 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 }
 yaak-tauri-utils = { workspace = true }
 yaak-core = { workspace = true }
 yaak = { workspace = true }
-yaak-commands = { workspace = true }
 yaak-crypto = { workspace = true }
 yaak-fonts = { workspace = true }
 yaak-git = { workspace = true }
@@ -55,7 +55,7 @@ urlParameters: Array<HttpUrlParameter>, settingSendCookies: InheritedBoolSetting

 export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, id?: string, };

-export type HttpResponse = { model: "http_response", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, contentLength: number | null, contentLengthCompressed: number | null, elapsed: number, elapsedHeaders: number, elapsedDns: number, error: string | null, headers: Array<HttpResponseHeader>, remoteAddr: string | null, requestContentLength: number | null, requestHeaders: Array<HttpResponseHeader>, status: number, statusReason: string | null, state: HttpResponseState, url: string, version: string | null, };
+export type HttpResponse = { model: "http_response", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, bodyPath: string | null, contentLength: number | null, contentLengthCompressed: number | null, elapsed: number, elapsedHeaders: number, elapsedDns: number, error: string | null, headers: Array<HttpResponseHeader>, remoteAddr: string | null, requestContentLength: number | null, requestHeaders: Array<HttpResponseHeader>, status: number, statusReason: string | null, state: HttpResponseState, url: string, version: string | null, };

 export type HttpResponseEvent = { model: "http_response_event", id: string, createdAt: string, updatedAt: string, workspaceId: string, responseId: string, event: HttpResponseEventData, };

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Environment, Folder, GrpcRequest, HttpRequest, WebsocketRequest, Workspace } from "./gen_models";
+
+export type BatchUpsertResult = { workspaces: Array<Workspace>, environments: Array<Environment>, folders: Array<Folder>, httpRequests: Array<HttpRequest>, grpcRequests: Array<GrpcRequest>, websocketRequests: Array<WebsocketRequest>, };
@@ -1,5 +1,7 @@
 // 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>, };
@@ -10,6 +12,8 @@ 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. What remains here
-// after the RPC schema moved to @yaakapp-internal/rpc-schema is the
-// desktop-only surface: updater and notification types.
+// 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";
 export * from "./bindings/index";
@@ -0,0 +1,92 @@
+use crate::PluginContextExt;
+use crate::error::Result;
+use std::sync::Arc;
+use tauri::{AppHandle, Manager, Runtime, State, WebviewWindow};
+use yaak_crypto::manager::EncryptionManager;
+use yaak_models::models::HttpRequestHeader;
+use yaak_models::queries::workspaces::default_headers;
+use yaak_plugins::events::GetThemesResponse;
+use yaak_plugins::manager::PluginManager;
+use yaak_plugins::native_template_functions::{
+    decrypt_secure_template_function, encrypt_secure_template_function,
+};
+
+/// Extension trait for accessing the EncryptionManager from Tauri Manager types.
+pub trait EncryptionManagerExt<'a, R> {
+    fn crypto(&'a self) -> State<'a, EncryptionManager>;
+}
+
+impl<'a, R: Runtime, M: Manager<R>> EncryptionManagerExt<'a, R> for M {
+    fn crypto(&'a self) -> State<'a, EncryptionManager> {
+        self.state::<EncryptionManager>()
+    }
+}
+
+pub(crate) async fn cmd_decrypt_template<R: Runtime>(
+    window: WebviewWindow<R>,
+    template: &str,
+) -> Result<String> {
+    let encryption_manager = window.app_handle().state::<EncryptionManager>();
+    let plugin_context = window.plugin_context();
+    Ok(decrypt_secure_template_function(&encryption_manager, &plugin_context, template)?)
+}
+
+pub(crate) async fn cmd_secure_template<R: Runtime>(
+    app_handle: AppHandle<R>,
+    window: WebviewWindow<R>,
+    template: &str,
+) -> Result<String> {
+    let plugin_manager = Arc::new((*app_handle.state::<PluginManager>()).clone());
+    let encryption_manager = Arc::new((*app_handle.state::<EncryptionManager>()).clone());
+    let plugin_context = window.plugin_context();
+    Ok(encrypt_secure_template_function(
+        plugin_manager,
+        encryption_manager,
+        &plugin_context,
+        template,
+    )?)
+}
+
+pub(crate) async fn cmd_get_themes<R: Runtime>(
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+) -> Result<Vec<GetThemesResponse>> {
+    Ok(plugin_manager.get_themes(&window.plugin_context()).await?)
+}
+
+pub(crate) async fn cmd_enable_encryption<R: Runtime>(
+    window: WebviewWindow<R>,
+    workspace_id: &str,
+) -> Result<()> {
+    window.crypto().ensure_workspace_key(workspace_id)?;
+    window.crypto().reveal_workspace_key(workspace_id)?;
+    Ok(())
+}
+
+pub(crate) async fn cmd_reveal_workspace_key<R: Runtime>(
+    window: WebviewWindow<R>,
+    workspace_id: &str,
+) -> Result<String> {
+    Ok(window.crypto().reveal_workspace_key(workspace_id)?)
+}
+
+pub(crate) async fn cmd_set_workspace_key<R: Runtime>(
+    window: WebviewWindow<R>,
+    workspace_id: &str,
+    key: &str,
+) -> Result<()> {
+    window.crypto().set_human_key(workspace_id, key)?;
+    Ok(())
+}
+
+pub(crate) async fn cmd_disable_encryption<R: Runtime>(
+    window: WebviewWindow<R>,
+    workspace_id: &str,
+) -> Result<()> {
+    window.crypto().disable_encryption(workspace_id)?;
+    Ok(())
+}
+
+pub(crate) fn cmd_default_headers() -> Vec<HttpRequestHeader> {
+    default_headers()
+}
@@ -41,9 +41,6 @@ pub enum Error {
    #[error(transparent)]
    YaakError(#[from] yaak::Error),

-    #[error(transparent)]
-    CommandError(#[from] yaak_commands::Error),
-
    #[error(transparent)]
    ClipboardError(#[from] tauri_plugin_clipboard_manager::Error),

@@ -2,6 +2,7 @@ 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;
@@ -9,11 +10,18 @@ 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,
@@ -2,6 +2,7 @@ use std::collections::BTreeMap;

 use crate::PluginContextExt;
 use crate::error::Result;
+use crate::models_ext::QueryManagerExt;
 use KeyAndValueRef::{Ascii, Binary};
 use tauri::{Manager, Runtime, WebviewWindow};
 use yaak_grpc::{KeyAndValueRef, MetadataMap};
@@ -20,6 +21,22 @@ pub(crate) fn metadata_to_map(metadata: MetadataMap) -> BTreeMap<String, String>
    entries
 }

+pub(crate) fn resolve_grpc_request<R: Runtime>(
+    window: &WebviewWindow<R>,
+    request: &GrpcRequest,
+) -> Result<(GrpcRequest, String)> {
+    let mut new_request = request.clone();
+
+    let (authentication_type, authentication, authentication_context_id) =
+        window.db().resolve_auth_for_grpc_request(request)?;
+    new_request.authentication_type = authentication_type;
+    new_request.authentication = authentication;
+
+    let metadata = window.db().resolve_metadata_for_grpc_request(request)?;
+    new_request.metadata = metadata;
+
+    Ok((new_request, authentication_context_id))
+}

 pub(crate) async fn build_metadata<R: Runtime>(
    window: &WebviewWindow<R>,
@@ -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::{ResponseBody, SendHttpRequestWithPluginsParams, send_http_request_with_plugins};
+use yaak::send::{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,12 +62,6 @@ 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,
@@ -75,7 +69,7 @@ pub async fn send_http_request<R: Runtime>(
    environment: Option<Environment>,
    cookie_jar: Option<CookieJar>,
    cancelled_rx: &mut Receiver<bool>,
-) -> Result<SentHttpRequest> {
+) -> Result<HttpResponse> {
    send_http_request_with_context(
        window,
        unrendered_request,
@@ -96,7 +90,7 @@ pub async fn send_http_request_with_context<R: Runtime>(
    cookie_jar: Option<CookieJar>,
    cancelled_rx: &Receiver<bool>,
    plugin_context: &PluginContext,
-) -> Result<SentHttpRequest> {
+) -> Result<HttpResponse> {
    let app_handle = window.app_handle().clone();
    let update_source = UpdateSource::from_window_label(window.label());
    let mut response_ctx =
@@ -116,7 +110,7 @@ pub async fn send_http_request_with_context<R: Runtime>(
    .await;

    match result {
-        Ok(sent) => Ok(sent),
+        Ok(response) => Ok(response),
        Err(e) => {
            let error = e.to_string();
            let elapsed = start.elapsed().as_millis() as i32;
@@ -129,12 +123,7 @@ pub async fn send_http_request_with_context<R: Runtime>(
                }
                r.error = Some(error);
            });
-            // 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,
-            })
+            Ok(response_ctx.response().clone())
        }
    }
 }
@@ -147,7 +136,7 @@ async fn send_http_request_inner<R: Runtime>(
    cancelled_rx: &Receiver<bool>,
    plugin_context: &PluginContext,
    response_ctx: &mut ResponseContext<R>,
-) -> Result<SentHttpRequest> {
+) -> Result<HttpResponse> {
    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());
@@ -176,6 +165,22 @@ async fn send_http_request_inner<R: Runtime>(
    .await
    .map_err(|e| GenericError(e.to_string()))?;

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

+pub fn resolve_http_request<R: Runtime>(
+    window: &WebviewWindow<R>,
+    request: &HttpRequest,
+) -> Result<(HttpRequest, String)> {
+    let mut new_request = request.clone();
+
+    let (authentication_type, authentication, authentication_context_id) =
+        window.db().resolve_auth_for_http_request(request)?;
+    new_request.authentication_type = authentication_type;
+    new_request.authentication = authentication;
+
+    let headers = window.db().resolve_headers_for_http_request(request)?;
+    new_request.headers = headers;
+
+    Ok((new_request, authentication_context_id))
+}
@@ -4,109 +4,37 @@ use crate::models_ext::QueryManagerExt;
 use std::fs::read_to_string;
 use std::io::ErrorKind;
 use tauri::{Manager, Runtime, WebviewWindow};
-use yaak::import::{self, PlanImportDataParams};
-use yaak_api::{ApiClientKind, yaak_api_client};
-use yaak_models::util::{BatchUpsertResult, ImportDestination, ImportPlan};
+use yaak::import::{self, ImportDataParams};
+use yaak_core::WorkspaceContext;
+use yaak_models::util::BatchUpsertResult;
 use yaak_plugins::manager::PluginManager;
+use yaak_tauri_utils::window::WorkspaceWindowTrait;

 pub(crate) async fn import_data<R: Runtime>(
    window: &WebviewWindow<R>,
    file_path: &str,
 ) -> Result<BatchUpsertResult> {
-    let plan = plan_import_data(window, file_path, ImportDestination::NewWorkspace).await?;
-    commit_import(window, plan)
-}
-
-pub(crate) async fn plan_import_data<R: Runtime>(
-    window: &WebviewWindow<R>,
-    file_path: &str,
-    destination: ImportDestination,
-) -> Result<ImportPlan> {
-    let contents = read_import_file(file_path)?;
-    plan_import_contents(window, &contents, destination).await
-}
-
-pub(crate) async fn plan_import_url<R: Runtime>(
-    window: &WebviewWindow<R>,
-    url: &str,
-    destination: ImportDestination,
-) -> Result<ImportPlan> {
-    let contents = fetch_import_url(window, url).await?;
-    plan_import_contents(window, &contents, destination).await
-}
-
-async fn plan_import_contents<R: Runtime>(
-    window: &WebviewWindow<R>,
-    contents: &str,
-    destination: ImportDestination,
-) -> Result<ImportPlan> {
    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(),
+        environment_id: window.environment_id(),
+        cookie_jar_id: window.cookie_jar_id(),
+        request_id: None,
+    };

-    Ok(import::plan_import_data(PlanImportDataParams {
+    Ok(import::import_data(ImportDataParams {
        query_manager: &query_manager,
        plugin_manager: &plugin_manager,
        plugin_context: &plugin_context,
-        destination,
-        contents,
+        workspace_context,
+        contents: &file,
    })
    .await?)
 }

-pub(crate) fn commit_import<R: Runtime>(
-    window: &WebviewWindow<R>,
-    plan: ImportPlan,
-) -> Result<BatchUpsertResult> {
-    Ok(import::commit_import_plan(&window.db_manager(), plan)?)
-}
-
-/// 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 {
@@ -143,22 +71,4 @@ 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());
-    }
 }
@@ -2,18 +2,19 @@ extern crate core;
 use crate::encoding::read_response_body;
 use crate::error::Error::GenericError;
 use crate::error::Result;
-use crate::grpc::{build_metadata, metadata_to_map};
-use crate::http_request::send_http_request;
-use crate::import::{commit_import, plan_import_data, plan_import_url};
+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::models_ext::{BlobManagerExt, QueryManagerExt};
 use crate::notifications::YaakNotifier;
-use crate::render::{render_grpc_request, render_template};
+use crate::render::{render_grpc_request, render_json_value, render_template};
 use crate::updates::{UpdateMode, UpdateTrigger, YaakUpdater};
 use crate::uri_scheme::handle_deep_link;
 use error::Result as YaakResult;
 use eventsource_client::{EventParser, SSE};
 use log::{debug, error, info, warn};
-use std::path::PathBuf;
+use std::collections::HashMap;
+use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::Arc;
 use std::time::Duration;
@@ -28,32 +29,41 @@ use tauri_plugin_log::{Builder, Target, TargetKind, log};
 use tokio::sync::Mutex;
 use tokio::task::block_in_place;
 use tokio::time;
-use yaak::send::ResponseBody;
-use yaak_commands::responses::locate_response_body;
-use yaak_commands::resolve::resolve_grpc_request;
+use yaak::export::{self, ExportDataParams};
+use yaak::responses::{is_response_id, response_body_path};
 use yaak_common::command::new_checked_command;
 use yaak_crypto::manager::EncryptionManager;
 use yaak_grpc::manager::{GrpcConfig, GrpcHandle};
 use yaak_grpc::{Code, ServiceDefinition};
 use yaak_mac_window::AppHandleMacWindowExt;
 use yaak_models::models::{
-    CookieJar, Environment, GrpcConnection, GrpcConnectionState, GrpcEvent,
-    GrpcEventType, HttpRequest, HttpResponse, HttpResponseState, Workspace,
+    AnyModel, CookieJar, Environment, GrpcConnection, GrpcConnectionState, GrpcEvent,
+    GrpcEventType, HttpRequest, HttpResponse, HttpResponseEvent, HttpResponseState, Workspace,
+    WorkspaceMeta,
 };
-use yaak_models::util::{BatchUpsertResult, ImportDestination, ImportPlan, UpdateSource};
+use yaak_models::util::{BatchUpsertResult, UpdateSource};
 use yaak_plugins::events::{
-    Color, ErrorResponse, FilterResponse, InternalEvent, InternalEventPayload, PluginContext,
-    RenderPurpose, ShowToastRequest,
+    CallFolderActionArgs, CallFolderActionRequest, CallGrpcRequestActionArgs,
+    CallGrpcRequestActionRequest, CallHttpRequestActionArgs, CallHttpRequestActionRequest,
+    CallWebsocketRequestActionArgs, CallWebsocketRequestActionRequest, CallWorkspaceActionArgs,
+    CallWorkspaceActionRequest, Color, FilterResponse, GetFolderActionsResponse,
+    GetGrpcRequestActionsResponse, GetHttpAuthenticationConfigResponse,
+    GetHttpAuthenticationSummaryResponse, GetHttpRequestActionsResponse,
+    GetTemplateFunctionConfigResponse, GetTemplateFunctionSummaryResponse,
+    GetWebsocketRequestActionsResponse, GetWorkspaceActionsResponse, InternalEvent,
+    InternalEventPayload, JsonPrimitive, PluginContext, RenderPurpose, ShowToastRequest,
 };
 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;
 use yaak_templates::strip_json_comments::strip_json_comments;
-use yaak_templates::{RenderErrorBehavior, RenderOptions};
+use yaak_templates::{RenderErrorBehavior, RenderOptions, Tokens, transform_args};
 use yaak_tls::find_client_certificate;

+mod commands;
 mod encoding;
 mod error;
 mod feedback;
@@ -173,6 +183,22 @@ 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()?;
@@ -212,6 +238,56 @@ async fn detect_cli_version_for_binary(program: &str) -> Option<String> {
    Some(parts.next().unwrap_or(line).to_string())
 }

+async fn cmd_template_tokens_to_string<R: Runtime>(
+    window: WebviewWindow<R>,
+    app_handle: AppHandle<R>,
+    tokens: Tokens,
+) -> YaakResult<String> {
+    let plugin_manager = Arc::new((*app_handle.state::<PluginManager>()).clone());
+    let encryption_manager = Arc::new((*app_handle.state::<EncryptionManager>()).clone());
+    let cb = PluginTemplateCallback::new(
+        plugin_manager,
+        encryption_manager,
+        &PluginContext::new(Some(window.label().to_string()), window.workspace_id()),
+        RenderPurpose::Preview,
+    );
+    let new_tokens = transform_args(tokens, &cb)?;
+    Ok(new_tokens.to_string())
+}
+
+async fn cmd_render_template<R: Runtime>(
+    window: WebviewWindow<R>,
+    app_handle: AppHandle<R>,
+    template: &str,
+    workspace_id: &str,
+    environment_id: Option<&str>,
+    purpose: Option<RenderPurpose>,
+    ignore_error: Option<bool>,
+) -> YaakResult<String> {
+    let environment_chain =
+        app_handle.db().resolve_environments(workspace_id, None, environment_id)?;
+    let plugin_manager = Arc::new((*app_handle.state::<PluginManager>()).clone());
+    let encryption_manager = Arc::new((*app_handle.state::<EncryptionManager>()).clone());
+    let result = render_template(
+        template,
+        environment_chain,
+        &PluginTemplateCallback::new(
+            plugin_manager,
+            encryption_manager,
+            &PluginContext::new(Some(window.label().to_string()), window.workspace_id()),
+            purpose.unwrap_or(RenderPurpose::Preview),
+        ),
+        &RenderOptions {
+            error_behavior: match ignore_error {
+                Some(true) => RenderErrorBehavior::ReturnEmpty,
+                _ => RenderErrorBehavior::Throw,
+            },
+        },
+    )
+    .await?;
+    Ok(result)
+}
+
 async fn cmd_send_feedback<R: Runtime>(
    app_handle: AppHandle<R>,
    feature: String,
@@ -238,8 +314,7 @@ async fn cmd_grpc_reflect<R: Runtime>(
    grpc_handle: State<'_, Mutex<GrpcHandle>>,
 ) -> YaakResult<Vec<ServiceDefinition>> {
    let unrendered_request = app_handle.db().get_grpc_request(request_id)?;
-    let (resolved_request, auth_context_id) =
-        resolve_grpc_request(&window.db(), &unrendered_request)?;
+    let (resolved_request, auth_context_id) = resolve_grpc_request(&window, &unrendered_request)?;

    let environment_chain = app_handle.db().resolve_environments(
        &unrendered_request.workspace_id,
@@ -299,8 +374,7 @@ async fn cmd_grpc_go<R: Runtime>(
    grpc_handle: State<'_, Mutex<GrpcHandle>>,
 ) -> YaakResult<String> {
    let unrendered_request = app_handle.db().get_grpc_request(request_id)?;
-    let (resolved_request, auth_context_id) =
-        resolve_grpc_request(&window.db(), &unrendered_request)?;
+    let (resolved_request, auth_context_id) = resolve_grpc_request(&window, &unrendered_request)?;
    let environment_chain = app_handle.db().resolve_environments(
        &unrendered_request.workspace_id,
        unrendered_request.folder_id.as_deref(),
@@ -908,18 +982,13 @@ 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<EphemeralHttpResponse> {
+) -> YaakResult<HttpResponse> {
    let response = HttpResponse::default();
    request.id = "".to_string();
    let environment = match environment_id {
@@ -938,18 +1007,11 @@ async fn cmd_send_ephemeral_request<R: Runtime>(
        }
    });

-    let sent =
-        send_http_request(&window, &request, &response, environment, cookie_jar, &mut cancel_rx)
-            .await?;
+    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> {
+    Ok(format_json(text, "  "))
 }

 async fn cmd_format_graphql(text: &str) -> YaakResult<String> {
@@ -959,13 +1021,59 @@ async fn cmd_format_graphql(text: &str) -> YaakResult<String> {
    }
 }

+/// Where a response's body is, and what it is meant to be read as.
+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.
+    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.
+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}")));
+    }
+
+    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()),
+    }
+}
+
 async fn cmd_http_response_body<R: Runtime>(
    window: WebviewWindow<R>,
    plugin_manager: State<'_, PluginManager>,
    response_id: &str,
    filter: Option<&str>,
 ) -> YaakResult<FilterResponse> {
-    let location = locate_response_body(&window.db(), response_id)?;
+    let location = locate_response_body(window.app_handle(), response_id)?;
    let Some(body_path) = location.path else {
        return Ok(FilterResponse { content: String::new(), error: None });
    };
@@ -983,11 +1091,41 @@ async fn cmd_http_response_body<R: Runtime>(
    }
 }

+/// The body's path on this machine, for the desktop host to read or hand to the
+/// webview's asset protocol.
+///
+/// The frontend holds response ids; only `packages/platform`'s Tauri host sees
+/// the path, and only because it is about to open the file itself. Hosts
+/// without a filesystem serve the same bytes over HTTP instead.
+async fn cmd_http_response_body_path<R: Runtime>(
+    app_handle: AppHandle<R>,
+    response_id: &str,
+) -> YaakResult<Option<String>> {
+    let location = locate_response_body(&app_handle, response_id)?;
+    Ok(location.path.map(|p| p.to_string_lossy().to_string()))
+}
+
+async fn cmd_http_request_body<R: Runtime>(
+    app_handle: AppHandle<R>,
+    response_id: &str,
+) -> YaakResult<Option<Vec<u8>>> {
+    let body_id = format!("{}.request", response_id);
+    let chunks = app_handle.blobs().get_chunks(&body_id)?;
+
+    if chunks.is_empty() {
+        return Ok(None);
+    }
+
+    // Concatenate all chunks
+    let body: Vec<u8> = chunks.into_iter().flat_map(|c| c.data).collect();
+    Ok(Some(body))
+}
+
 async fn cmd_get_sse_events<R: Runtime>(
    app_handle: AppHandle<R>,
    response_id: &str,
 ) -> YaakResult<Vec<ServerSentEvent>> {
-    let Some(body_path) = locate_response_body(&app_handle.db(), response_id)?.path else {
+    let Some(body_path) = locate_response_body(&app_handle, response_id)?.path else {
        return Ok(Vec::new());
    };

@@ -1010,42 +1148,314 @@ async fn cmd_get_sse_events<R: Runtime>(
    Ok(events)
 }

+async fn cmd_get_http_response_events<R: Runtime>(
+    app_handle: AppHandle<R>,
+    response_id: &str,
+) -> YaakResult<Vec<HttpResponseEvent>> {
+    let events: Vec<HttpResponseEvent> = app_handle.db().list_http_response_events(response_id)?;
+    Ok(events)
+}
+
 async fn cmd_import_data<R: Runtime>(
    window: WebviewWindow<R>,
    file_path: &str,
-    destination: ImportDestination,
-) -> YaakResult<ImportPlan> {
-    plan_import_data(&window, file_path, destination).await
-}
-
-async fn cmd_import_url<R: Runtime>(
-    window: WebviewWindow<R>,
-    url: &str,
-    destination: ImportDestination,
-) -> YaakResult<ImportPlan> {
-    plan_import_url(&window, url, destination).await
-}
-
-async fn cmd_commit_import<R: Runtime>(
-    window: WebviewWindow<R>,
-    plan: ImportPlan,
 ) -> YaakResult<BatchUpsertResult> {
-    commit_import(&window, plan)
+    import_data(&window, file_path).await
 }

+async fn cmd_http_request_actions<R: Runtime>(
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<Vec<GetHttpRequestActionsResponse>> {
+    Ok(plugin_manager.get_http_request_actions(&window.plugin_context()).await?)
+}

+async fn cmd_websocket_request_actions<R: Runtime>(
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<Vec<GetWebsocketRequestActionsResponse>> {
+    Ok(plugin_manager.get_websocket_request_actions(&window.plugin_context()).await?)
+}

+async fn cmd_call_websocket_request_action<R: Runtime>(
+    window: WebviewWindow<R>,
+    req: CallWebsocketRequestActionRequest,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<()> {
+    let websocket_request = window.db().get_websocket_request(&req.args.websocket_request.id)?;
+    Ok(plugin_manager
+        .call_websocket_request_action(
+            &window.plugin_context(),
+            CallWebsocketRequestActionRequest {
+                args: CallWebsocketRequestActionArgs { websocket_request },
+                ..req
+            },
+        )
+        .await?)
+}

+async fn cmd_workspace_actions<R: Runtime>(
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<Vec<GetWorkspaceActionsResponse>> {
+    Ok(plugin_manager.get_workspace_actions(&window.plugin_context()).await?)
+}

+async fn cmd_call_workspace_action<R: Runtime>(
+    window: WebviewWindow<R>,
+    req: CallWorkspaceActionRequest,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<()> {
+    let workspace = window.db().get_workspace(&req.args.workspace.id)?;
+    Ok(plugin_manager
+        .call_workspace_action(
+            &window.plugin_context(),
+            CallWorkspaceActionRequest { args: CallWorkspaceActionArgs { workspace }, ..req },
+        )
+        .await?)
+}

+async fn cmd_folder_actions<R: Runtime>(
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<Vec<GetFolderActionsResponse>> {
+    Ok(plugin_manager.get_folder_actions(&window.plugin_context()).await?)
+}

+async fn cmd_call_folder_action<R: Runtime>(
+    window: WebviewWindow<R>,
+    req: CallFolderActionRequest,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<()> {
+    let folder = window.db().get_folder(&req.args.folder.id)?;
+    Ok(plugin_manager
+        .call_folder_action(
+            &window.plugin_context(),
+            CallFolderActionRequest { args: CallFolderActionArgs { folder }, ..req },
+        )
+        .await?)
+}

+async fn cmd_grpc_request_actions<R: Runtime>(
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<Vec<GetGrpcRequestActionsResponse>> {
+    Ok(plugin_manager.get_grpc_request_actions(&window.plugin_context()).await?)
+}

+async fn cmd_template_function_summaries<R: Runtime>(
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<Vec<GetTemplateFunctionSummaryResponse>> {
+    let results = plugin_manager.get_template_function_summaries(&window.plugin_context()).await?;
+    Ok(results)
+}

+async fn cmd_template_function_config<R: Runtime>(
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+    function_name: &str,
+    values: HashMap<String, JsonPrimitive>,
+    model: AnyModel,
+    _environment_id: Option<&str>,
+) -> YaakResult<GetTemplateFunctionConfigResponse> {
+    Ok(plugin_manager
+        .get_template_function_config(&window.plugin_context(), function_name, values, model.id())
+        .await?)
+}

+async fn cmd_get_http_authentication_summaries<R: Runtime>(
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<Vec<GetHttpAuthenticationSummaryResponse>> {
+    let results =
+        plugin_manager.get_http_authentication_summaries(&window.plugin_context()).await?;
+    Ok(results.into_iter().map(|(_, a)| a).collect())
+}

+async fn cmd_get_http_authentication_config<R: Runtime>(
+    window: WebviewWindow<R>,
+    app_handle: AppHandle<R>,
+    plugin_manager: State<'_, PluginManager>,
+    encryption_manager: State<'_, EncryptionManager>,
+    auth_name: &str,
+    values: HashMap<String, JsonPrimitive>,
+    model: AnyModel,
+    environment_id: Option<&str>,
+) -> YaakResult<GetHttpAuthenticationConfigResponse> {
+    // Extract workspace_id and folder_id from the model to resolve the environment chain
+    let (workspace_id, folder_id) = match &model {
+        AnyModel::HttpRequest(r) => (r.workspace_id.clone(), r.folder_id.clone()),
+        AnyModel::GrpcRequest(r) => (r.workspace_id.clone(), r.folder_id.clone()),
+        AnyModel::WebsocketRequest(r) => (r.workspace_id.clone(), r.folder_id.clone()),
+        AnyModel::Folder(f) => (f.workspace_id.clone(), f.folder_id.clone()),
+        AnyModel::Workspace(w) => (w.id.clone(), None),
+        _ => return Err(GenericError("Unsupported model type for authentication config".into())),
+    };

+    // Resolve environment chain and render the values for token lookup
+    let environment_chain = app_handle.db().resolve_environments(
+        &workspace_id,
+        folder_id.as_deref(),
+        environment_id,
+    )?;
+    let plugin_manager_arc = Arc::new((*plugin_manager).clone());
+    let encryption_manager_arc = Arc::new((*encryption_manager).clone());
+    let cb = PluginTemplateCallback::new(
+        plugin_manager_arc,
+        encryption_manager_arc,
+        &window.plugin_context(),
+        RenderPurpose::Preview,
+    );

+    // Convert HashMap<String, JsonPrimitive> to serde_json::Value for rendering
+    let values_json: serde_json::Value = serde_json::to_value(&values)?;
+    let rendered_json =
+        render_json_value(values_json, environment_chain, &cb, &RenderOptions::return_empty())
+            .await?;
+
+    // Convert back to HashMap<String, JsonPrimitive>
+    let rendered_values: HashMap<String, JsonPrimitive> = serde_json::from_value(rendered_json)?;
+
+    Ok(plugin_manager
+        .get_http_authentication_config(
+            &window.plugin_context(),
+            auth_name,
+            rendered_values,
+            model.id(),
+        )
+        .await?)
+}
+
+async fn cmd_call_http_request_action<R: Runtime>(
+    window: WebviewWindow<R>,
+    req: CallHttpRequestActionRequest,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<()> {
+    Ok(plugin_manager
+        .call_http_request_action(
+            &window.plugin_context(),
+            CallHttpRequestActionRequest {
+                args: CallHttpRequestActionArgs {
+                    http_request: resolve_http_request(&window, &req.args.http_request)?.0,
+                    ..req.args
+                },
+                ..req
+            },
+        )
+        .await?)
+}
+
+async fn cmd_call_grpc_request_action<R: Runtime>(
+    window: WebviewWindow<R>,
+    req: CallGrpcRequestActionRequest,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<()> {
+    Ok(plugin_manager
+        .call_grpc_request_action(
+            &window.plugin_context(),
+            CallGrpcRequestActionRequest {
+                args: CallGrpcRequestActionArgs {
+                    grpc_request: resolve_grpc_request(&window, &req.args.grpc_request)?.0,
+                    ..req.args
+                },
+                ..req
+            },
+        )
+        .await?)
+}
+
+async fn cmd_call_http_authentication_action<R: Runtime>(
+    window: WebviewWindow<R>,
+    app_handle: AppHandle<R>,
+    plugin_manager: State<'_, PluginManager>,
+    encryption_manager: State<'_, EncryptionManager>,
+    auth_name: &str,
+    action_index: i32,
+    values: HashMap<String, JsonPrimitive>,
+    model: AnyModel,
+    environment_id: Option<&str>,
+) -> YaakResult<()> {
+    // Extract workspace_id and folder_id from the model to resolve the environment chain
+    let (workspace_id, folder_id) = match &model {
+        AnyModel::HttpRequest(r) => (r.workspace_id.clone(), r.folder_id.clone()),
+        AnyModel::GrpcRequest(r) => (r.workspace_id.clone(), r.folder_id.clone()),
+        AnyModel::WebsocketRequest(r) => (r.workspace_id.clone(), r.folder_id.clone()),
+        AnyModel::Folder(f) => (f.workspace_id.clone(), f.folder_id.clone()),
+        AnyModel::Workspace(w) => (w.id.clone(), None),
+        _ => return Err(GenericError("Unsupported model type for authentication action".into())),
+    };
+
+    // Resolve environment chain and render the values
+    let environment_chain = app_handle.db().resolve_environments(
+        &workspace_id,
+        folder_id.as_deref(),
+        environment_id,
+    )?;
+    let plugin_manager_arc = Arc::new((*plugin_manager).clone());
+    let encryption_manager_arc = Arc::new((*encryption_manager).clone());
+    let cb = PluginTemplateCallback::new(
+        plugin_manager_arc,
+        encryption_manager_arc,
+        &window.plugin_context(),
+        RenderPurpose::Send,
+    );
+
+    // Convert HashMap<String, JsonPrimitive> to serde_json::Value for rendering
+    let values_json: serde_json::Value = serde_json::to_value(&values)?;
+    let rendered_json =
+        render_json_value(values_json, environment_chain, &cb, &RenderOptions::throw()).await?;
+
+    // Convert back to HashMap<String, JsonPrimitive>
+    let rendered_values: HashMap<String, JsonPrimitive> = serde_json::from_value(rendered_json)?;
+
+    Ok(plugin_manager
+        .call_http_authentication_action(
+            &window.plugin_context(),
+            auth_name,
+            action_index,
+            rendered_values,
+            &model.id(),
+        )
+        .await?)
+}
+
+async fn cmd_curl_to_request<R: Runtime>(
+    window: WebviewWindow<R>,
+    command: &str,
+    plugin_manager: State<'_, PluginManager>,
+    workspace_id: &str,
+) -> YaakResult<HttpRequest> {
+    let import_result = plugin_manager.import_data(&window.plugin_context(), command).await?;
+
+    Ok(import_result
+        .resources
+        .http_requests
+        .get(0)
+        .ok_or(GenericError("No curl command found".to_string()))
+        .map(|r| {
+            let mut request = r.clone();
+            request.workspace_id = workspace_id.into();
+            request.id = "".to_string();
+            request
+        })?)
+}
+
+async fn cmd_export_data<R: Runtime>(
+    app_handle: AppHandle<R>,
+    export_path: &str,
+    workspace_ids: Vec<&str>,
+    include_private_environments: bool,
+) -> YaakResult<()> {
+    let version = app_handle.package_info().version.to_string();
+    Ok(export::export_data(ExportDataParams {
+        query_manager: &app_handle.db_manager(),
+        yaak_version: &version,
+        export_path: Path::new(export_path),
+        workspace_ids,
+        include_private_environments,
+    })?)
+}

 /// Decodes base64 and writes the bytes to a file the user picked.
 ///
@@ -1070,6 +1480,20 @@ async fn cmd_save_base64_to_binary<R: Runtime>(
    Ok(())
 }

+async fn cmd_save_response<R: Runtime>(
+    app_handle: AppHandle<R>,
+    response_id: &str,
+    filepath: &str,
+) -> YaakResult<()> {
+    let response = app_handle.db().get_http_response(response_id)?;
+
+    let body_path =
+        response.body_path.ok_or(GenericError("Response does not have a body".to_string()))?;
+    fs::copy(body_path, filepath).map_err(|e| GenericError(e.to_string()))?;
+
+    Ok(())
+}
+
 async fn cmd_send_http_request<R: Runtime>(
    app_handle: AppHandle<R>,
    window: WebviewWindow<R>,
@@ -1123,7 +1547,7 @@ async fn cmd_send_http_request<R: Runtime>(
    )
    .await
    {
-        Ok(sent) => sent.response,
+        Ok(r) => r,
        Err(e) => {
            let resp = app_handle.db().get_http_response(&response.id)?;
            app_handle.db().upsert_http_response(
@@ -1141,6 +1565,101 @@ async fn cmd_send_http_request<R: Runtime>(
    Ok(r)
 }

+async fn cmd_reload_plugins<R: Runtime>(
+    app_handle: AppHandle<R>,
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<Vec<(String, String)>> {
+    let plugins = app_handle.db().list_plugins()?;
+    let plugin_context =
+        PluginContext::new(Some(window.label().to_string()), window.workspace_id());
+    let errors = plugin_manager.initialize_all_plugins(plugins, &plugin_context).await;
+    Ok(errors)
+}
+
+async fn cmd_plugin_info<R: Runtime>(
+    id: &str,
+    app_handle: AppHandle<R>,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<PluginMetadata> {
+    let plugin = app_handle.db().get_plugin(id)?;
+    if let Some(plugin_handle) = plugin_manager
+        .get_plugin_by_dir(plugin.directory.as_str())
+        .await
+    {
+        return Ok(plugin_handle.info());
+    }
+
+    if let Ok(metadata) = get_plugin_meta(&PathBuf::from(&plugin.directory)) {
+        return Ok(metadata);
+    }
+
+    Ok(fallback_plugin_metadata(&plugin.directory))
+}
+
+fn fallback_plugin_metadata(directory: &str) -> PluginMetadata {
+    let display_name = PathBuf::from(directory)
+        .file_name()
+        .and_then(|name| name.to_str())
+        .filter(|name| !name.is_empty())
+        .unwrap_or(directory)
+        .to_string();
+
+    PluginMetadata {
+        version: "Unavailable".to_string(),
+        name: directory.to_string(),
+        display_name,
+        description: Some(format!("Plugin metadata could not be loaded from {directory}")),
+        homepage_url: None,
+        repository_url: None,
+    }
+}
+
+async fn cmd_delete_all_grpc_connections<R: Runtime>(
+    request_id: &str,
+    app_handle: AppHandle<R>,
+    window: WebviewWindow<R>,
+) -> YaakResult<()> {
+    Ok(app_handle.db().delete_all_grpc_connections_for_request(
+        request_id,
+        &UpdateSource::from_window_label(window.label()),
+    )?)
+}
+
+async fn cmd_delete_send_history<R: Runtime>(
+    workspace_id: &str,
+    app_handle: AppHandle<R>,
+    window: WebviewWindow<R>,
+) -> YaakResult<()> {
+    Ok(app_handle.with_tx(|tx| {
+        let source = &UpdateSource::from_window_label(window.label());
+        tx.delete_all_http_responses_for_workspace(workspace_id, source)?;
+        tx.delete_all_grpc_connections_for_workspace(workspace_id, source)?;
+        tx.delete_all_websocket_connections_for_workspace(workspace_id, source)?;
+        Ok(())
+    })?)
+}
+
+async fn cmd_delete_all_http_responses<R: Runtime>(
+    request_id: &str,
+    app_handle: AppHandle<R>,
+    window: WebviewWindow<R>,
+) -> YaakResult<()> {
+    app_handle.db().delete_all_http_responses_for_request(
+        request_id,
+        &UpdateSource::from_window_label(window.label()),
+    )?;
+    Ok(())
+}
+
+async fn cmd_get_workspace_meta<R: Runtime>(
+    app_handle: AppHandle<R>,
+    workspace_id: &str,
+) -> YaakResult<WorkspaceMeta> {
+    let db = app_handle.db();
+    let workspace = db.get_workspace(workspace_id)?;
+    Ok(db.get_or_create_workspace_meta(&workspace.id)?)
+}

 async fn cmd_new_child_window<R: Runtime>(
    parent_window: WebviewWindow<R>,
@@ -1460,7 +1979,6 @@ fn monitor_plugin_events<R: Runtime>(app_handle: &AppHandle<R>) {

                let ev = match ev {
                    Ok(Some(ev)) => ev,
-                    // Nothing to say, or the reply comes later from somewhere else.
                    Ok(None) => return,
                    Err(e) => {
                        warn!("Failed to handle plugin event: {e:?}");
@@ -1473,10 +1991,7 @@ fn monitor_plugin_events<R: Runtime>(app_handle: &AppHandle<R>) {
                                timeout: Some(30000),
                            }),
                        );
-                        // Tell the plugin as well as the user. It is awaiting a
-                        // reply, and a toast it cannot see would leave it
-                        // waiting for one that never comes.
-                        InternalEventPayload::ErrorResponse(ErrorResponse { error: e.to_string() })
+                        return;
                    }
                };

@@ -12,8 +12,10 @@ use tauri_plugin_dialog::{DialogExt, MessageDialogKind};
 use yaak_models::blob_manager::BlobManager;
 use yaak_models::client_db::ClientDb;
 use yaak_models::error::Result;
+use yaak_models::models::{AnyModel, GraphQlIntrospection, GrpcEvent, Settings, WebsocketEvent};
 use yaak_models::query_manager::QueryManager;
 use yaak_models::util::{ModelPayload, UpdateSource};
+use yaak_plugins::manager::PluginManager;

 const MODEL_CHANGES_RETENTION_HOURS: i64 = 1;
 const MODEL_CHANGES_POLL_INTERVAL_MS: u64 = 1000;
@@ -121,12 +123,163 @@ impl<'a, R: Runtime, M: Manager<R>> QueryManagerExt<'a, R> for M {
 /// Extension trait for accessing the BlobManager from Tauri Manager types.
 pub trait BlobManagerExt<'a, R> {
    fn blob_manager(&'a self) -> State<'a, BlobManager>;
+    fn blobs(&'a self) -> yaak_models::blob_manager::BlobContext;
 }

 impl<'a, R: Runtime, M: Manager<R>> BlobManagerExt<'a, R> for M {
    fn blob_manager(&'a self) -> State<'a, BlobManager> {
        self.state::<BlobManager>()
    }
+
+    fn blobs(&'a self) -> yaak_models::blob_manager::BlobContext {
+        let manager = self.state::<BlobManager>();
+        manager.inner().connect()
+    }
+}
+
+// Commands for yaak-models
+use tauri::WebviewWindow;
+
+pub(crate) fn models_upsert<R: Runtime>(
+    window: WebviewWindow<R>,
+    model: AnyModel,
+) -> Result<String> {
+    let db = window.db();
+    let blobs = window.blob_manager();
+    let source = &UpdateSource::from_window_label(window.label());
+    yaak::models_ops::upsert_model(&db, &blobs, model, source)
+}
+
+// Async so cascading deletes (e.g. a workspace with thousands of requests) run on a
+// blocking thread instead of stalling the main thread and all other IPC.
+pub(crate) async fn models_delete<R: Runtime>(
+    window: WebviewWindow<R>,
+    model: AnyModel,
+) -> Result<String> {
+    use yaak_models::error::Error::GenericError;
+
+    tauri::async_runtime::spawn_blocking(move || {
+        let blobs = window.blob_manager();
+        // Use transaction for deletions because it might recurse
+        window.with_tx(|tx| {
+            let source = &UpdateSource::from_window_label(window.label());
+            yaak::models_ops::delete_model(tx, &blobs, model, source)
+        })
+    })
+    .await
+    .map_err(|e| GenericError(format!("Delete task failed: {e}")))?
+}
+
+pub(crate) fn models_duplicate<R: Runtime>(
+    window: WebviewWindow<R>,
+    model_type: String,
+    model_id: String,
+) -> Result<String> {
+    // Use transaction for duplications because it might recurse
+    window.with_tx(|tx| {
+        let source = &UpdateSource::from_window_label(window.label());
+        yaak::models_ops::duplicate_model(tx, &model_type, &model_id, source)
+    })
+}
+
+pub(crate) fn models_websocket_events<R: Runtime>(
+    app_handle: tauri::AppHandle<R>,
+    connection_id: &str,
+) -> Result<Vec<WebsocketEvent>> {
+    Ok(app_handle.db().list_websocket_events(connection_id)?)
+}
+
+pub(crate) fn models_grpc_events<R: Runtime>(
+    app_handle: tauri::AppHandle<R>,
+    connection_id: &str,
+) -> Result<Vec<GrpcEvent>> {
+    Ok(app_handle.db().list_grpc_events(connection_id)?)
+}
+
+pub(crate) fn models_get_settings<R: Runtime>(app_handle: tauri::AppHandle<R>) -> Result<Settings> {
+    Ok(app_handle.db().get_settings())
+}
+
+pub(crate) fn models_get_graphql_introspection<R: Runtime>(
+    app_handle: tauri::AppHandle<R>,
+    request_id: &str,
+) -> Result<Option<GraphQlIntrospection>> {
+    Ok(app_handle.db().get_graphql_introspection(request_id))
+}
+
+pub(crate) fn models_upsert_graphql_introspection<R: Runtime>(
+    app_handle: tauri::AppHandle<R>,
+    request_id: &str,
+    workspace_id: &str,
+    content: Option<String>,
+    window: WebviewWindow<R>,
+) -> Result<GraphQlIntrospection> {
+    let source = UpdateSource::from_window_label(window.label());
+    Ok(app_handle.db().upsert_graphql_introspection(workspace_id, request_id, content, &source)?)
+}
+
+pub(crate) async fn models_workspace_models<R: Runtime>(
+    window: WebviewWindow<R>,
+    workspace_id: Option<&str>,
+    plugin_manager: State<'_, PluginManager>,
+) -> Result<String> {
+    let mut l: Vec<AnyModel> = Vec::new();
+
+    // Add the global models
+    {
+        let db = window.db();
+        l.push(db.get_settings().into());
+        l.append(&mut db.list_workspaces()?.into_iter().map(Into::into).collect());
+        l.append(&mut db.list_key_values()?.into_iter().map(Into::into).collect());
+    }
+
+    let plugins = {
+        let db = window.db();
+        db.list_plugins()?
+    };
+
+    let plugins = plugin_manager.resolve_plugins_for_runtime_from_db(plugins).await;
+    l.append(&mut plugins.into_iter().map(Into::into).collect());
+
+    // Add the workspace children
+    if let Some(wid) = workspace_id {
+        let db = window.db();
+        l.append(&mut db.list_cookie_jars(wid)?.into_iter().map(Into::into).collect());
+        l.append(&mut db.list_environments_ensure_base(wid)?.into_iter().map(Into::into).collect());
+        l.append(&mut db.list_folders(wid)?.into_iter().map(Into::into).collect());
+        l.append(&mut db.list_grpc_connections(wid)?.into_iter().map(Into::into).collect());
+        l.append(&mut db.list_grpc_requests(wid)?.into_iter().map(Into::into).collect());
+        l.append(&mut db.list_http_requests(wid)?.into_iter().map(Into::into).collect());
+        l.append(&mut db.list_http_responses(wid, None)?.into_iter().map(Into::into).collect());
+        l.append(&mut db.list_websocket_connections(wid)?.into_iter().map(Into::into).collect());
+        l.append(&mut db.list_websocket_requests(wid)?.into_iter().map(Into::into).collect());
+        l.append(&mut db.list_workspace_metas(wid)?.into_iter().map(Into::into).collect());
+    }
+
+    let j = serde_json::to_string(&l)?;
+
+    Ok(escape_str_for_webview(&j))
+}
+
+fn escape_str_for_webview(input: &str) -> String {
+    input
+        .chars()
+        .map(|c| {
+            let code = c as u32;
+            // ASCII
+            if code <= 0x7F {
+                c.to_string()
+                // BMP characters encoded normally
+            } else if code < 0xFFFF {
+                format!("\\u{:04X}", code)
+                // Beyond BMP encoded a surrogate pairs
+            } else {
+                let high = ((code - 0x10000) >> 10) + 0xD800;
+                let low = ((code - 0x10000) & 0x3FF) + 0xDC00;
+                format!("\\u{:04X}\\u{:04X}", high, low)
+            }
+        })
+        .collect()
 }

 /// Initialize database managers as a plugin (for initialization order).
@@ -7,8 +7,6 @@ use crate::{
    call_frontend, cookie_jar_from_window, environment_from_window, get_window_from_plugin_context,
    workspace_from_window,
 };
-use base64::Engine;
-use base64::prelude::BASE64_STANDARD;
 use chrono::Utc;
 use log::error;
 use std::sync::Arc;
@@ -18,7 +16,6 @@ use tauri_plugin_opener::OpenerExt;
 use yaak::plugin_events::{
    GroupedPluginEvent, HostRequest, SharedPluginEventContext, handle_shared_plugin_event,
 };
-use yaak::response_body::FileResponseBodyStore;
 use yaak_crypto::manager::EncryptionManager;
 use yaak_http::cookies::get_cookie_value_from_jar;
 use yaak_models::models::{HttpResponse, Plugin};
@@ -57,7 +54,6 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(

    match handle_shared_plugin_event(
        app_handle.db_manager().inner(),
-        &FileResponseBodyStore::new(app_handle.db_manager().inner()),
        &event.payload,
        SharedPluginEventContext {
            plugin_name: &plugin_name,
@@ -317,13 +313,8 @@ async fn handle_host_plugin_request<R: Runtime>(
            )
            .await?;

-            // An ad-hoc request saves nothing, so the engine hands the body
-            // back and this reply is the only place the plugin can get it.
-            let body = http_response.body.returned_bytes().map(|b| BASE64_STANDARD.encode(b));
-
            Ok(Some(InternalEventPayload::SendHttpRequestResponse(SendHttpRequestResponse {
-                http_response: http_response.response,
-                body,
+                http_response,
            })))
        }
        HostRequest::OpenWindow(req) => {
@@ -194,6 +194,12 @@ pub async fn cmd_plugins_uninstall<R: Runtime>(
    Ok(delete_and_uninstall(plugin_manager, &query_manager, &plugin_context, plugin_id).await?)
 }

+pub async fn cmd_plugin_init_errors(
+    plugin_manager: State<'_, PluginManager>,
+) -> Result<Vec<(String, String)>> {
+    Ok(plugin_manager.take_init_errors().await)
+}
+
 pub async fn cmd_plugins_updates<R: Runtime>(
    app_handle: AppHandle<R>,
 ) -> Result<PluginUpdatesResponse> {
@@ -1,8 +1,25 @@
-//! One import path for rendering, wherever the pieces actually live.
-//!
-//! The request renderers are engine code; the template renderers moved to
-//! `yaak-commands` when the template commands did. Callers in this crate do not
-//! need to track which is which.
-
+use serde_json::Value;
 pub use yaak::render::{render_grpc_request, render_http_request};
-pub use yaak_commands::render::{render_json_value, render_template};
+use yaak_models::models::Environment;
+use yaak_models::render::make_vars_hashmap;
+use yaak_templates::{RenderOptions, TemplateCallback, parse_and_render, render_json_value_raw};
+
+pub async fn render_template<T: TemplateCallback>(
+    template: &str,
+    environment_chain: Vec<Environment>,
+    cb: &T,
+    opt: &RenderOptions,
+) -> yaak_templates::error::Result<String> {
+    let vars = &make_vars_hashmap(environment_chain);
+    parse_and_render(template, vars, cb, &opt).await
+}
+
+pub 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
+}
@@ -6,10 +6,11 @@ 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 yaak_rpc_schema::WatchResult;
+use ts_rs::TS;
 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,
@@ -56,6 +57,13 @@ 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,
@@ -18,7 +18,7 @@ use yaak_http::cookies::CookieStore;
 use yaak_http::path_placeholders::apply_path_placeholders;
 use yaak_models::models::{
    HttpResponseHeader, WebsocketConnection, WebsocketConnectionState, WebsocketEvent,
-    WebsocketEventType,
+    WebsocketEventType, WebsocketRequest,
 };
 use yaak_models::util::UpdateSource;
 use yaak_plugins::events::{CallHttpAuthenticationRequest, HttpHeader, RenderPurpose};
@@ -27,9 +27,19 @@ use yaak_plugins::template_callback::PluginTemplateCallback;
 use yaak_templates::strip_json_comments::maybe_strip_json_comments;
 use yaak_templates::{RenderErrorBehavior, RenderOptions};
 use yaak_tls::find_client_certificate;
-use yaak_commands::resolve::resolve_websocket_request;
 use yaak_ws::{WebsocketManager, render_websocket_request};

+pub async fn cmd_ws_delete_connections<R: Runtime>(
+    request_id: &str,
+    app_handle: AppHandle<R>,
+    window: WebviewWindow<R>,
+) -> Result<()> {
+    Ok(app_handle.db().delete_all_websocket_connections_for_request(
+        request_id,
+        &UpdateSource::from_window_label(window.label()),
+    )?)
+}
+
 pub async fn cmd_ws_send<R: Runtime>(
    connection_id: &str,
    environment_id: Option<&str>,
@@ -76,7 +86,7 @@ async fn send_websocket_message<R: Runtime>(
        environment_id,
    )?;
    let (resolved_request, _auth_context_id) =
-        resolve_websocket_request(&window.db(), &unrendered_request)?;
+        resolve_websocket_request(&window, &unrendered_request)?;
    let plugin_manager = Arc::new((*app_handle.state::<PluginManager>()).clone());
    let encryption_manager = Arc::new((*app_handle.state::<EncryptionManager>()).clone());
    let request = render_websocket_request(
@@ -155,7 +165,7 @@ pub async fn cmd_ws_connect<R: Runtime>(
        app_handle.db().resolve_settings_for_websocket_request(&unrendered_request)?;
    let settings = app_handle.db().get_settings();
    let (resolved_request, auth_context_id) =
-        resolve_websocket_request(&window.db(), &unrendered_request)?;
+        resolve_websocket_request(&window, &unrendered_request)?;
    let plugin_manager = Arc::new((*app_handle.state::<PluginManager>()).clone());
    let encryption_manager = Arc::new((*app_handle.state::<EncryptionManager>()).clone());
    let request = render_websocket_request(
@@ -455,6 +465,23 @@ pub async fn cmd_ws_connect<R: Runtime>(
    Ok(connection)
 }

+/// Resolve inherited authentication and headers for a websocket request
+fn resolve_websocket_request<R: Runtime>(
+    window: &WebviewWindow<R>,
+    request: &WebsocketRequest,
+) -> Result<(WebsocketRequest, String)> {
+    let mut new_request = request.clone();
+
+    let (authentication_type, authentication, authentication_context_id) =
+        window.db().resolve_auth_for_websocket_request(request)?;
+    new_request.authentication_type = authentication_type;
+    new_request.authentication = authentication;
+
+    let headers = window.db().resolve_headers_for_websocket_request(request)?;
+    new_request.headers = headers;
+
+    Ok((new_request, authentication_context_id))
+}

 /// Convert WS URL to HTTP URL for cookie filtering
 /// WebSocket upgrade requests are HTTP requests initially, so HttpOnly cookies should apply
@@ -7,4 +7,3 @@ publish = false
 [dependencies]
 tauri = { workspace = true }
 regex = "1.11.0"
-yaak-core = { workspace = true }
@@ -1,53 +1,38 @@
 use regex::Regex;
-use tauri::{Runtime, Url, WebviewWindow};
-use yaak_core::WorkspaceContext;
+use tauri::{Runtime, WebviewWindow};

 pub trait WorkspaceWindowTrait {
    fn workspace_id(&self) -> Option<String>;
    fn cookie_jar_id(&self) -> Option<String>;
    fn environment_id(&self) -> Option<String>;
    fn request_id(&self) -> Option<String>;
-    /// All four at once, from a single read of the window URL.
-    fn workspace_context(&self) -> WorkspaceContext;
 }

 impl<R: Runtime> WorkspaceWindowTrait for WebviewWindow<R> {
    fn workspace_id(&self) -> Option<String> {
-        workspace_id_from_url(&self.url().unwrap())
+        let url = self.url().unwrap();
+        let re = Regex::new(r"/workspaces/(?<id>\w+)").unwrap();
+        match re.captures(url.as_str()) {
+            None => None,
+            Some(captures) => captures.name("id").map(|c| c.as_str().to_string()),
+        }
    }

    fn cookie_jar_id(&self) -> Option<String> {
-        query_param(&self.url().unwrap(), "cookie_jar_id")
+        let url = self.url().unwrap();
+        let mut query_pairs = url.query_pairs();
+        query_pairs.find(|(k, _v)| k == "cookie_jar_id").map(|(_k, v)| v.to_string())
    }

    fn environment_id(&self) -> Option<String> {
-        query_param(&self.url().unwrap(), "environment_id")
+        let url = self.url().unwrap();
+        let mut query_pairs = url.query_pairs();
+        query_pairs.find(|(k, _v)| k == "environment_id").map(|(_k, v)| v.to_string())
    }

    fn request_id(&self) -> Option<String> {
-        query_param(&self.url().unwrap(), "request_id")
-    }
-
-    fn workspace_context(&self) -> WorkspaceContext {
        let url = self.url().unwrap();
-        WorkspaceContext {
-            workspace_id: workspace_id_from_url(&url),
-            environment_id: query_param(&url, "environment_id"),
-            cookie_jar_id: query_param(&url, "cookie_jar_id"),
-            request_id: query_param(&url, "request_id"),
-        }
+        let mut query_pairs = url.query_pairs();
+        query_pairs.find(|(k, _v)| k == "request_id").map(|(_k, v)| v.to_string())
    }
 }
-
-fn workspace_id_from_url(url: &Url) -> Option<String> {
-    let re = Regex::new(r"/workspaces/(?<id>\w+)").unwrap();
-    match re.captures(url.as_str()) {
-        None => None,
-        Some(captures) => captures.name("id").map(|c| c.as_str().to_string()),
-    }
-}
-
-fn query_param(url: &Url, key: &str) -> Option<String> {
-    let mut query_pairs = url.query_pairs();
-    query_pairs.find(|(k, _v)| k == key).map(|(_k, v)| v.to_string())
-}
@@ -9,20 +9,12 @@ chrono = { version = "0.4.38", features = ["serde"] }
 include_dir = "0.7"
 log = { workspace = true }
 nanoid = "0.4.0"
-rusqlite = { version = "0.38", features = ["bundled", "chrono"] }
-sea-query-rusqlite = { version = "0.8.0", features = ["with-chrono"] }
-sea-query = { version = "1.0", features = ["with-chrono", "attr"] }
+r2d2 = "0.8.10"
+r2d2_sqlite = { version = "0.25.0" }
+rusqlite = { version = "0.32.1", features = ["bundled", "chrono"] }
+sea-query = { version = "0.32.1", features = ["with-chrono", "attr"] }
+sea-query-rusqlite = { version = "0.7.0", features = ["with-chrono"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 ts-rs = { workspace = true }
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-r2d2 = "0.8.10"
-r2d2_sqlite = { version = "0.32" }
-
-# nanoid pulls getrandom, which needs to be told how to reach the browser's
-# CSPRNG on wasm32-unknown-unknown. Native targets are unaffected.
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-getrandom = { version = "0.2", features = ["js"] }
-uuid = { version = "1", features = ["js"] }
@@ -1,8 +1,9 @@
-use crate::pool::SqliteConn;
+use r2d2::PooledConnection;
+use r2d2_sqlite::SqliteConnectionManager;
 use rusqlite::{Connection, Statement, ToSql, Transaction};

 pub enum ConnectionOrTx<'a> {
-    Connection(SqliteConn),
+    Connection(PooledConnection<SqliteConnectionManager>),
    Transaction(&'a Transaction<'a>),
 }

@@ -3,7 +3,6 @@ use crate::error::Error::ModelNotFound;
 use crate::error::Result;
 use crate::traits::UpsertModelInfo;
 use crate::update_source::UpdateSource;
-use sea_query::ExprTrait;
 use sea_query::{
    Asterisk, Expr, Func, IntoColumnRef, IntoIden, OnConflict, Query, SimpleExpr,
    SqliteQueryBuilder,
@@ -7,7 +7,7 @@ pub enum Error {
    SqlError(#[from] rusqlite::Error),

    #[error("SQL Pool error: {0}")]
-    SqlPoolError(#[from] crate::pool::PoolError),
+    SqlPoolError(#[from] r2d2::Error),

    #[error("Database error: {0}")]
    Database(String),
@@ -2,7 +2,6 @@ pub mod connection_or_tx;
 pub mod db_context;
 pub mod error;
 pub mod migrate;
-pub mod pool;
 pub mod traits;
 pub mod update_source;
 pub mod util;
@@ -12,15 +11,13 @@ pub use connection_or_tx::ConnectionOrTx;
 pub use db_context::DbContext;
 pub use error::{Error, Result};
 pub use migrate::run_migrations;
-pub use pool::{PoolError, SqliteConn, SqlitePool};
 pub use traits::{UpsertModelInfo, upsert_date};
 pub use update_source::{ModelChangeEvent, UpdateSource};
 pub use util::{generate_id, generate_id_of_length, generate_prefixed_id};

-// Re-export types that consumers will need
-#[cfg(not(target_arch = "wasm32"))]
+// Re-export pool types that consumers will need
 pub use r2d2;
-#[cfg(not(target_arch = "wasm32"))]
 pub use r2d2_sqlite;
 pub use rusqlite;
 pub use sea_query;
+pub use sea_query_rusqlite;
@@ -1,7 +1,8 @@
 use crate::error::Result;
-use crate::pool::SqlitePool;
 use include_dir::Dir;
 use log::{debug, info};
+use r2d2::Pool;
+use r2d2_sqlite::SqliteConnectionManager;
 use rusqlite::{OptionalExtension, params};

 const TRACKING_TABLE: &str = "_sqlx_migrations";
@@ -10,7 +11,7 @@ const TRACKING_TABLE: &str = "_sqlx_migrations";
 ///
 /// Migrations are sorted by filename (use timestamp prefixes like `00000001_init.sql`).
 /// Applied migrations are tracked in `_sqlx_migrations`.
-pub fn run_migrations(pool: &SqlitePool, dir: &Dir<'_>) -> Result<()> {
+pub fn run_migrations(pool: &Pool<SqliteConnectionManager>, dir: &Dir<'_>) -> Result<()> {
    info!("Running migrations");

    // Create tracking table
@@ -1,80 +0,0 @@
-//! Where connections come from.
-//!
-//! Every query in the model layer asks a pool for a connection, uses it, and
-//! hands it back. That is the whole contract, and it is the one place the
-//! desktop and the browser genuinely differ: the desktop has threads and wants
-//! an r2d2 pool; a browser tab has one thread, no way to spawn another, and one
-//! connection is exactly enough. Everything above this module is identical on
-//! both.
-//!
-//! On native targets `SqlitePool` *is* `r2d2::Pool` — a type alias, so nothing
-//! that already builds pools changes. On wasm it is one connection that every
-//! `get()` hands out a shared handle to.
-//!
-//! A `SqliteConn` only ever derefs immutably. The code above this layer opens
-//! transactions with [`rusqlite::Transaction::new_unchecked`], which takes
-//! `&Connection`; the `&mut` that `Connection::transaction` demands is a
-//! compile-time guard against nesting a transaction on one connection, and it
-//! is what would have forced the wasm pool to lend its connection exclusively.
-//! The model layer nests connections freely — a helper that already holds one
-//! calls another that asks for its own — so an exclusive lend would panic on
-//! the second ask. Sharing the handle instead makes nested *reads* work the way
-//! they do on the desktop; nested *write transactions* fail on both, only
-//! differently (here SQLite refuses the inner `BEGIN`; natively the inner
-//! connection blocks on `busy_timeout` and then fails).
-
-#[cfg(not(target_arch = "wasm32"))]
-mod imp {
-    use r2d2_sqlite::SqliteConnectionManager;
-
-    pub type SqlitePool = r2d2::Pool<SqliteConnectionManager>;
-    pub type SqliteConn = r2d2::PooledConnection<SqliteConnectionManager>;
-    pub type PoolError = r2d2::Error;
-}
-
-#[cfg(target_arch = "wasm32")]
-mod imp {
-    use rusqlite::Connection;
-    use std::ops::Deref;
-    use std::rc::Rc;
-
-    /// One connection, shared by everyone who asks.
-    ///
-    /// `Rc` rather than `Arc` because a `Connection` is `!Sync`, so wrapping
-    /// it in an `Arc` would buy no `Send`/`Sync` anyway — and there is one
-    /// thread here to be honest about.
-    #[derive(Clone, Debug)]
-    pub struct SqlitePool {
-        conn: Rc<Connection>,
-    }
-
-    impl SqlitePool {
-        pub fn single(conn: Connection) -> Self {
-            Self { conn: Rc::new(conn) }
-        }
-
-        /// Another handle to the connection. Cannot fail; the `Result` keeps
-        /// the signature identical to r2d2's so callers are written once.
-        pub fn get(&self) -> Result<SqliteConn, PoolError> {
-            Ok(SqliteConn(self.conn.clone()))
-        }
-    }
-
-    /// The error a `get()` would return if it could. It can't, so this has no
-    /// variants; it exists so `Error::SqlPoolError` has the same shape on both
-    /// targets.
-    #[derive(Debug, thiserror::Error)]
-    pub enum PoolError {}
-
-    #[derive(Debug)]
-    pub struct SqliteConn(Rc<Connection>);
-
-    impl Deref for SqliteConn {
-        type Target = Connection;
-        fn deref(&self) -> &Connection {
-            &self.0
-        }
-    }
-}
-
-pub use imp::*;
@@ -1,18 +0,0 @@
-[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 }
@@ -1,44 +0,0 @@
-# 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.
@@ -1,14 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Environment, Folder, GrpcRequest, HttpRequest, WebsocketRequest, Workspace } from "./gen_models";
-
-export type BatchUpsertResult = { workspaces: Array<Workspace>, environments: Array<Environment>, folders: Array<Folder>, httpRequests: Array<HttpRequest>, grpcRequests: Array<GrpcRequest>, websocketRequests: Array<WebsocketRequest>, };
-
-export type ImportDestination = { "type": "new_workspace" } | { "type": "current_workspace", workspaceId: string, folderId?: string, };
-
-export type ImportPlan = { importer: string, destination: ImportDestination, resources: ImportPlanResources, warnings: Array<ImportPlanWarning>, };
-
-export type ImportPlanWarning = { title: string, detail: string, };
-
-export type ImportPlanResources = { workspaces: Array<PlannedImportResource<Workspace>>, environments: Array<PlannedImportResource<Environment>>, folders: Array<PlannedImportResource<Folder>>, httpRequests: Array<PlannedImportResource<HttpRequest>>, grpcRequests: Array<PlannedImportResource<GrpcRequest>>, websocketRequests: Array<PlannedImportResource<WebsocketRequest>>, };
-
-export type PlannedImportResource<T> = { sourceKey?: string, resource: T, };
@@ -1,4 +0,0 @@
-// 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";
@@ -1,6 +0,0 @@
-{
-  "name": "@yaakapp-internal/rpc-schema",
-  "version": "1.0.0",
-  "private": true,
-  "main": "index.ts"
-}
--- a/Show More
+++ b/Show More