Fix filter field value highlighting

2026-11-13 12:13:42 +01:00 · 2026-06-20 00:30:37 -07:00
1324 changed files with 26157 additions and 169908 deletions
@@ -1,20 +0,0 @@
-{
-  "name": "yaak",
-  "interface": {
-    "displayName": "Yaak"
-  },
-  "plugins": [
-    {
-      "name": "yaak",
-      "source": {
-        "source": "local",
-        "path": "./crates-cli/yaak-cli"
-      },
-      "policy": {
-        "installation": "AVAILABLE",
-        "authentication": "ON_INSTALL"
-      },
-      "category": "Developer Tools"
-    }
-  ]
-}
@@ -1,18 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/claude-code-marketplace.json",
-  "name": "yaak",
-  "description": "Plugins for Yaak, the desktop API client",
-  "owner": {
-    "name": "Yaak",
-    "url": "https://yaak.app"
-  },
-  "plugins": [
-    {
-      "name": "yaak",
-      "source": "./crates-cli/yaak-cli",
-      "description": "Build, save, and send API requests with the yaak CLI, with its MCP server for agents",
-      "category": "development",
-      "tags": ["api", "http", "rest", "graphql", "grpc", "openapi", "api-client"]
-    }
-  ]
-}
@@ -0,0 +1,50 @@
+---
+description: Generate formatted release notes for Yaak releases
+allowed-tools: Bash(git tag:*)
+---
+
+Generate formatted release notes for Yaak releases by analyzing git history and pull request descriptions.
+
+## What to do
+
+1. Identifies the version tag and previous version
+2. Retrieves all commits between versions
+   - If the version is a beta version, it retrieves commits between the beta version and previous beta version
+   - If the version is a stable version, it retrieves commits between the stable version and the previous stable version
+3. Fetches PR descriptions for linked issues to find:
+   - Feedback URLs (feedback.yaak.app)
+   - Additional context and descriptions
+   - Installation links for plugins
+4. Formats the release notes using the standard Yaak format:
+   - Changelog badge at the top
+   - Bulleted list of changes with PR links
+   - Feedback links where available
+   - Full changelog comparison link at the bottom
+
+## Output Format
+
+The skill generates markdown-formatted release notes following this structure:
+
+```markdown
+[![Changelog](https://img.shields.io/badge/Changelog-VERSION-blue)](https://yaak.app/changelog/VERSION)
+
+- Feature/fix description in by @username [#123](https://github.com/mountain-loop/yaak/pull/123)
+- [Linked feedback item](https://feedback.yaak.app/p/item) by @username in [#456](https://github.com/mountain-loop/yaak/pull/456)
+- A simple item that doesn't have a feedback or PR link
+
+**Full Changelog**: https://github.com/mountain-loop/yaak/compare/vPREV...vCURRENT
+```
+
+**IMPORTANT**: Always add a blank lines around the markdown code fence and output the markdown code block last
+**IMPORTANT**: PRs by `@gschier` should not mention the @username
+**IMPORTANT**: These are app release notes. Exclude CLI-only changes (commits prefixed with `cli:` or only touching `crates-cli/`) since the CLI has its own release process.
+
+## After Generating Release Notes
+
+After outputting the release notes, ask the user if they would like to create a draft GitHub release with these notes. If they confirm, create the release using:
+
+```bash
+gh release create <tag> --draft --prerelease --title "Release <version>" --notes '<release notes>'
+```
+
+**IMPORTANT**: The release title format is "Release XXXX" where XXXX is the version WITHOUT the `v` prefix. For example, tag `v2026.2.1-beta.1` gets title "Release 2026.2.1-beta.1".
@@ -19,12 +19,10 @@ Generate formatted markdown release notes for a Yaak tag.
   - `gh pr view <PR_NUMBER> --json number,title,body,author,url`
 5. Extract useful details:
   - Feedback URLs (`feedback.yaak.app`)
-   - Contributor GitHub handles from `author.login`
   - Plugin install links or other notable context
 6. Format notes using Yaak style:
   - Changelog badge at top
   - Bulleted items with PR links where available
-   - Contributor handles for external PRs
   - Feedback links where available
   - Full changelog compare link at bottom

@@ -33,7 +31,6 @@ Generate formatted markdown release notes for a Yaak tag.
 - Wrap final notes in a markdown code fence.
 - Keep a blank line before and after the code fence.
 - Output the markdown code block last.
- Append contributor attribution to PR-backed bullets for non-`@gschier` authors, using `by [@handle](https://github.com/handle)`.
 - Do not append `by @gschier` for PRs authored by `@gschier`.
 - These are app release notes. Exclude CLI-only changes (commits prefixed with `cli:` or only touching `crates-cli/`) since the CLI has its own release process.

@@ -1,104 +0,0 @@
---
-name: yaak-changelog
-description: Create or edit Yaak changelogs. Beta and draft prerelease changelogs live only in the GitHub release body; stable release changelogs live in `src/content/changelog/YYYYMMDD_VERSION/`. Use when Codex needs to update a beta GitHub release body, generate a stable website changelog from beta releases, update `_release.yaml` or `_intro.md`, expand major entries into markdown files, or preserve Yaak's changelog writing style.
---
-
-# Yaak Changelog
-
-Use this skill to create Yaak changelogs in the correct place:
-
- Beta or draft prerelease changelogs live only on the GitHub release.
- Stable release changelogs live in website files under `src/content/changelog/YYYYMMDD_VERSION/`.
-
-## Workflow
-
-1. Identify the target release.
- If the target tag contains `-beta` or the GitHub release is a draft prerelease, update the GitHub release body only. Do not create or edit `src/content/changelog/` files for beta releases.
- For a new stable changelog, gather all beta release notes for that version since the previous stable release, then create or edit website changelog files.
- Prefer `gh api` or GitHub release pages. If network access is restricted, request permission before querying GitHub.
- Extract PR numbers and `yaak.app/feedback` URLs while fetching. If most bullets do not include PR references, fetch again with a more specific prompt.
- Fetch PR authors when generating or revising release notes. Include contributor attribution for non-`@gschier` PR authors.
-
-2. Parse release bullets.
- Treat each release-note bullet as one changelog entry.
- Skip dependency-only, generated, build-only, test-only, CI-only, and internal maintenance bullets unless they have a clear user-facing impact that can be described in user terms.
- For stable website changelogs, skip bullets prefixed with `[beta-only]`.
- Preserve the entry wording closely. Remove wrapping quotes from titles.
- Map categories to `feature`, `fix`, `improvement`, or `breaking`.
- Convert `#NNN` into `https://github.com/mountain-loop/yaak/pull/NNN`.
-
-3. For beta or draft prerelease changelogs, update the GitHub release.
- Keep the changelog in the GitHub release body. Do not create a website changelog directory.
- Do not add a changelog badge or link to `yaak.app/changelog/VERSION` for beta releases.
- Prefer concise bullets with PR links and feedback links when available.
- When a bullet has a feedback URL, wrap the changelog item text itself in the feedback link, then put the PR link after it. Example: `- [Fixed request history timestamps](https://yaak.app/feedback/posts/request-history-time-stamp) in [#492](https://github.com/mountain-loop/yaak/pull/492)`.
- Append `by [@handle](https://github.com/handle)` to PR-backed bullets authored by external contributors. Do not append `by @gschier` for `@gschier` PRs.
- Include a `**Full Changelog**` comparison link using the previous beta tag when it exists, or the previous stable tag for `beta.1`.
- Use `gh release edit TAG --repo mountain-loop/yaak --notes-file ...` or the GitHub release API to update the draft/prerelease body.
- Stop after verifying the GitHub release body. The website checks below do not apply.
-
-4. For stable website changelogs, create or edit the release directory.
- Path format: `src/content/changelog/YYYYMMDD_VERSION/`.
- For a new release, use today's date for `YYYYMMDD`.
- For an existing release, keep the original directory date.
- Do not create changelog directories for beta releases.
-
-5. Write `_release.yaml`.
- Include `draft`, optional `title`, `summary`, `image`, `youtube`, and `entries`.
- Keep minor items as quick entries without `content`.
- Use `content` only when an entry needs its own markdown section.
-
-```yaml
-title: "What's New in 2026.1.0"
-summary: "Brief overview of the most important additions and fixes"
-draft: true
-entries:
-  - title: "Request debugging"
-    category: feature
-    pr: "https://github.com/mountain-loop/yaak/pull/123"
-    feedback: "https://feedback.yaak.app/p/request-debugging"
-    content: "request-debugging.md"
-  - title: "Fix broken cookie clearing"
-    category: fix
-    pr: "https://github.com/mountain-loop/yaak/pull/124"
-```
-
-6. Expand major entries.
- Expand 3 to 6 major items when enough context exists.
- Create slugified markdown files and reference them with `content`.
- Read the related PR before writing expanded content.
- Add emoji prefixes only for expanded entry titles if it helps distinguish major sections.
-
-7. Handle images.
- Reuse screenshots from PRs when they exist.
- Convert GitHub private attachment URLs to `https://github.com/user-attachments/assets/UUID` before upload.
- Upload with `go run cmd/yaakadmin/main.go upload "URL"` when the environment permits it.
- If no real image is available, use a placeholder with real alt text and a caption.
-
-8. Write `_intro.md`.
- Add a short overview paragraph at the top of the release.
- Focus on the major themes across the release instead of repeating every bullet.
-
-9. Follow Yaak writing style.
- Be direct and factual. Avoid hype.
- State what changed and how to use it.
- Keep paragraphs short.
- Use backticks for code symbols, settings, and literal values.
- Use bold sparingly for the most important phrase in a section.
-
-## File Rules
-
- Beta releases must not create or edit files in `src/content/changelog/`.
- Main files are `_release.yaml` and optional `_intro.md`.
- Expanded entry files are regular markdown files such as `request-debugging.md`.
- `entries[].content` must match an existing markdown filename in the same directory.
- Images for changelog pages live under `static/changelog/VERSION/` when committed to the repo.
-
-## Checks
-
- For beta releases, verify `gh release view TAG --repo mountain-loop/yaak --json body,tagName,isDraft,isPrerelease` and ensure no website changelog files were created.
- For beta releases, verify feedback-backed bullets use the feedback URL as the link target for the whole item text, not as a separate trailing `Feedback:` link.
- For stable releases, ensure each user-facing source bullet becomes exactly one changelog entry unless it is `[beta-only]` or dependency-only/internal maintenance.
- Ensure most entries include `pr` when the source release notes provide one.
- For stable releases, ensure every referenced `content` file exists.
- If the user wants stable website verification, run the site and inspect `/changelog/VERSION` and `/rss.xml`.
@@ -1,7 +0,0 @@
-interface:
-  display_name: "Yaak Changelog"
-  short_description: "Generate Yaak changelog releases"
-  default_prompt: "Use $yaak-changelog to create or update a Yaak changelog release from GitHub release notes."
-
-policy:
-  allow_implicit_invocation: true
@@ -1,11 +0,0 @@
-node_modules
-**/node_modules
-dist
-**/dist
-target
-**/target
-.claude
-vendored
-**/vendored
-*.log
-.git
@@ -5,4 +5,3 @@ crates/yaak-templates/pkg/* linguist-generated=true

 # Ensure consistent line endings for test files that check exact content
 crates/yaak-http/tests/test.txt text eol=lf
-crates-proxy/yaak-proxy-lib/tests/fixtures/export.har text eol=lf
@@ -1,55 +0,0 @@
-version: 2
-
-updates:
-  - package-ecosystem: npm
-    directory: /
-    schedule:
-      interval: weekly
-      day: monday
-    open-pull-requests-limit: 5
-    ignore:
-      # Build tooling majors are opted into, not queued. These never reach a
-      # user, so the cost of being a release behind is low and the cost of a
-      # surprise is a broken build. Note this also suppresses security PRs for
-      # these, so Dependabot alerts are the backstop.
-      - dependency-name: typescript
-        update-types: ["version-update:semver-major"]
-      - dependency-name: vitest
-        update-types: ["version-update:semver-major"]
-      - dependency-name: "@types/*"
-        update-types: ["version-update:semver-major"]
-      - dependency-name: "vite-plugin-*"
-        update-types: ["version-update:semver-major"]
-      # 0.8 dropped stateExtensions and updateSchema from the package root and
-      # exposes no subpath to reach them, which GrpcEditor needs. Unpin once
-      # that editor moves to the jsonSchema helper.
-      - dependency-name: codemirror-json-schema
-    groups:
-      npm-production:
-        dependency-type: production
-        update-types:
-          - minor
-          - patch
-      npm-development:
-        dependency-type: development
-        update-types:
-          - minor
-          - patch
-
-  - package-ecosystem: cargo
-    directory: /
-    schedule:
-      interval: weekly
-      day: monday
-    open-pull-requests-limit: 5
-    ignore:
-      # Held at 11.10.0 to pin what rolldown_resolver ("^11") resolves to; it
-      # does not build against 11.11. See crates-cli/yaak-cli/Cargo.toml.
-      - dependency-name: oxc_resolver
-    groups:
-      cargo:
-        patterns:
-          - "*"
-        update-types:
-          - minor
-          - patch
@@ -4,16 +4,13 @@

 ## Submission

-<!-- Check every box below except at most one of the first two (bug fixes only need the first). The last two must be checked even when they do not apply — checking confirms you considered them. -->
-
- [ ] This PR is a bug fix.
- [ ] If this PR is not a bug fix, I linked the feedback item where @gschier explicitly gave me permission to work on it.
+- [ ] This PR is a bug fix or small-scope improvement.
+- [ ] If this PR is not a bug fix or small-scope improvement, I linked an approved feedback item below.
 - [ ] I have read and followed [`CONTRIBUTING.md`](CONTRIBUTING.md).
 - [ ] I tested this change locally.
- [ ] I added or updated tests, or tests are not reasonable for this change.
- [ ] I added screenshots or recordings, or this change does not affect the UI.
+- [ ] I added or updated tests when reasonable.

-Explicit permission feedback item (required if not a bug fix):
+Approved feedback item (required if not a bug fix or small-scope improvement):

 <!-- https://yaak.app/feedback/... -->

@@ -1,881 +0,0 @@
-const fs = require("node:fs");
-
-const COMMENT_MARKER = "<!-- yaak-contribution-policy -->";
-
-const MAINTAINER_LOGINS = new Set(["gschier"]);
-const MAINTAINER_ASSOCIATIONS = new Set(["OWNER", "MEMBER", "COLLABORATOR"]);
-const MAINTAINER_PERMISSIONS = new Set(["admin", "maintain", "write"]);
-const REVIEWER_LOGIN = "gschier";
-
-const LARGE_DIFF_CHANGED_FILES = 20;
-const LARGE_DIFF_CHANGED_LINES = 800;
-const SUMMARY_TITLE_MAX_LENGTH = 80;
-const MIN_AUTOMATIC_PR_NUMBER = 494;
-
-const LABELS = {
-  inScope: {
-    name: "contribution: in scope",
-    color: "0E8A16",
-    description: "Community PR appears to be in scope for maintainer review.",
-  },
-  outOfScope: {
-    name: "contribution: out of scope",
-    color: "B60205",
-    description: "Community PR does not match Yaak's contribution policy.",
-  },
-  explicitPermission: {
-    name: "contribution: explicit permission",
-    color: "5319E7",
-    description:
-      "Community PR links feedback where @gschier explicitly allowed the work.",
-  },
-  missingTemplate: {
-    name: "contribution: missing template",
-    color: "D93F0B",
-    description:
-      "Community PR is missing enough of the pull request template to review.",
-  },
-  policyUnmet: {
-    name: "contribution: policy unmet",
-    color: "B60205",
-    description:
-      "Community PR does not currently satisfy the contribution policy.",
-  },
-  needsScopeReview: {
-    name: "contribution: needs scope review",
-    color: "FBCA04",
-    description:
-      "Community PR may be broader than Yaak's bug-fix contribution policy.",
-  },
-};
-
-const MANAGED_LABEL_NAMES = [
-  ...new Set(Object.values(LABELS).map((label) => label.name)),
-];
-
-// Each checkbox lists its current label first, followed by legacy labels still
-// accepted from PRs opened against older versions of the template.
-const CHECKBOXES = {
-  bugFix: ["This PR is a bug fix."],
-  explicitPermission: [
-    "If this PR is not a bug fix, I linked the feedback item where @gschier explicitly gave me permission to work on it.",
-  ],
-  readContributing: [
-    "I have read and followed [`CONTRIBUTING.md`](CONTRIBUTING.md).",
-  ],
-  testedLocally: ["I tested this change locally."],
-  testsUpdated: [
-    "I added or updated tests, or tests are not reasonable for this change.",
-    "I added or updated tests when reasonable.",
-  ],
-  screenshotsAdded: [
-    "I added screenshots or recordings, or this change does not affect the UI.",
-    "I added screenshots or recordings for UI changes when reasonable.",
-  ],
-};
-
-function escapeRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
-function normalizeBody(body) {
-  return (body || "").replace(/\r\n/g, "\n");
-}
-
-function stripComments(value) {
-  return value.replace(/<!--[\s\S]*?-->/g, "").trim();
-}
-
-function getSection(body, heading) {
-  const pattern = new RegExp(`^##\\s+${escapeRegExp(heading)}\\s*$`, "gim");
-  const match = pattern.exec(body);
-
-  if (match == null) {
-    return null;
-  }
-
-  const rest = body.slice(match.index + match[0].length);
-  const nextHeadingIndex = rest.search(/^##\s+/m);
-  return nextHeadingIndex === -1 ? rest : rest.slice(0, nextHeadingIndex);
-}
-
-function hasMeaningfulText(value) {
-  return stripComments(value || "").length > 0;
-}
-
-function normalizeCheckboxLabel(label) {
-  return label
-    .replace(/\[([^\]]+)\]\([^)]+\)/g, "$1")
-    .replace(/`/g, "")
-    .replace(/\s+/g, " ")
-    .trim();
-}
-
-function checkboxState(body, labels) {
-  const expectedLabels = new Set(labels.map(normalizeCheckboxLabel));
-
-  for (const line of body.split("\n")) {
-    const match = line.match(/^\s*[-*]\s*\[([ xX])\]\s*(.*?)\s*$/i);
-
-    if (match == null) {
-      continue;
-    }
-
-    if (expectedLabels.has(normalizeCheckboxLabel(match[2]))) {
-      return match[1].toLowerCase() === "x";
-    }
-  }
-
-  return null;
-}
-
-function findFeedbackUrl(body) {
-  return (
-    body.match(
-      /https?:\/\/(?:www\.)?(?:yaak\.app\/feedback|feedback\.yaak\.app)\/[^\s)>\]]+/i,
-    )?.[0] ?? null
-  );
-}
-
-function getLabelNames(pr) {
-  return new Set((pr.labels || []).map((label) => label.name));
-}
-
-function analyzePullRequest(pr) {
-  const body = normalizeBody(pr.body);
-  const labelNames = getLabelNames(pr);
-  const states = Object.fromEntries(
-    Object.entries(CHECKBOXES).map(([key, label]) => [
-      key,
-      checkboxState(body, label),
-    ]),
-  );
-  const sectionCount = ["Summary", "Submission", "Related"].filter(
-    (heading) => getSection(body, heading) != null,
-  ).length;
-  const checkboxCount = Object.values(states).filter(
-    (state) => state != null,
-  ).length;
-  const templateUsed = sectionCount >= 2 && checkboxCount >= 3;
-  const blockers = [];
-  const totalChangedLines =
-    Number(pr.additions || 0) + Number(pr.deletions || 0);
-  const changedFiles = Number(pr.changed_files || 0);
-  const largeDiff =
-    changedFiles > LARGE_DIFF_CHANGED_FILES ||
-    totalChangedLines > LARGE_DIFF_CHANGED_LINES;
-
-  if (labelNames.has(LABELS.outOfScope.name)) {
-    return {
-      blockers: [
-        {
-          label: LABELS.outOfScope.name,
-          message: "Marked out of scope by maintainer label.",
-        },
-      ],
-      changedFiles,
-      desiredLabels: [LABELS.outOfScope.name],
-      largeDiff,
-      status: "out_of_scope",
-      templateUsed,
-      totalChangedLines,
-    };
-  }
-
-  if (labelNames.has(LABELS.inScope.name)) {
-    return {
-      blockers: [],
-      changedFiles,
-      desiredLabels: [LABELS.inScope.name],
-      largeDiff,
-      status: "in_scope",
-      templateUsed,
-      totalChangedLines,
-    };
-  }
-
-  if (labelNames.has(LABELS.explicitPermission.name)) {
-    return {
-      blockers: [],
-      changedFiles,
-      desiredLabels: [LABELS.explicitPermission.name],
-      largeDiff,
-      status: "in_scope",
-      templateUsed,
-      totalChangedLines,
-    };
-  }
-
-  if (!templateUsed) {
-    blockers.push({
-      label: LABELS.missingTemplate.name,
-      message:
-        "Update the PR description with the repository pull request template.",
-    });
-  } else {
-    const summary = getSection(body, "Summary");
-    const hasSummary = hasMeaningfulText(summary);
-    const feedbackUrl = findFeedbackUrl(body);
-    const bugFix = states.bugFix === true;
-    const explicitPermission = states.explicitPermission === true;
-
-    if (!hasSummary) {
-      blockers.push({
-        label: LABELS.policyUnmet.name,
-        message:
-          "Add a short summary describing the bug fix or permitted change.",
-      });
-    }
-
-    if (bugFix && explicitPermission) {
-      blockers.push({
-        label: LABELS.policyUnmet.name,
-        message:
-          "Choose either the bug-fix checkbox or the explicit-permission checkbox, not both.",
-      });
-    } else if (!bugFix && !explicitPermission) {
-      blockers.push({
-        label: LABELS.policyUnmet.name,
-        message:
-          "Check whether this is a bug fix, or confirm that explicit permission from @gschier is linked.",
-      });
-    } else if (explicitPermission && feedbackUrl == null) {
-      blockers.push({
-        label: LABELS.policyUnmet.name,
-        message:
-          "Link the feedback item where @gschier explicitly gave you permission to work on this.",
-      });
-    }
-
-    if (states.readContributing !== true) {
-      blockers.push({
-        label: LABELS.policyUnmet.name,
-        message: "Confirm that `CONTRIBUTING.md` was read and followed.",
-      });
-    }
-
-    if (states.testedLocally !== true) {
-      blockers.push({
-        label: LABELS.policyUnmet.name,
-        message: "Confirm that the change was tested locally.",
-      });
-    }
-
-    if (states.testsUpdated !== true) {
-      blockers.push({
-        label: LABELS.policyUnmet.name,
-        message:
-          "Confirm that tests were added or updated, or that tests are not reasonable for this change. Check the box either way.",
-      });
-    }
-
-    if (states.screenshotsAdded !== true) {
-      blockers.push({
-        label: LABELS.policyUnmet.name,
-        message:
-          "Confirm that screenshots or recordings were added, or that this change does not affect the UI. Check the box either way.",
-      });
-    }
-  }
-
-  const desiredLabels = new Set();
-
-  if (blockers.length === 0) {
-    desiredLabels.add(
-      largeDiff
-        ? LABELS.needsScopeReview.name
-        : states.explicitPermission
-          ? LABELS.explicitPermission.name
-          : LABELS.inScope.name,
-    );
-  } else if (
-    blockers.some((blocker) => blocker.label === LABELS.missingTemplate.name)
-  ) {
-    desiredLabels.add(LABELS.missingTemplate.name);
-  } else {
-    desiredLabels.add(LABELS.policyUnmet.name);
-  }
-
-  return {
-    blockers,
-    changedFiles,
-    desiredLabels: [...desiredLabels],
-    largeDiff,
-    status: blockers.length === 0 ? "in_scope" : "blocked",
-    templateUsed,
-    totalChangedLines,
-  };
-}
-
-function buildBlockingComment(analysis) {
-  const lines = [
-    COMMENT_MARKER,
-    "Thanks for the PR. Yaak currently accepts community PRs for bug fixes, plus larger changes that link a feedback item where @gschier explicitly gave permission to work on it.",
-    "",
-    "This PR cannot be accepted yet because the following contribution policy requirements were unmet:",
-    "",
-    ...analysis.blockers.map((blocker) => `- ${blocker.message}`),
-  ];
-
-  if (!analysis.templateUsed) {
-    lines.push(
-      "",
-      "You can copy this template into the PR description and keep any existing context that is still useful.",
-      "",
-      "<details>",
-      "<summary>PR description template</summary>",
-      "",
-      "```md",
-      getPullRequestTemplate(),
-      "```",
-      "",
-      "</details>",
-    );
-  }
-
-  if (analysis.largeDiff) {
-    lines.push(
-      "",
-      `This PR also changes ${analysis.changedFiles} files and ${analysis.totalChangedLines} lines, so it has been labeled as needing scope review. That label is advisory, but maintainers may ask for the scope to be reduced.`,
-    );
-  }
-
-  return lines.join("\n");
-}
-
-function getPullRequestTemplate() {
-  return fs.readFileSync(".github/pull_request_template.md", "utf8").trim();
-}
-
-function buildInScopeComment() {
-  return [
-    COMMENT_MARKER,
-    "Thanks for the PR. This appears to match Yaak's contribution policy and is awaiting review by @gschier.",
-    "",
-    "This only means the PR is in scope for review. It does not mean the change has been reviewed or accepted for merge.",
-  ].join("\n");
-}
-
-function buildOutOfScopeComment() {
-  return [
-    COMMENT_MARKER,
-    "Thanks for the PR. This does not appear to match Yaak's current contribution policy.",
-    "",
-    "Yaak currently accepts community PRs for bug fixes, or changes tied to a feedback item where @gschier explicitly gave permission to work on it.",
-    "",
-    "If this PR is tied to a feedback item where @gschier explicitly gave permission, please link it in the PR description.",
-  ].join("\n");
-}
-
-function buildPolicyComment(analysis) {
-  if (analysis.status === "out_of_scope") {
-    return buildOutOfScopeComment();
-  }
-
-  if (analysis.blockers.length > 0) {
-    return buildBlockingComment(analysis);
-  }
-
-  return buildInScopeComment();
-}
-
-function escapeHtml(value) {
-  return String(value)
-    .replace(/&/g, "&amp;")
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;")
-    .replace(/"/g, "&quot;")
-    .replace(/'/g, "&#39;");
-}
-
-function truncateTitle(title) {
-  if (title.length <= SUMMARY_TITLE_MAX_LENGTH) {
-    return title;
-  }
-
-  return `${title.slice(0, SUMMARY_TITLE_MAX_LENGTH - 3).trimEnd()}...`;
-}
-
-function escapeTableText(value) {
-  return escapeHtml(value).replace(/\n/g, "<br>");
-}
-
-function summarizeResult({ pr, analysis, skipped, skipReason }) {
-  const comment =
-    analysis == null
-      ? "None"
-      : buildPolicyComment(analysis).replace(COMMENT_MARKER, "").trim();
-  const summary = {
-    blocked: analysis?.blockers.length > 0,
-    comment,
-    details: "None",
-    labels:
-      analysis?.desiredLabels.length > 0
-        ? analysis.desiredLabels.join(", ")
-        : "None",
-    number: pr.number,
-    prLink: `<a href="${escapeHtml(pr.html_url)}">#${pr.number}</a>`,
-    status: "In scope",
-    title: escapeHtml(truncateTitle(pr.title)),
-  };
-
-  if (skipped) {
-    return {
-      ...summary,
-      blocked: false,
-      comment: "None",
-      details: escapeHtml(skipReason),
-      labels: "None",
-      status: "Skipped",
-    };
-  }
-
-  if (summary.blocked) {
-    return {
-      ...summary,
-      comment: escapeTableText(summary.comment),
-      details: escapeHtml(
-        analysis.blockers.map((blocker) => blocker.message).join("; "),
-      ),
-      labels: escapeHtml(summary.labels),
-      status: analysis.status === "out_of_scope" ? "Out of scope" : "Blocked",
-    };
-  }
-
-  return {
-    ...summary,
-    comment: escapeTableText(summary.comment),
-    labels: escapeHtml(summary.labels),
-  };
-}
-
-async function isOfficialMaintainer({ github, owner, repo, pr }) {
-  if (MAINTAINER_LOGINS.has(pr.user.login)) {
-    return true;
-  }
-
-  if (MAINTAINER_ASSOCIATIONS.has(pr.author_association)) {
-    return true;
-  }
-
-  try {
-    const response = await github.rest.repos.getCollaboratorPermissionLevel({
-      owner,
-      repo,
-      username: pr.user.login,
-    });
-
-    return MAINTAINER_PERMISSIONS.has(response.data.permission);
-  } catch (error) {
-    if (error.status === 404) {
-      return false;
-    }
-
-    throw error;
-  }
-}
-
-async function ensureManagedLabels({ github, owner, repo }) {
-  for (const label of Object.values(LABELS)) {
-    try {
-      await github.rest.issues.getLabel({
-        owner,
-        repo,
-        name: label.name,
-      });
-    } catch (error) {
-      if (error.status !== 404) {
-        throw error;
-      }
-
-      await github.rest.issues.createLabel({
-        owner,
-        repo,
-        name: label.name,
-        color: label.color,
-        description: label.description,
-      });
-    }
-  }
-}
-
-async function syncLabels({ github, owner, repo, issueNumber, desiredLabels }) {
-  const desired = new Set(desiredLabels);
-
-  await ensureManagedLabels({ github, owner, repo });
-
-  for (const labelName of MANAGED_LABEL_NAMES) {
-    if (desired.has(labelName)) {
-      continue;
-    }
-
-    try {
-      await github.rest.issues.removeLabel({
-        owner,
-        repo,
-        issue_number: issueNumber,
-        name: labelName,
-      });
-    } catch (error) {
-      if (error.status !== 404) {
-        throw error;
-      }
-    }
-  }
-
-  if (desired.size > 0) {
-    await github.rest.issues.addLabels({
-      owner,
-      repo,
-      issue_number: issueNumber,
-      labels: [...desired],
-    });
-  }
-}
-
-async function findPolicyComment({ github, owner, repo, issueNumber }) {
-  const comments = await github.paginate(github.rest.issues.listComments, {
-    owner,
-    repo,
-    issue_number: issueNumber,
-    per_page: 100,
-  });
-
-  return comments.find(
-    (comment) =>
-      comment.user.type === "Bot" && comment.body?.includes(COMMENT_MARKER),
-  );
-}
-
-async function upsertPolicyComment({ github, owner, repo, issueNumber, body }) {
-  const existingComment = await findPolicyComment({
-    github,
-    owner,
-    repo,
-    issueNumber,
-  });
-
-  if (existingComment == null) {
-    await github.rest.issues.createComment({
-      owner,
-      repo,
-      issue_number: issueNumber,
-      body,
-    });
-    return;
-  }
-
-  await github.rest.issues.updateComment({
-    owner,
-    repo,
-    comment_id: existingComment.id,
-    body,
-  });
-}
-
-async function deletePolicyComment({ github, owner, repo, issueNumber }) {
-  const existingComment = await findPolicyComment({
-    github,
-    owner,
-    repo,
-    issueNumber,
-  });
-
-  if (existingComment == null) {
-    return;
-  }
-
-  await github.rest.issues.deleteComment({
-    owner,
-    repo,
-    comment_id: existingComment.id,
-  });
-}
-
-async function requestMaintainerReview({ github, owner, repo, pr }) {
-  if (pr.user.login === REVIEWER_LOGIN) {
-    return;
-  }
-
-  try {
-    await github.rest.pulls.requestReviewers({
-      owner,
-      repo,
-      pull_number: pr.number,
-      reviewers: [REVIEWER_LOGIN],
-    });
-  } catch (error) {
-    if (error.status === 422) {
-      return;
-    }
-
-    throw error;
-  }
-}
-
-async function checkPullRequest({
-  github,
-  core,
-  owner,
-  repo,
-  pullNumber,
-  dryRun,
-  minimumAutomaticPullNumber,
-}) {
-  const response = await github.rest.pulls.get({
-    owner,
-    repo,
-    pull_number: pullNumber,
-  });
-  const pr = response.data;
-  const issueNumber = pr.number;
-
-  if (pr.user.type === "Bot") {
-    core.notice(
-      `Skipping contribution policy for bot PR #${pr.number} from @${pr.user.login}.`,
-    );
-    return {
-      blocked: false,
-      number: pr.number,
-      summary: summarizeResult({
-        pr,
-        skipped: true,
-        skipReason: `bot @${pr.user.login}`,
-      }),
-      skipped: true,
-    };
-  }
-
-  if (
-    minimumAutomaticPullNumber != null &&
-    pr.number < minimumAutomaticPullNumber
-  ) {
-    core.notice(
-      `Skipping contribution policy for PR #${pr.number} because automatic checks start at PR #${minimumAutomaticPullNumber}.`,
-    );
-    return {
-      blocked: false,
-      number: pr.number,
-      summary: summarizeResult({
-        pr,
-        skipped: true,
-        skipReason: `before automatic rollout PR #${minimumAutomaticPullNumber}`,
-      }),
-      skipped: true,
-    };
-  }
-
-  if (pr.draft) {
-    core.notice(`Skipping contribution policy for draft PR #${pr.number}.`);
-    return {
-      blocked: false,
-      number: pr.number,
-      summary: summarizeResult({
-        pr,
-        skipped: true,
-        skipReason: "draft",
-      }),
-      skipped: true,
-    };
-  }
-
-  if (await isOfficialMaintainer({ github, owner, repo, pr })) {
-    core.notice(
-      `Skipping contribution policy for maintainer PR #${pr.number} from @${pr.user.login}.`,
-    );
-    if (!dryRun) {
-      await syncLabels({ github, owner, repo, issueNumber, desiredLabels: [] });
-      await deletePolicyComment({ github, owner, repo, issueNumber });
-    }
-    return {
-      blocked: false,
-      number: pr.number,
-      summary: summarizeResult({
-        pr,
-        skipped: true,
-        skipReason: `maintainer @${pr.user.login}`,
-      }),
-      skipped: true,
-    };
-  }
-
-  const analysis = analyzePullRequest(pr);
-
-  if (dryRun) {
-    const summary = summarizeResult({ pr, analysis });
-    core.notice(
-      `[dry-run] PR #${summary.number}: ${summary.status}; labels: ${summary.labels}; details: ${summary.details}`,
-    );
-    return {
-      blocked: analysis.blockers.length > 0,
-      number: pr.number,
-      summary,
-      skipped: false,
-    };
-  }
-
-  await syncLabels({
-    github,
-    owner,
-    repo,
-    issueNumber,
-    desiredLabels: analysis.desiredLabels,
-  });
-
-  if (analysis.blockers.length > 0) {
-    await upsertPolicyComment({
-      github,
-      owner,
-      repo,
-      issueNumber,
-      body: buildPolicyComment(analysis),
-    });
-    return {
-      blocked: true,
-      number: pr.number,
-      summary: summarizeResult({ pr, analysis }),
-      skipped: false,
-    };
-  }
-
-  await upsertPolicyComment({
-    github,
-    owner,
-    repo,
-    issueNumber,
-    body: buildPolicyComment(analysis),
-  });
-  await requestMaintainerReview({ github, owner, repo, pr });
-  core.notice(`Contribution policy check passed for PR #${pr.number}.`);
-  return {
-    blocked: false,
-    number: pr.number,
-    summary: summarizeResult({ pr, analysis }),
-    skipped: false,
-  };
-}
-
-async function listOpenPullRequests({ github, owner, repo }) {
-  return github.paginate(github.rest.pulls.list, {
-    owner,
-    repo,
-    state: "open",
-    per_page: 100,
-  });
-}
-
-function getManualPullRequestNumbers({ context, core }) {
-  const value = String(context.payload.inputs?.pr || "all").trim();
-
-  if (value.toLowerCase() === "all") {
-    return null;
-  }
-
-  const pullNumber = Number(value);
-
-  if (!Number.isInteger(pullNumber) || pullNumber <= 0) {
-    core.setFailed('The "pr" input must be "all" or a positive PR number.');
-    return [];
-  }
-
-  return [pullNumber];
-}
-
-async function run({ github, context, core }) {
-  const { owner, repo } = context.repo;
-  const payloadPr = context.payload.pull_request;
-  const dryRunInput = context.payload.inputs?.dry_run;
-  const dryRun =
-    context.eventName === "workflow_dispatch" &&
-    dryRunInput !== false &&
-    dryRunInput !== "false";
-  const minimumAutomaticPullNumber =
-    payloadPr == null ? null : MIN_AUTOMATIC_PR_NUMBER;
-  let pullNumbers;
-
-  if (payloadPr != null) {
-    pullNumbers = [payloadPr.number];
-  } else {
-    pullNumbers = getManualPullRequestNumbers({ context, core });
-  }
-
-  if (pullNumbers?.length === 0) {
-    return;
-  }
-
-  const pullRequests =
-    pullNumbers == null
-      ? await listOpenPullRequests({ github, owner, repo })
-      : pullNumbers.map((number) => ({ number }));
-  const results = [];
-
-  if (dryRun) {
-    core.notice(
-      `Running contribution policy in dry-run mode for ${
-        pullNumbers == null
-          ? "all open PRs"
-          : pullNumbers.map((number) => `#${number}`).join(", ")
-      }.`,
-    );
-  }
-
-  for (const pr of pullRequests) {
-    results.push(
-      await checkPullRequest({
-        github,
-        core,
-        owner,
-        repo,
-        pullNumber: pr.number,
-        dryRun,
-        minimumAutomaticPullNumber,
-      }),
-    );
-  }
-
-  await core.summary
-    .addHeading(`Contribution Policy ${dryRun ? "Dry Run" : "Results"}`)
-    .addTable([
-      [
-        { data: "PR", header: true },
-        { data: "Title", header: true },
-        { data: "Status", header: true },
-        { data: "Labels", header: true },
-        { data: "Details", header: true },
-        { data: "Comment", header: true },
-      ],
-      ...results.map((result) => [
-        result.summary.prLink,
-        result.summary.title,
-        result.summary.status,
-        result.summary.labels,
-        result.summary.details,
-        result.summary.comment,
-      ]),
-    ])
-    .write();
-
-  const blockedPullRequests = results.filter((result) => result.blocked);
-
-  if (blockedPullRequests.length > 0) {
-    if (dryRun) {
-      core.warning(
-        `Dry run found contribution policy failures for PR(s): ${blockedPullRequests
-          .map((result) => `#${result.number}`)
-          .join(", ")}`,
-      );
-      return;
-    }
-
-    core.setFailed(
-      `Contribution policy failed for PR(s): ${blockedPullRequests
-        .map((result) => `#${result.number}`)
-        .join(", ")}`,
-    );
-  }
-}
-
-module.exports = {
-  analyzePullRequest,
-  run,
-};
@@ -1,79 +0,0 @@
-// Retain only distributable bundle files, never the target tree or signing material.
-import { createHash } from "node:crypto";
-import {
-  copyFileSync,
-  createReadStream,
-  existsSync,
-  mkdirSync,
-  readdirSync,
-  writeFileSync,
-} from "node:fs";
-import { join, relative } from "node:path";
-
-const env = process.env;
-const bundle = join("target", env.RELEASE_TARGET || "", "release", "bundle");
-const destination = join(env.RUNNER_TEMP, "yaak-release-artifacts");
-const extensions =
-  /\.(dmg|deb|rpm|AppImage|exe|msi|app\.tar\.gz|AppImage\.tar\.gz|nsis\.zip|msi\.zip)(\.sig)?$/;
-const files = [];
-
-function snapshot(directory) {
-  if (!existsSync(directory)) return;
-  for (const entry of readdirSync(directory, { withFileTypes: true })) {
-    const source = join(directory, entry.name);
-    // Only descend through the bundler's immediate output folders. This excludes
-    // .app trees and the extracted CEF deb contents (which contain executables).
-    if (entry.isDirectory() && directory === bundle) {
-      snapshot(source);
-    } else if (
-      entry.isFile() &&
-      (extensions.test(entry.name) || /^yaak-cef_.*_linux_.*\.tar\.gz$/.test(entry.name))
-    ) {
-      // Match tauri-action's default macOS updater asset naming exactly.
-      const arch = env.RELEASE_ARCH === "arm64" ? "aarch64" : "x64";
-      const assetName = entry.name.replace(/\.app\.tar\.gz(\.sig)?$/, `_${arch}.app.tar.gz$1`);
-      mkdirSync(destination, { recursive: true });
-      const retained = join(destination, assetName);
-      // The second snapshot must not overwrite the original user installer/signature.
-      if (!existsSync(retained)) copyFileSync(source, retained);
-      files.push({ source: relative(".", source), assetName });
-    }
-  }
-}
-
-snapshot(bundle);
-if (existsSync(destination)) {
-  const assets = readdirSync(destination)
-    .filter((name) => name !== "provenance.json")
-    .sort();
-  const checksums = [];
-  for (const assetName of assets) {
-    const hash = createHash("sha256");
-    for await (const chunk of createReadStream(join(destination, assetName))) hash.update(chunk);
-    checksums.push({ assetName, sha256: hash.digest("hex") });
-  }
-  writeFileSync(
-    join(destination, "provenance.json"),
-    JSON.stringify(
-      {
-        repository: env.GITHUB_REPOSITORY,
-        tag: env.GITHUB_REF_NAME,
-        sha: env.GITHUB_SHA,
-        runId: env.GITHUB_RUN_ID,
-        runAttempt: env.GITHUB_RUN_ATTEMPT,
-        workflowRef: env.GITHUB_WORKFLOW_REF,
-        workflowSha: env.GITHUB_WORKFLOW_SHA,
-        tauriAction: "tauri-apps/tauri-action@v0",
-        platform: env.RELEASE_PLATFORM,
-        runtime: env.RELEASE_RUNTIME,
-        arch: env.RELEASE_ARCH,
-        target: env.RELEASE_TARGET,
-        args: env.RELEASE_ARGS,
-        assets: checksums,
-      },
-      null,
-      2,
-    ) + "\n",
-  );
-}
-console.log(`Found ${files.length} distributable bundle files in ${bundle}`);
@@ -30,34 +30,4 @@ jobs:
      - name: Run JS Tests
        run: vp test
      - name: Run Rust Tests
-        run: cargo test --all --features yaak-app-client/wry
-      - name: OpenAPI import round-trip
-        run: |
-          cargo build -p yaak-cli
-          node plugins/importer-openapi/tests/roundtrip.mjs
-
-  test-windows:
-    name: Rust Tests (Windows)
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: voidzero-dev/setup-vp@v1
-        with:
-          node-version: "24"
-          cache: true
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: ci
-          cache-on-failure: true
-      - name: Install Protoc for plugin-runtime
-        uses: arduino/setup-protoc@v3
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - run: vp install
-      - run: npm run bootstrap
-        env:
-          YAAK_TARGET_ARCH: x64
-      - name: Run Rust Tests
-        run: cargo test --all --exclude yaak-cli --features yaak-app-client/wry
+        run: cargo test --all
@@ -0,0 +1,49 @@
+name: Claude Code
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_review_comment:
+    types: [created]
+  issues:
+    types: [opened, assigned]
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  claude:
+    if: |
+      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
+      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      issues: read
+      id-token: write
+      actions: read # Required for Claude to read CI results on PRs
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Run Claude Code
+        id: claude
+        uses: anthropics/claude-code-action@v1
+        with:
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+
+          # This is an optional setting that allows Claude to read CI results on PRs
+          additional_permissions: |
+            actions: read
+
+          # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
+          # prompt: 'Update the pull request description to include a summary of changes.'
+
+          # Optional: Add claude_args to customize behavior and configuration
+          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
+          # or https://code.claude.com/docs/en/cli-reference for available options
+          # claude_args: '--allowed-tools Bash(gh pr:*)'
@@ -1,48 +0,0 @@
-name: Contribution Policy
-
-on:
-  workflow_dispatch:
-    inputs:
-      pr:
-        description: PR number or all
-        required: true
-        default: all
-        type: string
-      dry_run:
-        description: Dry run
-        required: true
-        default: true
-        type: boolean
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - reopened
-      - synchronize
-      - ready_for_review
-      - labeled
-      - unlabeled
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-
-jobs:
-  check:
-    if: github.repository == 'mountain-loop/yaak'
-    name: Check contribution policy
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout policy script
-        uses: actions/checkout@v4
-        with:
-          ref: main
-          fetch-depth: 1
-
-      - name: Check contribution policy
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const { run } = require("./.github/scripts/check-contribution-policy.js");
-            await run({ github, context, core });
@@ -1,21 +1,17 @@
 name: Update Flathub
-
 on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: Release tag to publish to Flathub
-        required: true
-        type: string
+  release:
+    types: [published]

 permissions:
  contents: read

 jobs:
  update-flathub:
-    if: github.repository == 'mountain-loop/yaak'
    name: Update Flathub manifest
    runs-on: ubuntu-latest
+    # Only run for stable releases (skip betas/pre-releases)
+    if: ${{ !github.event.release.prerelease }}
    steps:
      - name: Checkout app repo
        uses: actions/checkout@v4
@@ -35,7 +31,7 @@ jobs:
      - name: Set up Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: "24"
+          node-version: "22"

      - name: Install source generators
        run: |
@@ -43,7 +39,7 @@ jobs:
          git clone --depth 1 https://github.com/flatpak/flatpak-builder-tools flatpak/flatpak-builder-tools

      - name: Run update-manifest.sh
-        run: bash flatpak/update-manifest.sh "${{ inputs.tag }}" flathub-repo
+        run: bash flatpak/update-manifest.sh "${{ github.event.release.tag_name }}" flathub-repo

      - name: Commit and push to Flathub
        working-directory: flathub-repo
@@ -52,5 +48,5 @@ jobs:
          git config user.email "github-actions[bot]@users.noreply.github.com"
          git add -A
          git diff --cached --quiet && echo "No changes to commit" && exit 0
-          git commit -m "Update to ${{ inputs.tag }}"
+          git commit -m "Update to ${{ github.event.release.tag_name }}"
          git push
@@ -15,7 +15,6 @@ permissions:

 jobs:
  publish-npm:
-    if: github.repository == 'mountain-loop/yaak'
    name: Publish @yaakapp/api
    runs-on: ubuntu-latest
    permissions:
@@ -5,7 +5,6 @@ on:

 jobs:
  build-artifacts:
-    if: github.repository == 'mountain-loop/yaak'
    permissions:
      contents: write

@@ -15,62 +14,38 @@ jobs:
      matrix:
        include:
          - platform: "macos-latest" # for Arm-based Macs (M1 and above).
-            args: '--target aarch64-apple-darwin --config ./tauri.release.conf.json --config ''{"build":{"features":["updater","license","wry"]}}'''
+            args: "--target aarch64-apple-darwin"
            yaak_arch: "arm64"
            os: "macos"
-            runtime: "wry"
            targets: "aarch64-apple-darwin"
          - platform: "macos-latest" # for Intel-based Macs.
-            args: '--target x86_64-apple-darwin --config ./tauri.release.conf.json --config ''{"build":{"features":["updater","license","wry"]}}'''
+            args: "--target x86_64-apple-darwin"
            yaak_arch: "x64"
            os: "macos"
-            runtime: "wry"
            targets: "x86_64-apple-darwin"
          - platform: "ubuntu-22.04"
-            args: '--config ./tauri.release.conf.json --config ''{"build":{"features":["updater","license","wry"]}}'''
+            args: ""
            yaak_arch: "x64"
            os: "ubuntu"
-            runtime: "wry"
            targets: ""
          - platform: "ubuntu-22.04-arm"
-            args: '--config ./tauri.release.conf.json --config ''{"build":{"features":["updater","license","wry"]}}'''
+            args: ""
            yaak_arch: "arm64"
            os: "ubuntu"
-            runtime: "wry"
-            targets: ""
-          - platform: "ubuntu-22.04"
-            args: >-
-              --bundles deb
-              --config ./tauri.release.conf.json
-              --config '{"productName":"yaak-cef","mainBinaryName":"yaak-cef","identifier":"app.yaak.desktop.cef","build":{"features":["license","cef"]},"bundle":{"createUpdaterArtifacts":false}}'
-            yaak_arch: "x64"
-            os: "ubuntu"
-            runtime: "cef"
-            targets: ""
-          - platform: "ubuntu-22.04-arm"
-            args: >-
-              --bundles deb
-              --config ./tauri.release.conf.json
-              --config '{"productName":"yaak-cef","mainBinaryName":"yaak-cef","identifier":"app.yaak.desktop.cef","build":{"features":["license","cef"]},"bundle":{"createUpdaterArtifacts":false}}'
-            yaak_arch: "arm64"
-            os: "ubuntu"
-            runtime: "cef"
            targets: ""
          - platform: "windows-latest"
-            args: '--config ./tauri.release.conf.json --config ''{"build":{"features":["updater","license","wry"]}}'''
+            args: ""
            yaak_arch: "x64"
            os: "windows"
-            runtime: "wry"
            targets: ""
          # Windows ARM64
          - platform: "windows-latest"
-            args: '--target aarch64-pc-windows-msvc --config ./tauri.release.conf.json --config ''{"build":{"features":["updater","license","wry"]}}'''
+            args: "--target aarch64-pc-windows-msvc"
            yaak_arch: "arm64"
            os: "windows"
-            runtime: "wry"
            targets: "aarch64-pc-windows-msvc"
    runs-on: ${{ matrix.platform }}
-    timeout-minutes: 360
+    timeout-minutes: 40
    steps:
      - name: Checkout yaakapp/app
        uses: actions/checkout@v4
@@ -91,30 +66,11 @@ jobs:
          shared-key: ci
          cache-on-failure: true

-      - name: Cache CEF (Linux only)
-        if: matrix.os == 'ubuntu' && matrix.runtime == 'cef'
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/tauri-cef
-          key: cef-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Cargo.lock') }}
-
      - name: install dependencies (Linux only)
        if: matrix.os == 'ubuntu'
        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-wasm 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"
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf xdg-utils

      - name: Install Protoc for plugin-runtime
        uses: arduino/setup-protoc@v3
@@ -142,7 +98,7 @@ jobs:
      - name: Run JS Tests
        run: vp test
      - name: Run Rust Tests
-        run: cargo test --all --exclude yaak-cli --features yaak-app-client/wry
+        run: cargo test --all --exclude yaak-cli

      - name: Set version
        run: npm run replace-version
@@ -172,8 +128,7 @@ jobs:
          codesign --force --options runtime --entitlements crates-tauri/yaak-app-client/macos/entitlements.yaakprotoc.plist --sign "$APPLE_SIGNING_IDENTITY" crates-tauri/yaak-app-client/vendored/protoc/yaakprotoc || true
          codesign --force --options runtime --entitlements crates-tauri/yaak-app-client/macos/entitlements.yaaknode.plist --sign "$APPLE_SIGNING_IDENTITY" crates-tauri/yaak-app-client/vendored/node/yaaknode || true

-      - name: Build and upload Tauri bundles
-        uses: tauri-apps/tauri-action@v0
+      - uses: tauri-apps/tauri-action@v0
        env:
          YAAK_TARGET_ARCH: ${{ matrix.yaak_arch }}

@@ -195,49 +150,13 @@ jobs:
          AZURE_CLIENT_SECRET: ${{ matrix.os == 'windows' && secrets.AZURE_CLIENT_SECRET }}
          AZURE_TENANT_ID: ${{ matrix.os == 'windows' && secrets.AZURE_TENANT_ID }}
        with:
-          # Also retries builds; upload retries alone cannot clean up starter assets.
-          retryAttempts: 3
-          tauriScript: "node ../../node_modules/@tauri-apps/cli/tauri.js"
          tagName: "v__VERSION__"
          releaseName: "Release __VERSION__"
-          releaseBody: "<!-- generated-by-yaak-releases -->"
+          releaseBody: "[Changelog __VERSION__](https://yaak.app/blog/__VERSION__)"
          releaseDraft: true
          prerelease: true
          projectPath: ./crates-tauri/yaak-app-client
-          args: "${{ matrix.args }}"
-
-      # Snapshot before the per-machine build overwrites the regular NSIS bundle/signature.
-      - name: Snapshot Tauri bundles
-        if: ${{ !cancelled() }}
-        run: node .github/scripts/preserve-release-artifacts.mjs
-        env:
-          RELEASE_TARGET: ${{ matrix.targets }}
-          RELEASE_PLATFORM: ${{ matrix.platform }}
-          RELEASE_RUNTIME: ${{ matrix.runtime }}
-          RELEASE_ARCH: ${{ matrix.yaak_arch }}
-          RELEASE_ARGS: ${{ matrix.args }}
-
-      - name: Build and upload CEF tarball from deb (Linux only)
-        if: matrix.os == 'ubuntu' && matrix.runtime == 'cef'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          set -euo pipefail
-          deb=$(find target/release/bundle/deb -maxdepth 1 -type f -name '*.deb' | head -n 1)
-          version="${GITHUB_REF_NAME#v}"
-          extract_dir="target/release/bundle/deb/yaak-cef-linux-${{ matrix.yaak_arch }}"
-          tarball="target/release/bundle/deb/yaak-cef_${version}_linux_${{ matrix.yaak_arch }}.tar.gz"
-          rm -rf "$extract_dir"
-          mkdir -p "$extract_dir"
-          dpkg-deb -x "$deb" "$extract_dir"
-          tar -C "$extract_dir" -czf "$tarball" .
-          for attempt in 1 2 3 4; do
-            if gh release upload "$GITHUB_REF_NAME" "$tarball" --clobber; then
-              break
-            fi
-            if [ "$attempt" -eq 4 ]; then exit 1; fi
-            sleep 10
-          done
+          args: "${{ matrix.args }} --config ./tauri.release.conf.json"

      # Build a per-machine NSIS installer for enterprise deployment (PDQ, SCCM, Intune)
      - name: Build and upload machine-wide installer (Windows only)
@@ -254,8 +173,7 @@ jobs:
        run: |
          Get-ChildItem -Recurse -Path target -File -Filter "*.exe.sig" | Remove-Item -Force
          Push-Location crates-tauri/yaak-app-client
-          npx tauri bundle ${{ matrix.args }} --bundles nsis --config '{"bundle":{"createUpdaterArtifacts":true,"windows":{"nsis":{"installMode":"perMachine"}}}}'
-          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+          npx tauri bundle ${{ matrix.args }} --bundles nsis --config ./tauri.release.conf.json --config '{"bundle":{"createUpdaterArtifacts":true,"windows":{"nsis":{"installMode":"perMachine"}}}}'
          Pop-Location
          $setup = Get-ChildItem -Recurse -Path target -Filter "*setup*.exe" | Select-Object -First 1
          $setupSig = "$($setup.FullName).sig"
@@ -263,30 +181,5 @@ jobs:
          $destSig = "$dest.sig"
          Copy-Item $setup.FullName $dest
          Copy-Item $setupSig $destSig
-          foreach ($asset in @($dest, $destSig)) {
-            for ($attempt = 1; $attempt -le 4; $attempt++) {
-              gh release upload "$env:GITHUB_REF_NAME" "$asset" --clobber
-              if ($LASTEXITCODE -eq 0) { break }
-              if ($attempt -eq 4) { exit $LASTEXITCODE }
-              Start-Sleep -Seconds 10
-            }
-          }
-
-      - name: Snapshot additional release bundles
-        if: ${{ !cancelled() }}
-        run: node .github/scripts/preserve-release-artifacts.mjs
-        env:
-          RELEASE_TARGET: ${{ matrix.targets }}
-          RELEASE_PLATFORM: ${{ matrix.platform }}
-          RELEASE_RUNTIME: ${{ matrix.runtime }}
-          RELEASE_ARCH: ${{ matrix.yaak_arch }}
-          RELEASE_ARGS: ${{ matrix.args }}
-
-      - name: Retain release bundles for recovery
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-${{ github.ref_name }}-${{ matrix.platform }}-${{ matrix.runtime }}-${{ matrix.yaak_arch }}-${{ github.run_id }}-attempt-${{ github.run_attempt }}
-          path: ${{ runner.temp }}/yaak-release-artifacts/
-          retention-days: 7
-          if-no-files-found: warn
+          gh release upload "${{ github.ref_name }}" "$dest" --clobber
+          gh release upload "${{ github.ref_name }}" "$destSig" --clobber
@@ -2,7 +2,7 @@ name: Release CLI to NPM

 on:
  push:
-    tags: [v*]
+    tags: [yaak-cli-*]
  workflow_dispatch:
    inputs:
      version:
@@ -15,7 +15,6 @@ permissions:

 jobs:
  prepare-vendored-assets:
-    if: github.repository == 'mountain-loop/yaak'
    name: Prepare vendored plugin assets
    runs-on: ubuntu-latest

@@ -119,7 +118,7 @@ jobs:
          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
            VERSION="$WORKFLOW_VERSION"
          else
-            VERSION="${GITHUB_REF_NAME}"
+            VERSION="${GITHUB_REF_NAME#yaak-cli-}"
          fi
          VERSION="${VERSION#v}"
          echo "Building yaak version: $VERSION"
@@ -176,7 +175,7 @@ jobs:
          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
            VERSION="$WORKFLOW_VERSION"
          else
-            VERSION="${GITHUB_REF_NAME}"
+            VERSION="${GITHUB_REF_NAME#yaak-cli-}"
          fi
          VERSION="${VERSION#v}"
          if [[ "$VERSION" == *-* ]]; then
@@ -1,123 +0,0 @@
-name: Release web image
-
-# Builds ghcr.io/mountain-loop/yaak-web: the browser client and the server that serves it.
-# One image per architecture on its own native runner (emulating a Rust release build is hours),
-# joined into one multi-arch tag at the end.
-
-on:
-  push:
-    tags: [v*]
-  workflow_dispatch:
-    inputs:
-      version:
-        description: Version to publish, without the v (e.g. 2026.2.0). Empty publishes main and sha tags only.
-        required: false
-        type: string
-
-permissions:
-  contents: read
-  packages: write
-
-env:
-  IMAGE: ghcr.io/mountain-loop/yaak-web
-
-jobs:
-  build:
-    if: github.repository == 'mountain-loop/yaak'
-    name: Build ${{ matrix.platform }}
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - platform: linux/amd64
-            runner: ubuntu-22.04
-            arch: amd64
-          - platform: linux/arm64
-            runner: ubuntu-22.04-arm
-            arch: arm64
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push by digest
-        id: build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile.web
-          platforms: ${{ matrix.platform }}
-          outputs: type=image,name=${{ env.IMAGE }},push-by-digest=true,name-canonical=true,push=true
-
-      - name: Export digest
-        run: |
-          mkdir -p "${{ runner.temp }}/digests"
-          digest="${{ steps.build.outputs.digest }}"
-          touch "${{ runner.temp }}/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digest-${{ matrix.arch }}
-          path: ${{ runner.temp }}/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  publish:
-    name: Publish manifest
-    needs: build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Download digests
-        uses: actions/download-artifact@v4
-        with:
-          path: ${{ runner.temp }}/digests
-          pattern: digest-*
-          merge-multiple: true
-
-      - name: Set up Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      # `latest` follows a release tag, and a manual run that names a version — the way to
-      # publish before the first release. A prerelease (v2026.2.1-beta.1) never takes it.
-      - name: Tags
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.IMAGE }}
-          flavor: latest=false
-          tags: |
-            type=semver,pattern={{version}}
-            type=raw,value=${{ inputs.version }},enable=${{ inputs.version != '' }}
-            type=raw,value=latest,enable=${{ inputs.version != '' || (github.event_name == 'push' && !contains(github.ref_name, '-')) }}
-            type=ref,event=branch
-            type=sha,format=short
-
-      - name: Create and push the manifest
-        working-directory: ${{ runner.temp }}/digests
-        run: |
-          docker buildx imagetools create \
-            $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.IMAGE }}@sha256:%s ' *)
-
-      - name: Inspect
-        run: docker buildx imagetools inspect ${{ env.IMAGE }}:${{ steps.meta.outputs.version }}
@@ -7,7 +7,6 @@ permissions:
  contents: write
 jobs:
  deploy:
-    if: github.repository == 'mountain-loop/yaak'
    runs-on: ubuntu-latest
    steps:
      - name: Checkout 🛎️
@@ -58,7 +58,3 @@ flatpak/node-sources.json

 # Claude Code local settings
 .claude/settings.local.json
-.claude/worktrees/
-
-# Headless screenshots taken while working
-.shots/
@@ -0,0 +1,3 @@
+**/bindings/**
+**/routeTree.gen.ts
+crates/yaak-templates/pkg/**
@@ -3,7 +3,6 @@
  "ignorePatterns": [
    "**/bindings/**",
    "crates/yaak-templates/pkg/**",
-    "apps/yaak-client/routeTree.gen.ts",
-    "plugins/importer-bruno/tests/fixtures/upstream/**"
+    "apps/yaak-client/routeTree.gen.ts"
  ]
 }
@@ -1,2 +1,2 @@
- Tag safety: app AND CLI releases both ship from `v*` tags (the CLI is version-locked to the app and publishes to npm on every app tag); `@yaakapp/api` uses `yaak-api-*` tags. Always confirm which is requested before retagging.
+- Tag safety: app releases use `v*` tags and CLI releases use `yaak-cli-*` tags; always confirm which one is requested before retagging.
 - Do not commit, push, or tag without explicit approval
@@ -3,12 +3,13 @@
 Yaak accepts community pull requests for:

 - Bug fixes
+- Small-scope improvements directly tied to existing behavior

 Pull requests that introduce broad new features, major redesigns, or large refactors are out of scope unless explicitly approved first.

 ## Approval for Non-Bugfix Changes

-If your PR is not a bug fix, include a link to the [feedback item](https://yaak.app/feedback) where @gschier explicitly gave you permission to work on it.
+If your PR is not a bug fix or small-scope improvement, include a link to the approved [feedback item](https://yaak.app/feedback) where contribution approval was explicitly stated.

 ## Development Setup

@@ -2,37 +2,27 @@
 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",
  "crates/yaak-crypto",
-  "crates/yaak-filter",
  "crates/yaak-git",
  "crates/yaak-grpc",
  "crates/yaak-http",
-  "crates/yaak-lifecycle",
-  "crates/yaak-mcp",
  "crates/yaak-models",
  "crates/yaak-plugins",
-  "crates/yaak-query",
  "crates/yaak-sse",
  "crates/yaak-sync",
  "crates/yaak-templates",
  "crates/yaak-tls",
  "crates/yaak-ws",
-  "crates/yaak-wasm",
  "crates/yaak-api",
  "crates/yaak-proxy",
  # Proxy-specific crates
  "crates-proxy/yaak-proxy-lib",
-  # Server crates (the browser tier's hosted send executor)
-  "crates-server/yaak-web",
-  "crates-server/yaak-playground",
  # CLI crates
  "crates-cli/yaak-cli",
  # Tauri-specific crates
@@ -41,8 +31,6 @@ members = [
  "crates-tauri/yaak-fonts",
  "crates-tauri/yaak-license",
  "crates-tauri/yaak-mac-window",
-  "crates-tauri/yaak-proxy-helper",
-  "crates-tauri/yaak-system-appearance",
  "crates-tauri/yaak-tauri-utils",
  "crates-tauri/yaak-window",
 ]
@@ -52,27 +40,16 @@ chrono = "0.4.42"
 hex = "0.4.3"
 keyring = "3.6.3"
 log = "0.4.29"
-reqwest = { version = "0.13.5", default-features = false, features = [
-  # reqwest 0.13 switched `default-tls` from native-tls to rustls; keep the
-  # rest of the old default set and stay on native-tls.
-  "charset",
-  "http2",
-  "system-proxy",
-  "native-tls",
-] }
+reqwest = "0.12.20"
 rustls = { version = "0.23.34", default-features = false }
-rustls-platform-verifier = "0.7.1"
+rustls-platform-verifier = "0.6.2"
 schemars = { version = "0.8.22", features = ["chrono"] }
 serde = "1.0.228"
 serde_json = "1.0.145"
 sha2 = "0.10.9"
-tauri = { version = "2.11.1", default-features = false, features = [
-  "common-controls-v6",
-  "compression",
-  "dynamic-acl",
-] }
+tauri = "2.11.1"
 tauri-plugin = "2.6.1"
-tauri-plugin-dialog = { version = "2.7.1", default-features = false }
+tauri-plugin-dialog = "2.7.1"
 tauri-plugin-shell = "2.3.5"
 thiserror = "2.0.17"
 tokio = "1.48.0"
@@ -81,23 +58,17 @@ 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-filter = { path = "crates/yaak-filter" }
 yaak-git = { path = "crates/yaak-git" }
 yaak-grpc = { path = "crates/yaak-grpc" }
 yaak-http = { path = "crates/yaak-http" }
-yaak-lifecycle = { path = "crates/yaak-lifecycle" }
-yaak-mcp = { path = "crates/yaak-mcp" }
 yaak-models = { path = "crates/yaak-models" }
 yaak-plugins = { path = "crates/yaak-plugins" }
-yaak-query = { path = "crates/yaak-query" }
 yaak-sse = { path = "crates/yaak-sse" }
 yaak-sync = { path = "crates/yaak-sync" }
 yaak-templates = { path = "crates/yaak-templates" }
@@ -113,14 +84,8 @@ yaak-proxy-lib = { path = "crates-proxy/yaak-proxy-lib" }
 yaak-fonts = { path = "crates-tauri/yaak-fonts" }
 yaak-license = { path = "crates-tauri/yaak-license" }
 yaak-mac-window = { path = "crates-tauri/yaak-mac-window" }
-yaak-proxy-helper = { path = "crates-tauri/yaak-proxy-helper" }
-yaak-system-appearance = { path = "crates-tauri/yaak-system-appearance" }
 yaak-tauri-utils = { path = "crates-tauri/yaak-tauri-utils" }
 yaak-window = { path = "crates-tauri/yaak-window" }

 [profile.release]
 strip = false
-
-[patch.crates-io]
-tauri = { git = "https://github.com/tauri-apps/tauri", rev = "d9bc695c18d9a25baec21d8a5f36d72e3a14ee53" }
-tauri-build = { git = "https://github.com/tauri-apps/tauri", rev = "d9bc695c18d9a25baec21d8a5f36d72e3a14ee53" }
@@ -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,15 +0,0 @@
-# syntax=docker/dockerfile:1
-# The playground API behind yaak.run. See crates-server/yaak-playground/README.md.
-
-FROM rust:1-bookworm AS build
-WORKDIR /app
-COPY . .
-RUN cargo build --release -p yaak-playground
-
-FROM debian:bookworm-slim
-COPY --from=build /app/target/release/yaak-playground /usr/local/bin/yaak-playground
-ENV HOST=0.0.0.0
-ENV PORT=8080
-EXPOSE 8080
-USER nobody
-CMD ["yaak-playground"]
@@ -1,49 +0,0 @@
-# syntax=docker/dockerfile:1
-# Yaak in a browser, whole: the web client and the server that executes its sends, in one
-# image serving both from one origin.
-#
-#   docker run -p 8080:8080 ghcr.io/mountain-loop/yaak-web
-#
-# See crates-server/yaak-web/README.md for the knobs.
-
-FROM node:22-slim AS web
-WORKDIR /app
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    git python3 make g++ ca-certificates && rm -rf /var/lib/apt/lists/*
-COPY . .
-# `npm ci` runs a prepare hook (`vp config`) that shells out to git, and there is no .git in
-# the build context — it is ignored, and in a worktree it is a pointer file anyway.
-RUN git init -q && git add -A \
-    && git -c user.email=build@yaak.app -c user.name=build commit -qm build
-# Empty means the tab posts sends to its own origin, which is what this image serves. Set it
-# only to build a bundle for a deployment whose server lives somewhere else.
-ARG VITE_YAAK_WEB_URL=""
-ENV VITE_YAAK_WEB_URL=$VITE_YAAK_WEB_URL
-ENV YAAK_TARGET=web
-# crates/yaak-wasm's wasm package is committed; rebuilding it needs a clang with a WebAssembly
-# backend, which this image has no reason to carry.
-ENV SKIP_WASM_BUILD=1
-RUN npm ci
-RUN node_modules/.bin/vp -C apps/yaak-client build
-
-FROM rust:1-bookworm AS server
-WORKDIR /app
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    pkg-config libssl-dev protobuf-compiler && rm -rf /var/lib/apt/lists/*
-COPY . .
-RUN cargo build --release -p yaak-web
-
-FROM debian:bookworm-slim
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    ca-certificates libssl3 && rm -rf /var/lib/apt/lists/*
-COPY --from=server /app/target/release/yaak-web /usr/local/bin/yaak-web
-COPY --from=web /app/dist/apps/yaak-client /srv
-# 0.0.0.0 so the port is reachable from outside the container. PORT is the variable a
-# platform-as-a-service assigns, so a deploy that sets it needs nothing else changed.
-ENV HOST=0.0.0.0
-ENV PORT=8080
-EXPOSE 8080
-USER nobody
-# Overriding the command (dropping --serve) leaves the stateless send executor:
-#   docker run ghcr.io/mountain-loop/yaak-web yaak-web
-CMD ["yaak-web", "--serve", "/srv"]
@@ -17,18 +17,14 @@
 <br>

 <p align="center">
-  <!-- sponsors-premium --><a href="https://github.com/MVST-Solutions"><img src="https:&#x2F;&#x2F;github.com&#x2F;MVST-Solutions.png" width="80px" alt="User avatar: MVST-Solutions" /></a>&nbsp;&nbsp;<a href="https://github.com/dharsanb"><img src="https:&#x2F;&#x2F;github.com&#x2F;dharsanb.png" width="80px" alt="User avatar: dharsanb" /></a>&nbsp;&nbsp;<a href="https://github.com/railwayapp"><img src="https:&#x2F;&#x2F;github.com&#x2F;railwayapp.png" width="80px" alt="User avatar: railwayapp" /></a>&nbsp;&nbsp;<a href="https://github.com/caseyamcl"><img src="https:&#x2F;&#x2F;github.com&#x2F;caseyamcl.png" width="80px" alt="User avatar: caseyamcl" /></a>&nbsp;&nbsp;<a href="https://github.com/bytebase"><img src="https:&#x2F;&#x2F;github.com&#x2F;bytebase.png" width="80px" alt="User avatar: bytebase" /></a>&nbsp;&nbsp;<a href="https://github.com/rauchg"><img src="https:&#x2F;&#x2F;github.com&#x2F;rauchg.png" width="80px" alt="User avatar: rauchg" /></a>&nbsp;&nbsp;<a href="https://github.com/"><img src="https:&#x2F;&#x2F;raw.githubusercontent.com&#x2F;JamesIves&#x2F;github-sponsors-readme-action&#x2F;dev&#x2F;.github&#x2F;assets&#x2F;placeholder.png" width="80px" alt="User avatar: " /></a>&nbsp;&nbsp;<!-- sponsors-premium -->
+  <!-- sponsors-premium --><a href="https://github.com/MVST-Solutions"><img src="https:&#x2F;&#x2F;github.com&#x2F;MVST-Solutions.png" width="80px" alt="User avatar: MVST-Solutions" /></a>&nbsp;&nbsp;<a href="https://github.com/dharsanb"><img src="https:&#x2F;&#x2F;github.com&#x2F;dharsanb.png" width="80px" alt="User avatar: dharsanb" /></a>&nbsp;&nbsp;<a href="https://github.com/railwayapp"><img src="https:&#x2F;&#x2F;github.com&#x2F;railwayapp.png" width="80px" alt="User avatar: railwayapp" /></a>&nbsp;&nbsp;<a href="https://github.com/caseyamcl"><img src="https:&#x2F;&#x2F;github.com&#x2F;caseyamcl.png" width="80px" alt="User avatar: caseyamcl" /></a>&nbsp;&nbsp;<a href="https://github.com/bytebase"><img src="https:&#x2F;&#x2F;github.com&#x2F;bytebase.png" width="80px" alt="User avatar: bytebase" /></a>&nbsp;&nbsp;<a href="https://github.com/"><img src="https:&#x2F;&#x2F;raw.githubusercontent.com&#x2F;JamesIves&#x2F;github-sponsors-readme-action&#x2F;dev&#x2F;.github&#x2F;assets&#x2F;placeholder.png" width="80px" alt="User avatar: " /></a>&nbsp;&nbsp;<!-- sponsors-premium -->
 </p>
 <p align="center">
-  <!-- sponsors-base --><a href="https://github.com/seanwash"><img src="https:&#x2F;&#x2F;github.com&#x2F;seanwash.png" width="50px" alt="User avatar: seanwash" /></a>&nbsp;&nbsp;<a href="https://github.com/jerath"><img src="https:&#x2F;&#x2F;github.com&#x2F;jerath.png" width="50px" alt="User avatar: jerath" /></a>&nbsp;&nbsp;<a href="https://github.com/itsa-sh"><img src="https:&#x2F;&#x2F;github.com&#x2F;itsa-sh.png" width="50px" alt="User avatar: itsa-sh" /></a>&nbsp;&nbsp;<a href="https://github.com/dmmulroy"><img src="https:&#x2F;&#x2F;github.com&#x2F;dmmulroy.png" width="50px" alt="User avatar: dmmulroy" /></a>&nbsp;&nbsp;<a href="https://github.com/timcole"><img src="https:&#x2F;&#x2F;github.com&#x2F;timcole.png" width="50px" alt="User avatar: timcole" /></a>&nbsp;&nbsp;<a href="https://github.com/VLZH"><img src="https:&#x2F;&#x2F;github.com&#x2F;VLZH.png" width="50px" alt="User avatar: VLZH" /></a>&nbsp;&nbsp;<a href="https://github.com/terasaka2k"><img src="https:&#x2F;&#x2F;github.com&#x2F;terasaka2k.png" width="50px" alt="User avatar: terasaka2k" /></a>&nbsp;&nbsp;<a href="https://github.com/andriyor"><img src="https:&#x2F;&#x2F;github.com&#x2F;andriyor.png" width="50px" alt="User avatar: andriyor" /></a>&nbsp;&nbsp;<a href="https://github.com/majudhu"><img src="https:&#x2F;&#x2F;github.com&#x2F;majudhu.png" width="50px" alt="User avatar: majudhu" /></a>&nbsp;&nbsp;<a href="https://github.com/axelrindle"><img src="https:&#x2F;&#x2F;github.com&#x2F;axelrindle.png" width="50px" alt="User avatar: axelrindle" /></a>&nbsp;&nbsp;<a href="https://github.com/jirizverina"><img src="https:&#x2F;&#x2F;github.com&#x2F;jirizverina.png" width="50px" alt="User avatar: jirizverina" /></a>&nbsp;&nbsp;<a href="https://github.com/chip-well"><img src="https:&#x2F;&#x2F;github.com&#x2F;chip-well.png" width="50px" alt="User avatar: chip-well" /></a>&nbsp;&nbsp;<a href="https://github.com/GRAYAH"><img src="https:&#x2F;&#x2F;github.com&#x2F;GRAYAH.png" width="50px" alt="User avatar: GRAYAH" /></a>&nbsp;&nbsp;<a href="https://github.com/flashblaze"><img src="https:&#x2F;&#x2F;github.com&#x2F;flashblaze.png" width="50px" alt="User avatar: flashblaze" /></a>&nbsp;&nbsp;<a href="https://github.com/Frostist"><img src="https:&#x2F;&#x2F;github.com&#x2F;Frostist.png" width="50px" alt="User avatar: Frostist" /></a>&nbsp;&nbsp;<a href="https://github.com/PurplProto"><img src="https:&#x2F;&#x2F;github.com&#x2F;PurplProto.png" width="50px" alt="User avatar: PurplProto" /></a>&nbsp;&nbsp;<!-- sponsors-base -->
+  <!-- sponsors-base --><a href="https://github.com/seanwash"><img src="https:&#x2F;&#x2F;github.com&#x2F;seanwash.png" width="50px" alt="User avatar: seanwash" /></a>&nbsp;&nbsp;<a href="https://github.com/jerath"><img src="https:&#x2F;&#x2F;github.com&#x2F;jerath.png" width="50px" alt="User avatar: jerath" /></a>&nbsp;&nbsp;<a href="https://github.com/itsa-sh"><img src="https:&#x2F;&#x2F;github.com&#x2F;itsa-sh.png" width="50px" alt="User avatar: itsa-sh" /></a>&nbsp;&nbsp;<a href="https://github.com/dmmulroy"><img src="https:&#x2F;&#x2F;github.com&#x2F;dmmulroy.png" width="50px" alt="User avatar: dmmulroy" /></a>&nbsp;&nbsp;<a href="https://github.com/timcole"><img src="https:&#x2F;&#x2F;github.com&#x2F;timcole.png" width="50px" alt="User avatar: timcole" /></a>&nbsp;&nbsp;<a href="https://github.com/VLZH"><img src="https:&#x2F;&#x2F;github.com&#x2F;VLZH.png" width="50px" alt="User avatar: VLZH" /></a>&nbsp;&nbsp;<a href="https://github.com/terasaka2k"><img src="https:&#x2F;&#x2F;github.com&#x2F;terasaka2k.png" width="50px" alt="User avatar: terasaka2k" /></a>&nbsp;&nbsp;<a href="https://github.com/andriyor"><img src="https:&#x2F;&#x2F;github.com&#x2F;andriyor.png" width="50px" alt="User avatar: andriyor" /></a>&nbsp;&nbsp;<a href="https://github.com/majudhu"><img src="https:&#x2F;&#x2F;github.com&#x2F;majudhu.png" width="50px" alt="User avatar: majudhu" /></a>&nbsp;&nbsp;<a href="https://github.com/axelrindle"><img src="https:&#x2F;&#x2F;github.com&#x2F;axelrindle.png" width="50px" alt="User avatar: axelrindle" /></a>&nbsp;&nbsp;<a href="https://github.com/jirizverina"><img src="https:&#x2F;&#x2F;github.com&#x2F;jirizverina.png" width="50px" alt="User avatar: jirizverina" /></a>&nbsp;&nbsp;<a href="https://github.com/chip-well"><img src="https:&#x2F;&#x2F;github.com&#x2F;chip-well.png" width="50px" alt="User avatar: chip-well" /></a>&nbsp;&nbsp;<a href="https://github.com/GRAYAH"><img src="https:&#x2F;&#x2F;github.com&#x2F;GRAYAH.png" width="50px" alt="User avatar: GRAYAH" /></a>&nbsp;&nbsp;<a href="https://github.com/flashblaze"><img src="https:&#x2F;&#x2F;github.com&#x2F;flashblaze.png" width="50px" alt="User avatar: flashblaze" /></a>&nbsp;&nbsp;<a href="https://github.com/Frostist"><img src="https:&#x2F;&#x2F;github.com&#x2F;Frostist.png" width="50px" alt="User avatar: Frostist" /></a>&nbsp;&nbsp;<!-- sponsors-base -->
 </p>

 ![Yaak API Client](https://yaak.app/static/screenshot.png)

-## Install
-
-Download Yaak for macOS, Windows, or Linux from [yaak.app/download](https://yaak.app/download). Package managers and other install methods are in the [installation docs](https://yaak.app/docs/getting-started/installation).
-
 ## Features

 Yaak is an offline-first API client designed to stay out of your way while giving you everything you need when you need it.
@@ -61,8 +57,8 @@ Built with [Tauri](https://tauri.app), Rust, and React, it’s fast, lightweight
 ## Contribution Policy

 > [!IMPORTANT]
-> Community PRs are currently limited to bug fixes.
-> If your PR is not a bug fix, link the [feedback item](https://yaak.app/feedback) where @gschier explicitly gave you permission to work on it.
+> Community PRs are currently limited to bug fixes and small-scope improvements.
+> If your PR is out of scope, link an approved feedback item from [yaak.app/feedback](https://yaak.app/feedback).
 > See [`CONTRIBUTING.md`](CONTRIBUTING.md) for policy details and [`DEVELOPMENT.md`](DEVELOPMENT.md) for local setup.

 ## Useful Resources
@@ -72,9 +68,3 @@ Built with [Tauri](https://tauri.app), Rust, and React, it’s fast, lightweight
 - [Yaak vs Postman](https://yaak.app/alternatives/postman)
 - [Yaak vs Bruno](https://yaak.app/alternatives/bruno)
 - [Yaak vs Insomnia](https://yaak.app/alternatives/insomnia)
-
-## License
-
-The source is [MIT licensed](LICENSE) and can be built and run for free, for both personal and commercial use.
-
-The prebuilt binaries follow Yaak's [pricing terms](https://yaak.app/pricing): free for personal use, license required for commercial use.
@@ -1,148 +0,0 @@
-import type { FunctionComponent, ReactElement } from "react";
-import { beforeEach, expect, test, vi } from "vite-plus/test";
-import type { SyncOp } from "@yaakapp-internal/sync/bindings/gen_sync";
-import type { DialogInstance } from "../components/Dialogs";
-import { syncWorkspace } from "./commands";
-
-const mocks = vi.hoisted(() => ({
-  calculateSync: vi.fn(),
-  applySync: vi.fn(),
-  showDialog: vi.fn<(dialog: DialogInstance) => void>(),
-  hideDialog: vi.fn(),
-  showToast: vi.fn(),
-}));
-
-vi.mock("@yaakapp-internal/sync", () => mocks);
-vi.mock("@yaakapp-internal/models", () => ({
-  createWorkspaceModel: vi.fn(),
-  modelTypeLabel: () => "Request",
-}));
-vi.mock("@yaakapp-internal/ui", () => ({
-  Banner: "div",
-  InlineCode: "code",
-  Table: "table",
-  TableBody: "tbody",
-  TableCell: "td",
-  TableHead: "thead",
-  TableHeaderCell: "th",
-  TableRow: "tr",
-  TruncatedWideTableCell: "td",
-}));
-vi.mock("../components/core/Button", () => ({ Button: "button" }));
-vi.mock("../hooks/useActiveWorkspace", () => ({ activeWorkspaceIdAtom: null }));
-vi.mock("../lib/dialog", () => mocks);
-vi.mock("../lib/jotai", () => ({ jotaiStore: { get: vi.fn() } }));
-vi.mock("../lib/prompt", () => ({ showPrompt: vi.fn() }));
-vi.mock("../lib/resolvedModelName", () => ({ resolvedModelNameWithFolders: () => "Request" }));
-vi.mock("../lib/toast", () => mocks);
-
-const staleToast = expect.objectContaining({
-  message: "Files changed while syncing. Review the changes again.",
-});
-
-const params = { workspaceId: "wk_test", syncDir: "/sync" };
-const deletion = {
-  type: "dbDelete",
-  model: { id: "rq_test", model: "http_request" },
-  state: {},
-} as Extract<SyncOp, { type: "dbDelete" }>;
-const update = {
-  type: "dbUpdate",
-  model: { id: "rq_test", model: "http_request" },
-  fs: { model: { id: "rq_test", model: "http_request", name: "Updated" } },
-  state: {},
-} as Extract<SyncOp, { type: "dbUpdate" }>;
-
-async function submit(dialog: DialogInstance) {
-  const render = dialog.render as FunctionComponent<{ hide: () => void }>;
-  const form = render({ hide: () => mocks.hideDialog(dialog.id) }) as ReactElement<{
-    onSubmit: (event: { preventDefault: () => void }) => Promise<void>;
-  }>;
-  await form.props.onSubmit({ preventDefault: vi.fn() });
-}
-
-function latestDialog() {
-  const dialog = mocks.showDialog.mock.calls.at(-1)?.[0];
-  if (dialog == null) throw new Error("Expected a sync dialog");
-  return dialog;
-}
-
-beforeEach(() => {
-  vi.resetAllMocks();
-  mocks.applySync.mockResolvedValue(true);
-});
-
-test("closes an obsolete dialog when the restored file leaves no changes", async () => {
-  mocks.calculateSync.mockResolvedValueOnce([deletion]).mockResolvedValueOnce([]);
-  await syncWorkspace.mutateAsync(params);
-  mocks.applySync.mockResolvedValueOnce(false);
-
-  await submit(latestDialog());
-
-  expect(mocks.applySync).toHaveBeenCalledTimes(1);
-  expect(mocks.applySync).toHaveBeenCalledWith(params.workspaceId, params.syncDir, [deletion]);
-  expect(mocks.hideDialog).toHaveBeenCalledWith("commit-sync");
-  expect(mocks.showDialog).toHaveBeenCalledTimes(1);
-});
-
-test("requires another confirmation for a changed plan", async () => {
-  mocks.calculateSync.mockResolvedValueOnce([deletion]).mockResolvedValueOnce([update]);
-  await syncWorkspace.mutateAsync(params);
-  const original = latestDialog();
-  mocks.applySync.mockResolvedValueOnce(false);
-
-  await submit(original);
-
-  expect(mocks.applySync).toHaveBeenCalledTimes(1);
-  expect(mocks.showDialog).toHaveBeenCalledTimes(2);
-  expect(mocks.showToast).toHaveBeenCalledWith(staleToast);
-  expect(mocks.hideDialog).not.toHaveBeenCalled();
-  await submit(latestDialog());
-  expect(mocks.applySync).toHaveBeenLastCalledWith(params.workspaceId, params.syncDir, [update]);
-  expect(mocks.hideDialog).toHaveBeenCalledWith("commit-sync");
-});
-
-test("applies an unchanged reviewed plan and closes the dialog", async () => {
-  mocks.calculateSync.mockResolvedValue([update]);
-  await syncWorkspace.mutateAsync(params);
-  await submit(latestDialog());
-
-  expect(mocks.calculateSync).toHaveBeenCalledTimes(1);
-  expect(mocks.applySync).toHaveBeenCalledTimes(1);
-  expect(mocks.hideDialog).toHaveBeenCalledWith("commit-sync");
-});
-
-test("forced sync retries the current plan without requesting another confirmation", async () => {
-  mocks.calculateSync.mockResolvedValueOnce([deletion]).mockResolvedValueOnce([update]);
-  mocks.applySync.mockResolvedValueOnce(false);
-
-  await syncWorkspace.mutateAsync({ ...params, force: true });
-
-  expect(mocks.applySync).toHaveBeenCalledTimes(2);
-  expect(mocks.applySync).toHaveBeenLastCalledWith(params.workspaceId, params.syncDir, [update]);
-  expect(mocks.showDialog).not.toHaveBeenCalled();
-});
-
-test("outbound-only changes clear the old dialog and sync automatically", async () => {
-  const outbound = { type: "fsUpdate", model: update.model, state: {} } as SyncOp;
-  mocks.calculateSync.mockResolvedValueOnce([deletion]).mockResolvedValueOnce([outbound]);
-  await syncWorkspace.mutateAsync(params);
-  await syncWorkspace.mutateAsync(params);
-
-  expect(mocks.applySync).toHaveBeenCalledWith(params.workspaceId, params.syncDir, [outbound]);
-  expect(mocks.hideDialog).toHaveBeenCalledWith("commit-sync");
-  expect(mocks.showDialog).toHaveBeenCalledTimes(1);
-});
-
-test("stops retrying a plan that keeps going stale", async () => {
-  mocks.calculateSync.mockResolvedValue([update]);
-  mocks.applySync.mockResolvedValue(false);
-
-  await syncWorkspace.mutateAsync({ ...params, force: true });
-
-  expect(mocks.calculateSync).toHaveBeenCalledTimes(3);
-  expect(mocks.applySync).toHaveBeenCalledTimes(3);
-  expect(mocks.showToast).toHaveBeenCalledTimes(1);
-  expect(mocks.showToast).toHaveBeenCalledWith(staleToast);
-  expect(mocks.showDialog).not.toHaveBeenCalled();
-});
@@ -14,12 +14,11 @@ import {
 } from "@yaakapp-internal/ui";
 import { activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
 import { createFastMutation } from "../hooks/useFastMutation";
-import { hideDialog, showDialog } from "../lib/dialog";
+import { showDialog } from "../lib/dialog";
 import { jotaiStore } from "../lib/jotai";
+import { pluralizeCount } from "../lib/pluralize";
 import { showPrompt } from "../lib/prompt";
 import { resolvedModelNameWithFolders } from "../lib/resolvedModelName";
-import { showToast } from "../lib/toast";
-import { pluralizeCount } from "@yaakapp-internal/lib/pluralize";

 export const createFolder = createFastMutation<
  string | null,
@@ -53,48 +52,24 @@ export const createFolder = createFastMutation<
  },
 });

-// Files can keep changing under a plan, so stop recalculating after a few stale applies.
-const MAX_SYNC_ATTEMPTS = 3;
-
-function showStaleSyncToast() {
-  showToast({
-    id: "sync-stale",
-    color: "warning",
-    message: "Files changed while syncing. Review the changes again.",
-  });
-}
-
 export const syncWorkspace = createFastMutation<
  void,
  void,
-  { workspaceId: string; syncDir: string; force?: boolean; attempt?: number }
+  { workspaceId: string; syncDir: string; force?: boolean }
 >({
  mutationKey: [],
-  mutationFn: async ({ workspaceId, syncDir, force, attempt = 1 }) => {
+  mutationFn: async ({ workspaceId, syncDir, force }) => {
    const ops = (await calculateSync(workspaceId, syncDir)) ?? [];
    if (ops.length === 0) {
      console.log("Nothing to sync", workspaceId, syncDir);
-      hideDialog("commit-sync");
      return;
    }
    console.log("Syncing workspace", workspaceId, syncDir, ops);

    const dbOps = ops.filter((o) => o.type.startsWith("db"));

-    const apply = async () => {
-      if (await applySync(workspaceId, syncDir, ops)) {
-        hideDialog("commit-sync");
-      } else if (attempt < MAX_SYNC_ATTEMPTS) {
-        await syncWorkspace.mutateAsync({ workspaceId, syncDir, force, attempt: attempt + 1 });
-      } else {
-        hideDialog("commit-sync");
-        showStaleSyncToast();
-      }
-    };
-
-    if (dbOps.length === 0 || force) {
-      hideDialog("commit-sync");
-      await apply();
+    if (dbOps.length === 0) {
+      await applySync(workspaceId, syncDir, ops);
      return;
    }

@@ -104,8 +79,9 @@ export const syncWorkspace = createFastMutation<

    console.log("Directory changes detected", { dbOps, ops });

-    if (attempt > 1) {
-      showStaleSyncToast();
+    if (force) {
+      await applySync(workspaceId, syncDir, ops);
+      return;
    }

    showDialog({
@@ -117,7 +93,8 @@ export const syncWorkspace = createFastMutation<
          className="h-full grid grid-rows-[auto_auto_minmax(0,1fr)_auto] gap-3"
          onSubmit={async (e) => {
            e.preventDefault();
-            await apply();
+            await applySync(workspaceId, syncDir, ops);
+            hide();
          }}
        >
          {isDeletingWorkspace ? (
@@ -6,12 +6,11 @@ import { showDialog } from "../lib/dialog";
 import { jotaiStore } from "../lib/jotai";
 import { setWorkspaceSearchParams } from "../lib/setWorkspaceSearchParams";

-/**
- * Prompt for and create a sub-environment of the given base environment, resolving with the new
- * environment's ID (or null if the dialog was dismissed). This does not change the workspace's
- * active environment.
- */
-export const createSubEnvironment = createFastMutation<string | null, unknown, Environment | null>({
+export const createSubEnvironmentAndActivate = createFastMutation<
+  string | null,
+  unknown,
+  Environment | null
+>({
  mutationKey: ["create_environment"],
  mutationFn: async (baseEnvironment) => {
    if (baseEnvironment == null) {
@@ -42,17 +41,6 @@ export const createSubEnvironment = createFastMutation<string | null, unknown, E
      });
    });
  },
-});
-
-/** Same as {@link createSubEnvironment}, but also makes the new environment the active one. */
-export const createSubEnvironmentAndActivate = createFastMutation<
-  string | null,
-  unknown,
-  Environment | null
->({
-  mutationKey: ["create_environment_and_activate"],
-  mutationFn: (baseEnvironment) => createSubEnvironment.mutateAsync(baseEnvironment),
-  disableToastError: true, // Already shown by createSubEnvironment
  onSuccess: async (environmentId) => {
    if (environmentId == null) {
      return; // Was not created
@@ -1,52 +0,0 @@
-import type { HttpRequest } from "@yaakapp-internal/models";
-import { patchModelById } from "@yaakapp-internal/models";
-import { activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
-import { createFastMutation } from "../hooks/useFastMutation";
-import { wasUpdatedExternally } from "../hooks/useRequestUpdateKey";
-import { createRequestAndNavigate } from "../lib/createRequestAndNavigate";
-import { jotaiStore } from "../lib/jotai";
-import { rpc } from "../lib/rpc";
-import { showToast } from "../lib/toast";
-
-export function looksLikeCurl(text: string) {
-  return text.trim().startsWith("curl ");
-}
-
-export const importCurl = createFastMutation<
-  void,
-  string,
-  { overwriteRequestId?: string; command: string }
->({
-  mutationKey: ["import_curl"],
-  mutationFn: async ({ overwriteRequestId, command }) => {
-    const workspaceId = jotaiStore.get(activeWorkspaceIdAtom);
-    const importedRequest: HttpRequest = await rpc("cmd_curl_to_request", {
-      command,
-      workspaceId,
-    });
-
-    let verb: string;
-    if (overwriteRequestId == null) {
-      verb = "Created";
-      await createRequestAndNavigate(importedRequest);
-    } else {
-      verb = "Updated";
-      await patchModelById(importedRequest.model, overwriteRequestId, (r: HttpRequest) => ({
-        ...importedRequest,
-        id: r.id,
-        createdAt: r.createdAt,
-        workspaceId: r.workspaceId,
-        folderId: r.folderId,
-        name: r.name,
-        sortPriority: r.sortPriority,
-      }));
-
-      setTimeout(() => wasUpdatedExternally(overwriteRequestId), 100);
-    }
-
-    showToast({
-      color: "success",
-      message: `${verb} request from Curl`,
-    });
-  },
-});
@@ -3,9 +3,9 @@ import type { GrpcRequest, HttpRequest, WebsocketRequest } from "@yaakapp-intern
 import { MoveToWorkspaceDialog } from "../components/MoveToWorkspaceDialog";
 import { activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
 import { createFastMutation } from "../hooks/useFastMutation";
+import { pluralizeCount } from "../lib/pluralize";
 import { showDialog } from "../lib/dialog";
 import { jotaiStore } from "../lib/jotai";
-import { pluralizeCount } from "@yaakapp-internal/lib/pluralize";

 export const moveToWorkspace = createFastMutation({
  mutationKey: ["move_workspace"],
@@ -10,7 +10,7 @@ export function openFolderSettings(folderId: string, tab?: FolderSettingsTab) {
    id: "folder-settings",
    title: null,
    size: "lg",
-    className: "h-200",
+    className: "h-[50rem]",
    noPadding: true,
    render: () => <FolderSettingsDialog folderId={folderId} tab={tab} />,
  });
@@ -1,44 +1,26 @@
-import { platform } from "@yaakapp-internal/platform";
-import type { SettingsTab, SettingsTabWithSubtab } from "../components/Settings/Settings";
+import type { SettingsTab } from "../components/Settings/Settings";
 import { activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
 import { createFastMutation } from "../hooks/useFastMutation";
-import { showDialog } from "../lib/dialog";
 import { jotaiStore } from "../lib/jotai";
 import { router } from "../lib/router";
-import { rpc } from "../lib/rpc";
+import { invokeCmd } from "../lib/tauri";

-export const openSettings = createFastMutation<void, string, SettingsTabWithSubtab | null>({
+// Allow tab with optional subtab (e.g., "plugins:installed")
+type SettingsTabWithSubtab = SettingsTab | `${SettingsTab}:${string}` | null;
+
+export const openSettings = createFastMutation<void, string, SettingsTabWithSubtab>({
  mutationKey: ["open_settings"],
  mutationFn: async (tab) => {
    const workspaceId = jotaiStore.get(activeWorkspaceIdAtom);
    if (workspaceId == null) return;

-    // Settings is its own window where the host has windows to give. Where it
-    // doesn't — a browser tab — it's a dialog like any other, so opening it
-    // doesn't take you away from the request you were working on.
-    if (!platform.capabilities.multiWindow) {
-      // Imported here so Settings stays out of the startup bundle, the way the
-      // route that renders it on desktop already keeps it
-      const { default: Settings } = await import("../components/Settings/Settings");
-      showDialog({
-        id: "settings",
-        size: "md",
-        className: "h-[calc(100vh-5rem)] max-h-150! overflow-hidden",
-        noPadding: true,
-        noScroll: true,
-        // Keyed so opening a specific tab while the dialog is already up moves to it
-        render: ({ hide }) => <Settings key={tab ?? "general"} tab={tab} hide={hide} />,
-      });
-      return;
-    }
-
    const location = router.buildLocation({
      to: "/workspaces/$workspaceId/settings",
      params: { workspaceId },
      search: { tab: (tab ?? undefined) as SettingsTab | undefined },
    });

-    await rpc("cmd_new_child_window", {
+    await invokeCmd("cmd_new_child_window", {
      url: location.href,
      label: "settings",
      title: "Yaak Settings",
@@ -17,7 +17,7 @@ export const openWorkspaceFromSyncDir = createFastMutation<void, void, string>({
      return;
    }

-    await applySync(workspace.id, dir, ops, { fsOnly: true });
+    await applySync(workspace.id, dir, ops);

    await router.navigate({
      to: "/workspaces/$workspaceId",
@@ -1,10 +1,9 @@
-import { platform } from "@yaakapp-internal/platform";
 import { createFastMutation } from "../hooks/useFastMutation";
 import { getRecentCookieJars } from "../hooks/useRecentCookieJars";
 import { getRecentEnvironments } from "../hooks/useRecentEnvironments";
 import { getRecentRequests } from "../hooks/useRecentRequests";
 import { router } from "../lib/router";
-import { rpc } from "../lib/rpc";
+import { invokeCmd } from "../lib/tauri";

 export const switchWorkspace = createFastMutation<
  void,
@@ -25,15 +24,13 @@ 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 },
        search,
      });
-      await rpc<void>("cmd_new_main_window", { url: location.href });
+      await invokeCmd<void>("cmd_new_main_window", { url: location.href });
      return;
    }

@@ -38,7 +38,7 @@ export function BinaryFileEditor({
    <VStack space={2}>
      <SelectFile onChange={handleChange} filePath={filePath} />
      {filePath != null && mimeType !== contentType && !ignoreContentType.value && (
-        <Banner className="mt-3 py-5!">
+        <Banner className="mt-3 !py-5">
          <div className="mb-4 text-center">
            <div>Set Content-Type header</div>
            <InlineCode>{mimeType}</InlineCode> for current request?
@@ -1,99 +0,0 @@
-import { platform } from "@yaakapp-internal/platform";
-import {
-  Banner,
-  type EditorHost,
-  EditorHostProvider,
-  EmptyStateText,
-  type HostBodyViewerArgs,
-  type HttpBodyLoader,
-  LoadingIcon,
-  type StoredValue,
-  type StoredValueNamespace,
-} from "@yaakapp-internal/ui";
-import { lazy, type ReactNode, Suspense } from "react";
-import { useKeyValue } from "../hooks/useKeyValue";
-import { copyToClipboard } from "../lib/copy";
-import { showDialog } from "../lib/dialog";
-import { showPrompt } from "../lib/prompt";
-import { useDetailsBannerStoredValue } from "./core/DetailsBanner";
-import { Editor } from "./core/Editor/LazyEditor";
-import { Input } from "./core/Input";
-import { ErrorBoundary } from "./ErrorBoundary";
-import { MultipartViewer } from "./responseViewers/MultipartViewer";
-import { TextViewer } from "./responseViewers/TextViewer";
-import { SelectFile } from "./SelectFile";
-
-const PdfViewer = lazy(() =>
-  import("./responseViewers/PdfViewer").then((m) => ({ default: m.PdfViewer })),
-);
-
-function useClientStoredValue<T extends StoredValue>(
-  key: string | string[] | null,
-  fallback: T,
-  namespace: StoredValueNamespace = "global",
-) {
-  // A null key is never written by the shared components, so any stable key will do
-  const { value, set } = useKeyValue<T>({ namespace, key: key ?? ["tabs", "default"], fallback });
-  return [value ?? fallback, set] as const;
-}
-
-function renderBodyViewer({ source, mimeType, body, complete }: HostBodyViewerArgs) {
-  if (!mimeType?.match(/pdf/i)) return null;
-  return source === "response" ? (
-    <PdfResponseBody body={body} complete={complete} />
-  ) : (
-    <PdfRequestBody body={body} />
-  );
-}
-
-/** Waits for the whole response, then loads the PDF from its file */
-function PdfResponseBody({ body, complete }: { body: HttpBodyLoader; complete: boolean }) {
-  const bodyUrl = body.useUrl(complete);
-
-  if (!complete || bodyUrl.isLoading) {
-    return (
-      <EmptyStateText>
-        <LoadingIcon />
-      </EmptyStateText>
-    );
-  }
-  if (bodyUrl.error) {
-    return <Banner color="danger">{String(bodyUrl.error)}</Banner>;
-  }
-  if (bodyUrl.data == null) {
-    return <div>Empty response body</div>;
-  }
-  return <PdfViewer bodyUrl={bodyUrl.data} />;
-}
-
-function PdfRequestBody({ body }: { body: HttpBodyLoader }) {
-  const bytes = body.useBytes();
-  if (bytes.data == null) return null;
-  return (
-    <Suspense fallback={<LoadingIcon />}>
-      <PdfViewer data={bytes.data} />
-    </Suspense>
-  );
-}
-
-const clientEditorHost: EditorHost = {
-  Editor,
-  Input,
-  SelectFile,
-  showDialog,
-  showPrompt,
-  basename: (path) => platform.files.basename(path),
-  useStoredValue: useClientStoredValue,
-  useDetailsBannerStoredValue,
-  ErrorBoundary,
-  TextViewer,
-  MultipartViewer,
-  renderBodyViewer,
-  openUrl: (url) => platform.openUrl(url),
-  copy: (text) => copyToClipboard(text, { disableToast: true }),
-};
-
-/** Gives the shared editing components the client's templated editor, dialogs and storage */
-export function ClientEditorHost({ children }: { children: ReactNode }) {
-  return <EditorHostProvider value={clientEditorHost}>{children}</EditorHostProvider>;
-}
@@ -1,16 +1,15 @@
+import { open } from "@tauri-apps/plugin-dialog";
 import { gitClone } from "@yaakapp-internal/git";
 import { Banner, VStack } from "@yaakapp-internal/ui";
-import { useId, useState } from "react";
+import { useState } from "react";
 import { openWorkspaceFromSyncDir } from "../commands/openWorkspaceFromSyncDir";
 import { appInfo } from "../lib/appInfo";
-import { CommercialUseBanner } from "./CommercialUseBanner";
 import { showErrorToast } from "../lib/toast";
+import { Button } from "./core/Button";
 import { Checkbox } from "./core/Checkbox";
-import { DialogFooter } from "./core/Dialog";
 import { IconButton } from "./core/IconButton";
 import { PlainInput } from "./core/PlainInput";
 import { promptCredentials } from "./git/credentials";
-import { platform } from "@yaakapp-internal/platform";

 interface Props {
  hide: () => void;
@@ -29,7 +28,6 @@ export function CloneGitRepositoryDialog({ hide }: Props) {
  const [subdirectory, setSubdirectory] = useState<string>("");
  const [isCloning, setIsCloning] = useState(false);
  const [error, setError] = useState<string | null>(null);
-  const formId = useId();

  const repoName = extractRepoName(url);
  const sep = getPathSeparator(baseDirectory);
@@ -39,7 +37,7 @@ export function CloneGitRepositoryDialog({ hide }: Props) {
    hasSubdirectory && subdirectory ? `${directory}${sep}${subdirectory}` : directory;

  const handleSelectDirectory = async () => {
-    const dir = await platform.dialog.open({
+    const dir = await open({
      title: "Select Directory",
      directory: true,
      multiple: false,
@@ -84,15 +82,13 @@ export function CloneGitRepositoryDialog({ hide }: Props) {
  };

  return (
-    <VStack as="form" id={formId} space={3} alignItems="start" onSubmit={handleClone}>
+    <VStack as="form" space={3} alignItems="start" className="pb-3" onSubmit={handleClone}>
      {error && (
        <Banner color="danger" className="w-full">
          {error}
        </Banner>
      )}

-      <CommercialUseBanner source="git-clone" title="Using Git for work?" />
-
      <PlainInput
        required
        label="Repository URL"
@@ -109,7 +105,7 @@ export function CloneGitRepositoryDialog({ hide }: Props) {
        rightSlot={
          <IconButton
            size="xs"
-            className="mr-0.5 h-auto! my-0.5"
+            className="mr-0.5 !h-auto my-0.5"
            icon="folder"
            title="Browse"
            onClick={handleSelectDirectory}
@@ -133,17 +129,15 @@ export function CloneGitRepositoryDialog({ hide }: Props) {
        />
      )}

-      <DialogFooter
-        actions={[
-          {
-            label: isCloning ? "Cloning..." : "Clone Repository",
-            color: "primary",
-            form: formId,
-            disabled: !url || !directory || isCloning,
-            isLoading: isCloning,
-          },
-        ]}
-      />
+      <Button
+        type="submit"
+        color="primary"
+        className="w-full mt-3"
+        disabled={!url || !directory || isCloning}
+        isLoading={isCloning}
+      >
+        {isCloning ? "Cloning..." : "Clone Repository"}
+      </Button>
    </VStack>
  );
 }
@@ -11,7 +11,7 @@ export function ColorIndicator({ color, onClick, className }: Props) {
  const style: CSSProperties = { backgroundColor: color ?? undefined };
  const finalClassName = classNames(
    className,
-    "inline-block w-[0.75em] h-[0.75em] rounded-full mr-1.5 border border-transparent shrink-0",
+    "inline-block w-[0.75em] h-[0.75em] rounded-full mr-1.5 border border-transparent flex-shrink-0",
  );

  if (onClick) {
@@ -439,7 +439,7 @@ export function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
          name="command"
          label="Command"
          placeholder="Search or type a command"
-          className="font-sans text-base!"
+          className="font-sans !text-base"
          defaultValue={command}
          onChange={handleSetCommand}
          onKeyDownCapture={handleKeyDown}
@@ -448,7 +448,7 @@ export function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
      <div className="h-full px-1.5 overflow-y-auto pt-2 pb-1">
        {filteredGroups.map((g) => (
          <div key={g.key} className="mb-1.5 w-full">
-            <Heading level={2} className="text-xs! uppercase px-1.5 h-sm flex items-center">
+            <Heading level={2} className="!text-xs uppercase px-1.5 h-sm flex items-center">
              {g.label}
            </Heading>
            {g.items.map((v) => (
@@ -491,7 +491,7 @@ function CommandPaletteItem({
      color="custom"
      justify="start"
      className={classNames(
-        "w-full h-sm flex items-center rounded-sm px-1.5",
+        "w-full h-sm flex items-center rounded px-1.5",
        "hover:text-text",
        active && "bg-surface-highlight",
        !active && "text-text-subtle",
@@ -1,129 +0,0 @@
-import { checkLicense } from "@yaakapp-internal/license";
-import { useCallback, useEffect, useRef, useState } from "react";
-import { useKeyValue } from "../hooks/useKeyValue";
-import { appInfo } from "../lib/appInfo";
-import { pricingUrl } from "../lib/pricingUrl";
-import { DismissibleBanner } from "./core/DismissibleBanner";
-import { platform } from "@yaakapp-internal/platform";
-
-const COMMERCIAL_USE_SNOOZE_MS = 7 * 24 * 60 * 60 * 1000;
-const COMMERCIAL_USE_BANNER_MESSAGE =
-  "Personal use of Yaak is free. If you’re using Yaak at work, please purchase a license.";
-
-export function CommercialUseBanner({
-  source,
-  title,
-}: {
-  source: string;
-  title: string;
-}) {
-  const [visible, setVisible] = useState(false);
-  const snoozeStartedRef = useRef(false);
-  const {
-    isLoading: isSnoozeLoading,
-    set: setSnoozedAt,
-    value: snoozedAt,
-  } = useKeyValue<string | null>({
-    namespace: "global",
-    key: "commercial-use-banner-snoozed-at",
-    fallback: null,
-  });
-
-  useEffect(() => {
-    let canceled = false;
-
-    shouldShowCommercialUsePrompt()
-      .then((shouldShow) => {
-        if (!canceled) setVisible(shouldShow);
-      })
-      .catch(console.error);
-
-    return () => {
-      canceled = true;
-    };
-  }, [source]);
-
-  const snoozed = isSnoozed(snoozedAt, COMMERCIAL_USE_SNOOZE_MS);
-  const handleShow = useCallback(() => {
-    if (snoozeStartedRef.current || snoozed) {
-      return;
-    }
-
-    snoozeStartedRef.current = true;
-    setSnoozedAt(JSON.stringify({ source, at: new Date().toISOString() })).catch(console.error);
-  }, [setSnoozedAt, snoozed, source]);
-
-  if (!visible || isSnoozeLoading || (snoozed && !snoozeStartedRef.current)) {
-    return null;
-  }
-
-  return (
-    <div className="w-full">
-      <DismissibleBanner
-        id={`commercial-use:${source}`}
-        color="info"
-        className="w-full"
-        onDismiss={() =>
-          setSnoozedAt(JSON.stringify({ source, at: new Date().toISOString() }))
-        }
-        onShow={handleShow}
-        actions={[
-          {
-            label: "Purchase License",
-            color: "info",
-            variant: "solid",
-            onClick: () => {
-              openCommercialUsePricing(source).catch(console.error);
-            },
-          },
-        ]}
-      >
-        <div className="text-sm">
-          <p className="font-semibold text-text">{title}</p>
-          <p className="mt-0.5 text-text-subtle">{COMMERCIAL_USE_BANNER_MESSAGE}</p>
-        </div>
-      </DismissibleBanner>
-    </div>
-  );
-}
-
-async function shouldShowCommercialUsePrompt(): Promise<boolean> {
-  // Open-source builds omit the Rust license plugin, so never show commercial-use prompts there.
-  if (appInfo.featureLicense !== true) {
-    return false;
-  }
-
-  try {
-    const license = await checkLicense();
-    return license.status === "personal_use";
-  } catch (err) {
-    console.log("Failed to check license before commercial-use prompt", err);
-    return false;
-  }
-}
-
-async function openCommercialUsePricing(source: string): Promise<void> {
-  await platform.openUrl(pricingUrl(`app.commercial-use.${source}`)).catch(console.error);
-}
-
-function isSnoozed(value: string | null, ms: number): boolean {
-  if (value == null) return false;
-
-  try {
-    const snooze = JSON.parse(value) as { at?: unknown };
-    const at = typeof snooze.at === "string" ? snooze.at : null;
-    return isWithinMs(at, ms);
-  } catch {
-    // Older builds stored only the timestamp, so keep respecting that as a global snooze.
-    return isWithinMs(value, ms);
-  }
-}
-
-function isWithinMs(date: string | null, ms: number): boolean {
-  if (date == null) return false;
-
-  const time = new Date(date).getTime();
-  if (Number.isNaN(time)) return false;
-
-  return Date.now() - time < ms;
-}
@@ -1,11 +1,12 @@
 import type { HttpRequest } from "@yaakapp-internal/models";
 import { patchModel } from "@yaakapp-internal/models";
-import { Banner, HStack, InlineCode, SizeTag } from "@yaakapp-internal/ui";
+import { Banner, HStack, InlineCode } from "@yaakapp-internal/ui";
 import type { ReactNode } from "react";
 import { useToggle } from "../hooks/useToggle";
 import { showConfirm } from "../lib/confirm";
 import { Button } from "./core/Button";
 import { Link } from "./core/Link";
+import { SizeTag } from "./core/SizeTag";

 interface Props {
  children: ReactNode;
@@ -0,0 +1,61 @@
+import type { HttpResponse } from "@yaakapp-internal/models";
+import { Banner, HStack, InlineCode } from "@yaakapp-internal/ui";
+import { type ReactNode, useMemo } from "react";
+import { useSaveResponse } from "../hooks/useSaveResponse";
+import { useToggle } from "../hooks/useToggle";
+import { isProbablyTextContentType } from "../lib/contentType";
+import { getContentTypeFromHeaders } from "../lib/model_util";
+import { getResponseBodyText } from "../lib/responseBody";
+import { CopyButton } from "./CopyButton";
+import { Button } from "./core/Button";
+import { SizeTag } from "./core/SizeTag";
+
+interface Props {
+  children: ReactNode;
+  response: HttpResponse;
+}
+
+const LARGE_BYTES = 2 * 1000 * 1000;
+
+export function ConfirmLargeResponse({ children, response }: Props) {
+  const { mutate: saveResponse } = useSaveResponse(response);
+  const [showLargeResponse, toggleShowLargeResponse] = useToggle();
+  const isProbablyText = useMemo(() => {
+    const contentType = getContentTypeFromHeaders(response.headers);
+    return isProbablyTextContentType(contentType);
+  }, [response.headers]);
+
+  const contentLength = response.contentLength ?? 0;
+  const isLarge = contentLength > LARGE_BYTES;
+  if (!showLargeResponse && isLarge) {
+    return (
+      <Banner color="primary" className="flex flex-col gap-3">
+        <p>
+          Showing responses over{" "}
+          <InlineCode>
+            <SizeTag contentLength={LARGE_BYTES} />
+          </InlineCode>{" "}
+          may impact performance
+        </p>
+        <HStack wrap space={2}>
+          <Button color="primary" size="xs" onClick={toggleShowLargeResponse}>
+            Reveal Response
+          </Button>
+          <Button color="secondary" variant="border" size="xs" onClick={() => saveResponse()}>
+            Save to File
+          </Button>
+          {isProbablyText && (
+            <CopyButton
+              color="secondary"
+              variant="border"
+              size="xs"
+              text={() => getResponseBodyText({ response, filter: null })}
+            />
+          )}
+        </HStack>
+      </Banner>
+    );
+  }
+
+  return <>{children}</>;
+}
@@ -0,0 +1,56 @@
+import type { HttpResponse } from "@yaakapp-internal/models";
+import { Banner, HStack, InlineCode } from "@yaakapp-internal/ui";
+import { type ReactNode, useMemo } from "react";
+import { getRequestBodyText as getHttpResponseRequestBodyText } from "../hooks/useHttpRequestBody";
+import { useToggle } from "../hooks/useToggle";
+import { isProbablyTextContentType } from "../lib/contentType";
+import { getContentTypeFromHeaders } from "../lib/model_util";
+import { CopyButton } from "./CopyButton";
+import { Button } from "./core/Button";
+import { SizeTag } from "./core/SizeTag";
+
+interface Props {
+  children: ReactNode;
+  response: HttpResponse;
+}
+
+const LARGE_BYTES = 2 * 1000 * 1000;
+
+export function ConfirmLargeResponseRequest({ children, response }: Props) {
+  const [showLargeResponse, toggleShowLargeResponse] = useToggle();
+  const isProbablyText = useMemo(() => {
+    const contentType = getContentTypeFromHeaders(response.headers);
+    return isProbablyTextContentType(contentType);
+  }, [response.headers]);
+
+  const contentLength = response.requestContentLength ?? 0;
+  const isLarge = contentLength > LARGE_BYTES;
+  if (!showLargeResponse && isLarge) {
+    return (
+      <Banner color="primary" className="flex flex-col gap-3">
+        <p>
+          Showing content over{" "}
+          <InlineCode>
+            <SizeTag contentLength={LARGE_BYTES} />
+          </InlineCode>{" "}
+          may impact performance
+        </p>
+        <HStack wrap space={2}>
+          <Button color="primary" size="xs" onClick={toggleShowLargeResponse}>
+            Reveal Request Body
+          </Button>
+          {isProbablyText && (
+            <CopyButton
+              color="secondary"
+              variant="border"
+              size="xs"
+              text={() => getHttpResponseRequestBodyText(response).then((d) => d?.bodyText ?? "")}
+            />
+          )}
+        </HStack>
+      </Banner>
+    );
+  }
+
+  return <>{children}</>;
+}
@@ -1,26 +0,0 @@
-import { useAtomValue } from "jotai";
-import { contextMenusAtom, hideContextMenu } from "../lib/contextMenu";
-import { ContextMenu } from "./core/Dropdown";
-import { ErrorBoundary } from "./ErrorBoundary";
-
-/** Renders menus opened by {@link showContextMenu}, the way {@link Dialogs} renders dialogs. */
-export function ContextMenus() {
-  const menus = useAtomValue(contextMenusAtom);
-  return (
-    <>
-      {menus.map(({ id, items, triggerPosition, triggerRect, triggerEl }) => (
-        <ErrorBoundary key={id} name={`ContextMenu ${id}`}>
-          <ContextMenu
-            items={items}
-            triggerPosition={triggerPosition}
-            triggerRect={triggerRect}
-            // The trigger isn't a React component here, so it arrives as an element and gets
-            // wrapped to look like the ref the menu expects
-            triggerRef={{ current: triggerEl ?? null }}
-            onClose={() => hideContextMenu(id)}
-          />
-        </ErrorBoundary>
-      ))}
-    </>
-  );
-}
@@ -25,13 +25,12 @@ import {
  TableHeaderCell,
  TableRow,
  TruncatedWideTableCell,
-  KeyValueRows,
 } from "@yaakapp-internal/ui";
 import { IconButton } from "./core/IconButton";
 import { Checkbox } from "./core/Checkbox";
 import classNames from "classnames";
 import { EventDetailHeader } from "./core/EventViewer";
-import { KeyValueRow } from "./core/KeyValueRow";
+import { KeyValueRow, KeyValueRows } from "./core/KeyValueRow";
 import { EmptyStateText } from "./EmptyStateText";
 import { PlainInput } from "./core/PlainInput";
 import { Select } from "./core/Select";
@@ -131,7 +130,7 @@ export const CookieDialog = ({ cookieJarId }: Props) => {
      return key !== nextCookieKey;
    });

-    void patchModel(cookieJar, { cookies: [...nextCookies, nextCookie] });
+    patchModel(cookieJar, { cookies: [...nextCookies, nextCookie] });
    setSelectedCookieKey(nextCookieKey);
    setEditingCookieKey(null);
    setDraftCookie(null);
@@ -156,7 +155,7 @@ export const CookieDialog = ({ cookieJarId }: Props) => {
          rightSlot={
            filter.length > 0 && (
              <IconButton
-                className="bg-transparent! h-auto! min-h-full opacity-50 hover:opacity-100 -mr-1"
+                className="!bg-transparent !h-auto min-h-full opacity-50 hover:opacity-100 -mr-1"
                icon="x"
                title="Clear filter"
                onClick={() => {
@@ -211,7 +210,7 @@ export const CookieDialog = ({ cookieJarId }: Props) => {
                          setEditingCookieKey(null);
                          setDraftCookie(null);
                          setDraftExpiresInput("");
-                          void patchModel(cookieJar, { cookies: [] });
+                          patchModel(cookieJar, { cookies: [] });
                        }}
                      />
                    </TableHeaderCell>
@@ -240,7 +239,7 @@ export const CookieDialog = ({ cookieJarId }: Props) => {
                        <TableCell className={classNames("pl-2", isSelected && "rounded-l")}>
                          {c.name}
                        </TableCell>
-                        <TruncatedWideTableCell className="min-w-40">
+                        <TruncatedWideTableCell className="min-w-[10rem]">
                          {c.value}
                        </TruncatedWideTableCell>
                        <TableCell>{cookieDomain(c)}</TableCell>
@@ -277,7 +276,7 @@ export const CookieDialog = ({ cookieJarId }: Props) => {
                                setDraftCookie(null);
                                setDraftExpiresInput("");
                              }
-                              void patchModel(cookieJar, {
+                              patchModel(cookieJar, {
                                cookies: cookieJar.cookies.filter(
                                  (c2: Cookie) => cookieKey(c2) !== key,
                                ),
@@ -548,7 +547,7 @@ function CookieEditor({
 }

 function CookieKeyValueRow({ labelClassName, ...props }: ComponentProps<typeof KeyValueRow>) {
-  return <KeyValueRow labelClassName={classNames("w-28", labelClassName)} {...props} />;
+  return <KeyValueRow labelClassName={classNames("w-[7rem]", labelClassName)} {...props} />;
 }

 function CookieTextInput({
@@ -571,8 +570,6 @@ function CookieTextInput({
  return (
    <input
      autoFocus={autoFocus}
-      autoCapitalize="off"
-      autoCorrect="off"
      className={cookieInputClassName}
      disabled={disabled}
      onChange={(event) => onChange(event.target.value)}
@@ -588,9 +585,7 @@ function CookieTextInput({
 function CookieTextarea({ onChange, value }: { onChange: (value: string) => void; value: string }) {
  return (
    <textarea
-      autoCapitalize="off"
-      autoCorrect="off"
-      className={classNames(cookieInputClassName, "min-h-20 resize-y")}
+      className={classNames(cookieInputClassName, "min-h-[5rem] resize-y")}
      onChange={(event) => onChange(event.target.value)}
      value={value}
    />
@@ -601,7 +596,7 @@ const NEW_COOKIE_KEY = "__new-cookie__";
 const NON_EMPTY_INPUT_PATTERN = ".*\\S.*";
 const cookieInputClassName = classNames(
  "x-theme-input w-full min-w-0 min-h-sm rounded-md bg-transparent",
-  "border border-border-subtle outline-hidden",
+  "border border-border-subtle outline-none",
  "px-2 text-xs font-mono cursor-text placeholder:text-placeholder",
  "focus:border-border-focus invalid:border-danger",
  "disabled:opacity-disabled disabled:border-dotted",
@@ -1,22 +1,31 @@
-import {
-  CopyIconButton as BaseCopyIconButton,
-  type CopyIconButtonProps,
-} from "@yaakapp-internal/ui";
+import { IconButton, type IconButtonProps, useTimedBoolean } from "@yaakapp-internal/ui";
 import { copyToClipboard } from "../lib/copy";
 import { showToast } from "../lib/toast";

-export function CopyIconButton(props: Omit<CopyIconButtonProps, "copy" | "onCopyFailed">) {
-  return <BaseCopyIconButton {...props} copy={copy} onCopyFailed={showCopyFailed} />;
+interface Props extends Omit<IconButtonProps, "onClick" | "icon"> {
+  text: string | (() => Promise<string | null>);
 }

-function copy(text: string) {
-  copyToClipboard(text, { disableToast: true });
-}
-
-function showCopyFailed() {
-  showToast({
-    id: "failed-to-copy",
-    color: "danger",
-    message: "Failed to copy",
-  });
+export function CopyIconButton({ text, ...props }: Props) {
+  const [copied, setCopied] = useTimedBoolean();
+  return (
+    <IconButton
+      {...props}
+      icon={copied ? "check" : "copy"}
+      showConfirm
+      onClick={async () => {
+        const content = typeof text === "function" ? await text() : text;
+        if (content == null) {
+          showToast({
+            id: "failed-to-copy",
+            color: "danger",
+            message: "Failed to copy",
+          });
+        } else {
+          copyToClipboard(content, { disableToast: true });
+          setCopied();
+        }
+      }}
+    />
+  );
 }
@@ -1,12 +1,12 @@
 import { createWorkspaceModel } from "@yaakapp-internal/models";
-import { useId, useState } from "react";
+import { useState } from "react";
 import { useToggle } from "../hooks/useToggle";
 import { ColorIndicator } from "./ColorIndicator";
+import { Button } from "./core/Button";
 import { Checkbox } from "./core/Checkbox";
 import { ColorPickerWithThemeColors } from "./core/ColorPicker";
-import { DialogFooter } from "./core/Dialog";
+import { Label } from "./core/Label";
 import { PlainInput } from "./core/PlainInput";
-import { Label } from "@yaakapp-internal/ui";

 interface Props {
  onCreate: (id: string) => void;
@@ -18,11 +18,9 @@ export function CreateEnvironmentDialog({ workspaceId, hide, onCreate }: Props)
  const [name, setName] = useState<string>("");
  const [color, setColor] = useState<string | null>(null);
  const [sharable, toggleSharable] = useToggle(false);
-  const formId = useId();
  return (
    <form
-      id={formId}
-      className="flex flex-col gap-3"
+      className="pb-3 flex flex-col gap-3"
      onSubmit={async (e) => {
        e.preventDefault();
        const id = await createWorkspaceModel({
@@ -61,17 +59,10 @@ export function CreateEnvironmentDialog({ workspaceId, hide, onCreate }: Props)
        </Label>
        <ColorPickerWithThemeColors onChange={setColor} color={color} />
      </div>
-      <DialogFooter
-        inline
-        actions={[
-          {
-            label: "Create Environment",
-            color: "secondary",
-            form: formId,
-            leftSlot: color != null ? <ColorIndicator color={color} /> : undefined,
-          },
-        ]}
-      />
+      <Button type="submit" color="secondary" className="mt-3">
+        {color != null && <ColorIndicator color={color} />}
+        Create Environment
+      </Button>
    </form>
  );
 }
@@ -1,14 +1,15 @@
 import { gitMutations } from "@yaakapp-internal/git";
 import type { WorkspaceMeta } from "@yaakapp-internal/models";
 import { createGlobalModel, updateModel } from "@yaakapp-internal/models";
-import { VStack, Label } from "@yaakapp-internal/ui";
-import { useId, useState } from "react";
+import { VStack } from "@yaakapp-internal/ui";
+import { useState } from "react";
 import { router } from "../lib/router";
 import { setupOrConfigureEncryption } from "../lib/setupOrConfigureEncryption";
-import { rpc } from "../lib/rpc";
+import { invokeCmd } from "../lib/tauri";
 import { showErrorToast } from "../lib/toast";
+import { Button } from "./core/Button";
 import { Checkbox } from "./core/Checkbox";
-import { DialogFooter } from "./core/Dialog";
+import { Label } from "./core/Label";
 import { PlainInput } from "./core/PlainInput";
 import { EncryptionHelp } from "./EncryptionHelp";
 import { gitCallbacks } from "./git/callbacks";
@@ -25,13 +26,12 @@ export function CreateWorkspaceDialog({ hide }: Props) {
    initGit?: boolean;
  }>({ filePath: null, initGit: false });
  const [setupEncryption, setSetupEncryption] = useState<boolean>(false);
-  const formId = useId();
  return (
    <VStack
      as="form"
-      id={formId}
      space={3}
      alignItems="start"
+      className="pb-3"
      onSubmit={async (e) => {
        e.preventDefault();
        const workspaceId = await createGlobalModel({ model: "workspace", name });
@@ -39,7 +39,7 @@ export function CreateWorkspaceDialog({ hide }: Props) {

        // Do getWorkspaceMeta instead of naively creating one because it might have
        // been created already when the store refreshes the workspace meta after
-        const workspaceMeta = await rpc<WorkspaceMeta>("cmd_get_workspace_meta", {
+        const workspaceMeta = await invokeCmd<WorkspaceMeta>("cmd_get_workspace_meta", {
          workspaceId,
        });
        await updateModel({
@@ -89,7 +89,9 @@ export function CreateWorkspaceDialog({ hide }: Props) {
          title="Enable Encryption"
        />
      </div>
-      <DialogFooter actions={[{ label: "Create Workspace", color: "primary", form: formId }]} />
+      <Button type="submit" color="primary" className="w-full mt-3">
+        Create Workspace
+      </Button>
    </VStack>
  );
 }
@@ -75,7 +75,7 @@ export function DnsOverridesEditor({ workspace }: Props) {
    <VStack space={3} className="pb-3">
      <div className="text-text-subtle text-sm">
        Override DNS resolution for specific hostnames. This works like{" "}
-        <code className="text-text-subtlest bg-surface-highlight px-1 rounded-sm">/etc/hosts</code> but
+        <code className="text-text-subtlest bg-surface-highlight px-1 rounded">/etc/hosts</code> but
        only for requests made from this workspace.
      </div>

@@ -23,8 +23,8 @@ export const DropMarker = memo(
        <div
          className={classNames(
            "absolute bg-primary rounded-full",
-            orientation === "horizontal" && "left-2 right-2 bottom-[-0.1rem] h-[0.2rem]",
-            orientation === "vertical" && "left-[-0.1rem] top-0 bottom-0 w-[0.2rem]",
+            orientation === "horizontal" && "left-2 right-2 -bottom-[0.1rem] h-[0.2rem]",
+            orientation === "vertical" && "-left-[0.1rem] top-0 bottom-0 w-[0.2rem]",
          )}
        />
      </div>
@@ -11,7 +11,7 @@ import type {
  FormInputText,
  JsonPrimitive,
 } from "@yaakapp-internal/plugins";
-import { Banner, VStack, Label } from "@yaakapp-internal/ui";
+import { Banner, VStack } from "@yaakapp-internal/ui";
 import classNames from "classnames";
 import { useAtomValue } from "jotai";
 import { useCallback, useEffect, useMemo } from "react";
@@ -26,6 +26,7 @@ import { Editor } from "./core/Editor/LazyEditor";
 import { IconButton } from "./core/IconButton";
 import type { InputProps } from "./core/Input";
 import { Input } from "./core/Input";
+import { Label } from "./core/Label";
 import type { Pair } from "./core/PairEditor";
 import { PairEditor } from "./core/PairEditor";
 import { PlainInput } from "./core/PlainInput";
@@ -203,7 +204,7 @@ function FormInputs<T extends Record<string, JsonPrimitive>>({
              <div key={i + stateKey}>
                <DetailsBanner
                  summary={input.label}
-                  className={classNames("mb-auto!", disabled && "opacity-disabled")}
+                  className={classNames("!mb-auto", disabled && "opacity-disabled")}
                >
                  <div className="mt-3">
                    <FormInputsStack
@@ -299,7 +300,7 @@ function TextArg({
    onChange,
    name: arg.name,
    multiLine: arg.multiLine,
-    className: arg.multiLine ? "min-h-16" : undefined,
+    className: arg.multiLine ? "min-h-[4rem]" : undefined,
    defaultValue: value === DYNAMIC_FORM_NULL_ARG ? arg.defaultValue : value,
    required: !arg.optional,
    disabled: arg.disabled,
@@ -358,7 +359,7 @@ function EditorArg({
        className={classNames(
          "border border-border rounded-md overflow-hidden px-2 py-1",
          "focus-within:border-border-focus",
-          !arg.rows && "max-h-40", // So it doesn't take up too much space
+          !arg.rows && "max-h-[10rem]", // So it doesn't take up too much space
        )}
        style={arg.rows ? { height: `${arg.rows * 1.4 + 0.75}rem` } : undefined}
      >
@@ -371,7 +372,7 @@ function EditorArg({
          onChange={onChange}
          hideGutter
          heightMode="auto"
-          className="min-h-12"
+          className="min-h-[3rem]"
          defaultValue={value === DYNAMIC_FORM_NULL_ARG ? arg.defaultValue : value}
          placeholder={arg.placeholder ?? undefined}
          autocompleteFunctions={autocompleteFunctions}
@@ -391,7 +392,7 @@ function EditorArg({
                    id: "id",
                    size: "full",
                    title: arg.readOnly ? "View Value" : "Edit Value",
-                    className: "max-w-200! max-h-240!",
+                    className: "!max-w-[50rem] !max-h-[60rem]",
                    description: arg.label && (
                      <Label
                        htmlFor={id}
@@ -1 +1,24 @@
-export { EmptyStateText } from "@yaakapp-internal/ui";
+import classNames from "classnames";
+import type { ReactNode } from "react";
+
+interface Props {
+  children: ReactNode;
+  className?: string;
+  wrapperClassName?: string;
+}
+
+export function EmptyStateText({ children, className, wrapperClassName }: Props) {
+  return (
+    <div className={classNames("w-full h-full pb-2", wrapperClassName)}>
+      <div
+        className={classNames(
+          className,
+          "rounded-lg border border-dashed border-border-subtle",
+          "h-full py-2 text-text-subtlest flex items-center justify-center italic",
+        )}
+      >
+        {children}
+      </div>
+    </div>
+  );
+}
@@ -62,19 +62,12 @@ export const EnvironmentActionsDropdown = memo(function EnvironmentActionsDropdo
        size="sm"
        className={classNames(
          className,
-          "text px-2! truncate",
+          "text !px-2 truncate",
          !activeEnvironment && !hasBaseVars && "text-text-subtlest italic",
        )}
        // If no environments, the button simply opens the dialog.
        // NOTE: We don't create a new button because we want to reuse the hotkey from the menu items
-        onClick={
-          subEnvironments.length === 0
-            ? (event) => {
-                event.preventDefault();
-                editEnvironment(null);
-              }
-            : undefined
-        }
+        onClick={subEnvironments.length === 0 ? () => editEnvironment(null) : undefined}
        {...buttonProps}
      >
        <EnvironmentColorIndicator environment={activeEnvironment ?? null} />
@@ -1,19 +1,11 @@
 import type { Environment, Workspace } from "@yaakapp-internal/models";
 import { duplicateModel, patchModel } from "@yaakapp-internal/models";
 import type { TreeHandle, TreeNode, TreeProps } from "@yaakapp-internal/ui";
-import { Banner, Icon, InlineCode, SplitLayout, Tree, IconTooltip } from "@yaakapp-internal/ui";
+import { Banner, Icon, InlineCode, SplitLayout, Tree } from "@yaakapp-internal/ui";
 import { atom, useAtomValue } from "jotai";
 import { atomFamily } from "jotai-family";
-import {
-  createContext,
-  useCallback,
-  useContext,
-  useEffect,
-  useLayoutEffect,
-  useRef,
-  useState,
-} from "react";
-import { createSubEnvironment } from "../commands/createEnvironment";
+import { useCallback, useLayoutEffect, useRef, useState } from "react";
+import { createSubEnvironmentAndActivate } from "../commands/createEnvironment";
 import { activeWorkspaceAtom, activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
 import {
  environmentsBreakdownAtom,
@@ -30,6 +22,7 @@ import { showColorPicker } from "../lib/showColorPicker";
 import type { ContextMenuProps, DropdownItem } from "./core/Dropdown";
 import { ContextMenu } from "./core/Dropdown";
 import { IconButton } from "./core/IconButton";
+import { IconTooltip } from "./core/IconTooltip";
 import type { PairEditorHandle } from "./core/PairEditor";
 import { EnvironmentColorIndicator } from "./EnvironmentColorIndicator";
 import { EnvironmentEditor } from "./EnvironmentEditor";
@@ -47,9 +40,6 @@ interface Props {

 type TreeModel = Environment | Workspace;

-/** Lets tree row slots create a sub-environment and select it in the editor. */
-const CreateSubEnvironmentContext = createContext<() => Promise<void>>(async () => {});
-
 export function EnvironmentEditDialog({ initialEnvironmentId, setRef }: Props) {
  const { allEnvironments, baseEnvironment, baseEnvironments } = useEnvironmentsBreakdown();
  const [selectedEnvironmentId, setSelectedEnvironmentId] = useState<string | null>(
@@ -67,7 +57,7 @@ export function EnvironmentEditDialog({ initialEnvironmentId, setRef }: Props) {
      defaultRatio={0.75}
      layout="horizontal"
      className="gap-0"
-      resizeHandleClassName="-translate-x-px"
+      resizeHandleClassName="-translate-x-[1px]"
      firstSlot={() => (
        <EnvironmentEditDialogSidebar
          selectedEnvironmentId={selectedEnvironment?.id ?? null}
@@ -125,7 +115,7 @@ function EnvironmentEditDialogSidebar({
  const activeWorkspaceId = useAtomValue(activeWorkspaceIdAtom) ?? "";
  const treeId = `environment.${activeWorkspaceId}.sidebar`;
  const treeRef = useRef<TreeHandle>(null);
-  const { allEnvironments, baseEnvironment, baseEnvironments } = useEnvironmentsBreakdown();
+  const { baseEnvironment, baseEnvironments } = useEnvironmentsBreakdown();

  // oxlint-disable-next-line react-hooks/exhaustive-deps -- none
  useLayoutEffect(() => {
@@ -134,31 +124,6 @@ function EnvironmentEditDialogSidebar({
    treeRef.current?.focus();
  }, []);

-  // A just-created environment to select once it reaches the model store. Selecting it before
-  // then would show a "failed to find" error in the editor, and the tree would drop the
-  // selection of an item it doesn't have yet.
-  const [pendingSelectionId, setPendingSelectionId] = useState<string | null>(null);
-  const tree = useAtomValue(treeAtom);
-  useEffect(() => {
-    if (pendingSelectionId == null) return;
-    if (!allEnvironments.some((e) => e.id === pendingSelectionId)) return;
-
-    setPendingSelectionId(null);
-    setSelectedEnvironmentId(pendingSelectionId);
-
-    // The tree leaves out sub-environments while there are multiple base environments
-    const node = tree == null ? null : findTreeNode(tree, pendingSelectionId);
-    if (node == null) return;
-    if (node.parent != null) {
-      // Expand the parent so the new item is visible to be selected
-      const parentId = node.parent.item.id;
-      jotaiStore.set(collapsedFamily(treeId), (prev) => ({ ...prev, [parentId]: false }));
-    }
-    // Wait a frame so the tree's own pending selection fixups, which may have been scheduled
-    // before the new item arrived, don't reset this selection
-    requestAnimationFrame(() => treeRef.current?.selectItem(pendingSelectionId));
-  }, [allEnvironments, pendingSelectionId, setSelectedEnvironmentId, tree, treeId]);
-
  const handleDeleteEnvironment = useCallback(
    async (environment: Environment) => {
      await deleteModelWithConfirm(environment);
@@ -169,14 +134,6 @@ function EnvironmentEditDialogSidebar({
    [baseEnvironment?.id, selectedEnvironmentId, setSelectedEnvironmentId],
  );

-  const handleCreateSubEnvironment = useCallback(async () => {
-    const { baseEnvironment } = jotaiStore.get(environmentsBreakdownAtom);
-    if (baseEnvironment == null) return;
-    const id = await createSubEnvironment.mutateAsync(baseEnvironment);
-    // Show the new environment in the editor without changing the workspace's active environment
-    if (id != null) setPendingSelectionId(id);
-  }, []);
-
  const treeHasFocus = useCallback(() => treeRef.current?.hasFocus() ?? false, []);

  const getSelectedTreeModels = useCallback(
@@ -238,14 +195,13 @@ function EnvironmentEditDialogSidebar({
      const addEnvironmentItem: DropdownItem = {
        label: "Create Sub Environment",
        leftSlot: <Icon icon="plus" />,
-        onSelect: handleCreateSubEnvironment,
+        onSelect: async () => {
+          await createSubEnvironment();
+        },
      };
-      // Sub-environments aren't shown while there are multiple base environments, same as the
-      // plus button on the base environment row
-      const canCreateSubEnvironment = baseEnvironments.length <= 1;

      if (environment == null || environment.model !== "environment") {
-        return canCreateSubEnvironment ? [addEnvironmentItem] : [];
+        return [addEnvironmentItem];
      }

      const singleEnvironment = items.length === 1;
@@ -301,7 +257,7 @@ function EnvironmentEditDialogSidebar({
      ];

      // Add sub environment to base environment
-      if (isBaseEnvironment(environment) && singleEnvironment && canCreateSubEnvironment) {
+      if (isBaseEnvironment(environment) && singleEnvironment) {
        menuItems.push({ type: "separator" });
        menuItems.push(addEnvironmentItem);
      }
@@ -310,7 +266,6 @@ function EnvironmentEditDialogSidebar({
    },
    [
      baseEnvironments.length,
-      handleCreateSubEnvironment,
      handleDeleteEnvironment,
      handleDuplicateSelected,
      handleRenameSelected,
@@ -362,37 +317,34 @@ function EnvironmentEditDialogSidebar({
  );

  const renderContextMenuFn = useCallback<NonNullable<TreeProps<TreeModel>["renderContextMenu"]>>(
-    ({ items, position, onClose }) =>
-      // Right-clicking empty space has nothing to offer while there are multiple base environments
-      items.length === 0 ? null : (
-        <ContextMenu items={items as DropdownItem[]} triggerPosition={position} onClose={onClose} />
-      ),
+    ({ items, position, onClose }) => (
+      <ContextMenu items={items as DropdownItem[]} triggerPosition={position} onClose={onClose} />
+    ),
    [],
  );

+  const tree = useAtomValue(treeAtom);
  return (
    <aside className="x-theme-sidebar h-full w-full min-w-0 grid overflow-y-auto border-r border-border-subtle ">
      {tree != null && (
-        <CreateSubEnvironmentContext.Provider value={handleCreateSubEnvironment}>
-          <div className="pt-2">
-            <Tree
-              ref={treeRef}
-              treeId={treeId}
-              collapsedAtom={collapsedFamily(treeId)}
-              className="px-2 pb-10"
-              root={tree}
-              getContextMenu={getContextMenu}
-              renderContextMenu={renderContextMenuFn}
-              onDragEnd={handleDragEnd}
-              getItemKey={(i) => `${i.id}::${i.name}`}
-              ItemLeftSlotInner={ItemLeftSlotInner}
-              ItemRightSlot={ItemRightSlot}
-              ItemInner={ItemInner}
-              onActivate={handleActivate}
-              getEditOptions={getEditOptions}
-            />
-          </div>
-        </CreateSubEnvironmentContext.Provider>
+        <div className="pt-2">
+          <Tree
+            ref={treeRef}
+            treeId={treeId}
+            collapsedAtom={collapsedFamily(treeId)}
+            className="px-2 pb-10"
+            root={tree}
+            getContextMenu={getContextMenu}
+            renderContextMenu={renderContextMenuFn}
+            onDragEnd={handleDragEnd}
+            getItemKey={(i) => `${i.id}::${i.name}`}
+            ItemLeftSlotInner={ItemLeftSlotInner}
+            ItemRightSlot={ItemRightSlot}
+            ItemInner={ItemInner}
+            onActivate={handleActivate}
+            getEditOptions={getEditOptions}
+          />
+        </div>
      )}
    </aside>
  );
@@ -432,15 +384,6 @@ const treeAtom = atom<TreeNode<TreeModel> | null>((get) => {
  return root;
 });

-function findTreeNode(node: TreeNode<TreeModel>, id: string): TreeNode<TreeModel> | null {
-  if (node.item.id === id) return node;
-  for (const child of node.children ?? []) {
-    const found = findTreeNode(child, id);
-    if (found != null) return found;
-  }
-  return null;
-}
-
 function ItemLeftSlotInner({ item }: { item: TreeModel }) {
  const { baseEnvironments } = useEnvironmentsBreakdown();
  return baseEnvironments.length > 1 ? (
@@ -452,7 +395,6 @@ function ItemLeftSlotInner({ item }: { item: TreeModel }) {

 function ItemRightSlot({ item }: { item: TreeModel }) {
  const { baseEnvironments } = useEnvironmentsBreakdown();
-  const handleCreateSubEnvironment = useContext(CreateSubEnvironmentContext);
  return (
    <>
      {item.model === "environment" && baseEnvironments.length <= 1 && isBaseEnvironment(item) && (
@@ -463,7 +405,7 @@ function ItemRightSlot({ item }: { item: TreeModel }) {
          icon="plus_circle"
          className="opacity-50 hover:opacity-100"
          title="Add Sub-Environment"
-          onClick={handleCreateSubEnvironment}
+          onClick={createSubEnvironment}
        />
      )}
    </>
@@ -483,6 +425,13 @@ function ItemInner({ item }: { item: TreeModel }) {
  );
 }

+async function createSubEnvironment() {
+  const { baseEnvironment } = jotaiStore.get(environmentsBreakdownAtom);
+  if (baseEnvironment == null) return;
+  const id = await createSubEnvironmentAndActivate.mutateAsync(baseEnvironment);
+  return id;
+}
+
 function getEditOptions(item: TreeModel) {
  const options: ReturnType<NonNullable<TreeProps<TreeModel>["getEditOptions"]>> = {
    defaultValue: item.name,
@@ -1,4 +1,4 @@
-import { IconTooltip } from "@yaakapp-internal/ui";
+import { IconTooltip } from "./core/IconTooltip";

 export function EnvironmentSharableTooltip() {
  return (
@@ -1,19 +1,60 @@
-import { ErrorBoundary as BaseErrorBoundary } from "@yaakapp-internal/ui";
-import type { ReactNode } from "react";
-import { useEffect } from "react";
+import { Banner, Button, InlineCode } from "@yaakapp-internal/ui";
+import type { ErrorInfo, ReactNode } from "react";
+import { Component, useEffect } from "react";
 import { showDialog } from "../lib/dialog";
 import RouteError from "./RouteError";

-export function ErrorBoundary({ name, children }: { name: string; children: ReactNode }) {
-  return (
-    <BaseErrorBoundary name={name} onShowError={showErrorDialog}>
-      {children}
-    </BaseErrorBoundary>
-  );
+interface ErrorBoundaryProps {
+  name: string;
+  children: ReactNode;
 }

-export function showErrorDialog(error: unknown) {
-  showDialog({ id: "error-boundary", render: () => <RouteError error={error} /> });
+interface ErrorBoundaryState {
+  hasError: boolean;
+  error: Error | null;
+}
+
+export class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
+  constructor(props: ErrorBoundaryProps) {
+    super(props);
+    this.state = { hasError: false, error: null };
+  }
+
+  static getDerivedStateFromError(error: Error): ErrorBoundaryState {
+    return { hasError: true, error };
+  }
+
+  componentDidCatch(error: Error, info: ErrorInfo) {
+    console.warn("Error caught by ErrorBoundary:", error, info);
+  }
+
+  render() {
+    if (this.state.hasError) {
+      return (
+        <Banner color="danger" className="flex items-center gap-2 overflow-auto">
+          <div>
+            Error rendering <InlineCode>{this.props.name}</InlineCode> component
+          </div>
+          <Button
+            className="inline-flex"
+            variant="border"
+            color="danger"
+            size="2xs"
+            onClick={() => {
+              showDialog({
+                id: "error-boundary",
+                render: () => <RouteError error={this.state.error} />,
+              });
+            }}
+          >
+            Show
+          </Button>
+        </Banner>
+      );
+    }
+
+    return this.props.children;
+  }
 }

 export function ErrorBoundaryTestThrow() {
@@ -1,18 +1,17 @@
+import { save } from "@tauri-apps/plugin-dialog";
 import type { Workspace } from "@yaakapp-internal/models";
 import { workspacesAtom } from "@yaakapp-internal/models";
-import { VStack } from "@yaakapp-internal/ui";
+import { HStack, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
 import { useCallback, useMemo, useState } from "react";
 import slugify from "slugify";
 import { activeWorkspaceAtom } from "../hooks/useActiveWorkspace";
-import { rpc } from "../lib/rpc";
-import { CommercialUseBanner } from "./CommercialUseBanner";
+import { pluralizeCount } from "../lib/pluralize";
+import { invokeCmd } from "../lib/tauri";
+import { Button } from "./core/Button";
 import { Checkbox } from "./core/Checkbox";
 import { DetailsBanner } from "./core/DetailsBanner";
-import { DialogFooter } from "./core/Dialog";
 import { Link } from "./core/Link";
-import { platform } from "@yaakapp-internal/platform";
-import { pluralizeCount } from "@yaakapp-internal/lib/pluralize";

 interface Props {
  onHide: () => void;
@@ -65,32 +64,29 @@ function ExportDataDialogContent({
    const ids = Object.keys(selectedWorkspaces).filter((k) => selectedWorkspaces[k]);
    const workspace = ids.length === 1 ? workspaces.find((w) => w.id === ids[0]) : undefined;
    const slug = workspace ? slugify(workspace.name, { lower: true }) : "workspaces";
-    const document = await rpc<string>("cmd_export_data", {
-      workspaceIds: ids,
-      includePrivateEnvironments: includePrivateEnvironments,
+    const exportPath = await save({
+      title: "Export Data",
+      defaultPath: `yaak.${slug}.json`,
    });
-
-    const savedTo = await platform.files.save(
-      `yaak.${slug}.json`,
-      new TextEncoder().encode(document),
-      [{ name: "JSON", extensions: ["json"] }],
-    );
-    if (savedTo == null) {
-      return; // Cancelled
+    if (exportPath == null) {
+      return;
    }

+    await invokeCmd("cmd_export_data", {
+      workspaceIds: ids,
+      exportPath,
+      includePrivateEnvironments: includePrivateEnvironments,
+    });
    onHide();
-    onSuccess(savedTo);
+    onSuccess(exportPath);
  }, [includePrivateEnvironments, onHide, onSuccess, selectedWorkspaces, workspaces]);

  const allSelected = workspaces.every((w) => selectedWorkspaces[w.id]);
  const numSelected = Object.values(selectedWorkspaces).filter(Boolean).length;
  const noneSelected = numSelected === 0;
  return (
-    <>
-      <VStack space={3} className="pb-4">
-        <CommercialUseBanner source="data-export" title="Exporting work data?" />
-
+    <div className="w-full grid grid-rows-[minmax(0,1fr)_auto]">
+      <VStack space={3} className="overflow-auto px-5 pb-6">
        <table className="w-full mb-auto min-w-full max-w-full divide-y divide-surface-highlight">
          <thead>
            <tr>
@@ -141,22 +137,29 @@ function ExportDataDialogContent({
          />
        </DetailsBanner>
      </VStack>
-      <DialogFooter
-        leftSlot={
-          <Link href="https://yaak.app/button/new" noUnderline className="text-text-subtlest">
+      <footer className="px-5 grid grid-cols-[1fr_auto] items-center bg-surface-highlight py-2 border-t border-border-subtle">
+        <div>
+          <Link href="https://yaak.app/button/new" noUnderline className="text-text-subtle">
            Create Run Button
          </Link>
-        }
-        actions={[
-          { label: "Cancel", onClick: onHide },
-          {
-            label: `Export ${pluralizeCount("Workspace", numSelected, { omitSingle: true, noneWord: "Nothing" })}`,
-            color: "primary",
-            disabled: noneSelected,
-            onClick: () => handleExport(),
-          },
-        ]}
-      />
-    </>
+        </div>
+        <HStack space={2} justifyContent="end">
+          <Button size="sm" className="focus" variant="border" onClick={onHide}>
+            Cancel
+          </Button>
+          <Button
+            size="sm"
+            type="submit"
+            className="focus"
+            color="primary"
+            disabled={noneSelected}
+            onClick={() => handleExport()}
+          >
+            Export{" "}
+            {pluralizeCount("Workspace", numSelected, { omitSingle: true, noneWord: "Nothing" })}
+          </Button>
+        </HStack>
+      </footer>
+    </div>
  );
 }
@@ -1,76 +0,0 @@
-import { HStack, VStack } from "@yaakapp-internal/ui";
-import { useRef, useState } from "react";
-import type { FeedbackFeature } from "../lib/featureFeedbackConstants";
-import { FEEDBACK_FEATURES } from "../lib/featureFeedbackConstants";
-import { rpc } from "../lib/rpc";
-import { hideToastById, showToast } from "../lib/toast";
-import { Button } from "./core/Button";
-import { Input } from "./core/Input";
-
-interface Props {
-  feature: FeedbackFeature;
-  onDone: () => void;
-}
-
-export function FeedbackToast({ feature, onDone }: Props) {
-  const [text, setText] = useState<string>("");
-  const [sent, setSent] = useState(false);
-  const sentRef = useRef(false);
-
-  const handleDismiss = () => {
-    onDone();
-    hideToastById(`feature-feedback-${feature}`);
-  };
-
-  const handleSend = () => {
-    const trimmedText = text.trim();
-    if (sentRef.current || trimmedText.length === 0) return;
-
-    sentRef.current = true;
-    setSent(true);
-    onDone();
-
-    // Fire-and-forget; failures are intentionally ignored
-    rpc("cmd_send_feedback", { feature, text: trimmedText }).catch(() => {});
-    showToast({
-      id: `feature-feedback-${feature}`,
-      timeout: 3000,
-      color: "success",
-      message: "Thanks for the feedback!",
-    });
-  };
-
-  return (
-    <VStack space={2}>
-      <p className="text-sm font-semibold">{FEEDBACK_FEATURES[feature]}</p>
-      <div className="h-20">
-        <Input
-          size="xs"
-          // The editor forces its mono font on the scroller, so the override
-          // has to target it directly
-          className="[&_.cm-scroller]:font-sans! [&_.cm-scroller]:text-sm!"
-          label="Feedback"
-          hideLabel
-          stateKey={null}
-          multiLine
-          fullHeight
-          placeholder="Your thoughts..."
-          onChange={setText}
-        />
-      </div>
-      <HStack space={1.5} justifyContent="end">
-        <Button size="xs" color="secondary" variant="border" onClick={handleDismiss}>
-          Dismiss
-        </Button>
-        <Button
-          size="xs"
-          color="primary"
-          disabled={sent || text.trim().length === 0}
-          onClick={handleSend}
-        >
-          Send
-        </Button>
-      </HStack>
-    </VStack>
-  );
-}
@@ -1,14 +1,6 @@
 import type { Folder, GrpcRequest, HttpRequest, WebsocketRequest } from "@yaakapp-internal/models";
 import { foldersAtom } from "@yaakapp-internal/models";
-import {
-  Heading,
-  HStack,
-  Icon,
-  LoadingIcon,
-  HttpResponseDurationTag,
-  HttpStatusTag,
-  SizeTag,
-} from "@yaakapp-internal/ui";
+import { Heading, HStack, Icon, LoadingIcon } from "@yaakapp-internal/ui";
 import classNames from "classnames";
 import { useAtomValue } from "jotai";
 import type { CSSProperties, ReactNode } from "react";
@@ -21,8 +13,11 @@ import { showDialog } from "../lib/dialog";
 import { resolvedModelName } from "../lib/resolvedModelName";
 import { router } from "../lib/router";
 import { Button } from "./core/Button";
+import { HttpResponseDurationTag } from "./core/HttpResponseDurationTag";
+import { HttpStatusTag } from "./core/HttpStatusTag";
 import { IconButton } from "./core/IconButton";
 import { Separator } from "./core/Separator";
+import { SizeTag } from "./core/SizeTag";
 import { HttpResponsePane } from "./HttpResponsePane";

 interface Props {
@@ -168,7 +163,7 @@ function HttpRequestCard({ request }: { request: HttpRequest }) {

  return (
    <div className="grid grid-rows-2 grid-cols-[minmax(0,1fr)] gap-2 overflow-hidden">
-      <code className="font-mono text-editor text-info border border-info rounded-sm px-2.5 py-0.5 truncate w-full min-w-0">
+      <code className="font-mono text-editor text-info border border-info rounded px-2.5 py-0.5 truncate w-full min-w-0">
        {request.method} {request.url}
      </code>
      {latestResponse ? (
@@ -195,7 +190,7 @@ function HttpRequestCard({ request }: { request: HttpRequest }) {
            className={classNames(
              "cursor-default select-none",
              "whitespace-nowrap w-full pl-3 overflow-x-auto font-mono text-sm hide-scrollbars",
-              "font-mono text-editor border rounded-sm px-1.5 py-0.5 truncate w-full",
+              "font-mono text-editor border rounded px-1.5 py-0.5 truncate w-full",
            )}
          >
            {latestResponse.state !== "closed" && <LoadingIcon size="sm" />}
@@ -1,5 +1,5 @@
 import { createWorkspaceModel, foldersAtom, patchModel } from "@yaakapp-internal/models";
-import { HStack, Icon, InlineCode, VStack, CountBadge } from "@yaakapp-internal/ui";
+import { HStack, Icon, InlineCode, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
 import { Fragment, useMemo } from "react";
 import { useAuthTab } from "../hooks/useAuthTab";
@@ -11,6 +11,7 @@ import { deleteModelWithConfirm } from "../lib/deleteModelWithConfirm";
 import { hideDialog } from "../lib/dialog";
 import { CopyIconButton } from "./CopyIconButton";
 import { Button } from "./core/Button";
+import { CountBadge } from "./core/CountBadge";
 import { Input } from "./core/Input";
 import { Link } from "./core/Link";
 import type { TabItem } from "./core/Tabs/Tabs";
@@ -83,12 +84,12 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
  return (
    <div className="h-full flex flex-col">
      <div className="flex items-center gap-3 px-6 pr-10 mt-4 mb-2 min-w-0 text-xl">
-        <Icon icon="folder_cog" size="lg" color="secondary" className="shrink-0" />
+        <Icon icon="folder_cog" size="lg" color="secondary" className="flex-shrink-0" />
        <div className="flex items-center gap-1.5 font-semibold text-text min-w-0 overflow-hidden flex-1">
          {breadcrumbs.map((item, index) => (
            <Fragment key={item.id}>
              {index > 0 && (
-                <Icon icon="chevron_right" size="lg" className="opacity-50 shrink-0" />
+                <Icon icon="chevron_right" size="lg" className="opacity-50 flex-shrink-0" />
              )}
              <span className="text-text-subtle truncate min-w-0" title={item.name}>
                {item.name}
@@ -96,7 +97,7 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
            </Fragment>
          ))}
          {breadcrumbs.length > 0 && (
-            <Icon icon="chevron_right" size="lg" className="opacity-50 shrink-0" />
+            <Icon icon="chevron_right" size="lg" className="opacity-50 flex-shrink-0" />
          )}
          <span className="whitespace-nowrap" title={folder.name}>
            {folder.name}
@@ -148,7 +149,7 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
              <InlineCode className="flex gap-1 items-center text-primary pl-2.5">
                {folder.id}
                <CopyIconButton
-                  className="opacity-70 text-primary!"
+                  className="opacity-70 !text-primary"
                  size="2xs"
                  iconSize="sm"
                  title="Copy folder ID"
@@ -1,42 +1,32 @@
+import type { HttpRequest } from "@yaakapp-internal/models";
 import { useCallback, useMemo } from "react";
-import type { Pair, PairEditorProps } from "../pairs/PairEditor";
-import { PairEditor } from "../pairs/PairEditor";
-import type { HttpFormFieldView, HttpRequestBodyView } from "./types";
+import type { Pair, PairEditorProps } from "./core/PairEditor";
+import { PairEditor } from "./core/PairEditor";

 type Props = {
  forceUpdateKey: string;
-  /** The request's id, keeping each request's editor state apart */
-  requestId: string;
-  form: HttpFormFieldView[] | undefined;
-  onChange?: (body: HttpRequestBodyView) => void;
-  /** Show the fields without a way to change them */
-  readOnly?: boolean;
+  request: HttpRequest;
+  onChange: (body: HttpRequest["body"]) => void;
 };

-export function FormMultipartEditor({
-  requestId,
-  form,
-  forceUpdateKey,
-  onChange,
-  readOnly,
-}: Props) {
+export function FormMultipartEditor({ request, forceUpdateKey, onChange }: Props) {
  const pairs = useMemo<Pair[]>(
    () =>
-      (Array.isArray(form) ? form : []).map((p) => ({
+      (Array.isArray(request.body.form) ? request.body.form : []).map((p) => ({
        enabled: p.enabled,
        name: p.name,
-        value: (p.file ?? p.value) as string,
+        value: p.file ?? p.value,
        contentType: p.contentType,
        filename: p.filename,
        isFile: !!p.file,
        id: p.id,
      })),
-    [form],
+    [request.body.form],
  );

  const handleChange = useCallback<PairEditorProps["onChange"]>(
    (pairs) =>
-      onChange?.({
+      onChange({
        form: pairs.map((p) => ({
          enabled: p.enabled,
          name: p.name,
@@ -60,9 +50,8 @@ export function FormMultipartEditor({
      allowMultilineValues
      pairs={pairs}
      onChange={handleChange}
-      readOnly={readOnly}
      forceUpdateKey={forceUpdateKey}
-      stateKey={`multipart.${requestId}`}
+      stateKey={`multipart.${request.id}`}
    />
  );
 }
@@ -0,0 +1,46 @@
+import type { HttpRequest } from "@yaakapp-internal/models";
+import { useCallback, useMemo } from "react";
+import type { Pair, PairEditorProps } from "./core/PairEditor";
+import { PairOrBulkEditor } from "./core/PairOrBulkEditor";
+
+type Props = {
+  forceUpdateKey: string;
+  request: HttpRequest;
+  onChange: (headers: HttpRequest["body"]) => void;
+};
+
+export function FormUrlencodedEditor({ request, forceUpdateKey, onChange }: Props) {
+  const pairs = useMemo<Pair[]>(
+    () =>
+      (Array.isArray(request.body.form) ? request.body.form : []).map((p) => ({
+        enabled: !!p.enabled,
+        name: p.name || "",
+        value: p.value || "",
+        id: p.id,
+      })),
+    [request.body.form],
+  );
+
+  const handleChange = useCallback<PairEditorProps["onChange"]>(
+    (pairs) =>
+      onChange({ form: pairs.map((p) => ({ enabled: p.enabled, name: p.name, value: p.value })) }),
+    [onChange],
+  );
+
+  return (
+    <PairOrBulkEditor
+      allowMultilineValues
+      preferenceName="form_urlencoded"
+      valueAutocompleteFunctions
+      valueAutocompleteVariables
+      nameAutocompleteFunctions
+      nameAutocompleteVariables
+      namePlaceholder="entry_name"
+      valuePlaceholder="Value"
+      pairs={pairs}
+      onChange={handleChange}
+      forceUpdateKey={forceUpdateKey}
+      stateKey={`urlencoded.${request.id}`}
+    />
+  );
+}
@@ -1,4 +1,3 @@
-import type { NavigateWorkspace } from "@yaakapp-internal/tauri-client";
 import { activeRequestAtom } from "../hooks/useActiveRequest";
 import { useSubscribeActiveWorkspaceId } from "../hooks/useActiveWorkspace";
 import { useActiveWorkspaceChangedToast } from "../hooks/useActiveWorkspaceChangedToast";
@@ -6,13 +5,10 @@ import { useHotKey, useSubscribeHotKeys } from "../hooks/useHotKey";
 import { useSubscribeHttpAuthentication } from "../hooks/useHttpAuthentication";
 import { useSyncFontSizeSetting } from "../hooks/useSyncFontSizeSetting";
 import { useSyncWorkspaceChildModels } from "../hooks/useSyncWorkspaceChildModels";
-import { usePlatformEvent } from "../hooks/usePlatformEvent";
 import { useSyncZoomSetting } from "../hooks/useSyncZoomSetting";
 import { useSubscribeTemplateFunctions } from "../hooks/useTemplateFunctions";
-import { fireAndForget } from "../lib/fireAndForget";
 import { jotaiStore } from "../lib/jotai";
 import { renameModelWithPrompt } from "../lib/renameModelWithPrompt";
-import { router } from "../lib/router";

 export function GlobalHooks() {
  useSyncZoomSetting();
@@ -28,20 +24,6 @@ export function GlobalHooks() {
  useActiveWorkspaceChangedToast();
  useSubscribeHotKeys();

-  usePlatformEvent("show_home", () => {
-    fireAndForget(router.navigate({ to: "/", search: { home: true } }));
-  });
-
-  usePlatformEvent<NavigateWorkspace>("navigate_workspace", ({ workspaceId, environmentId }) => {
-    fireAndForget(
-      router.navigate({
-        to: "/workspaces/$workspaceId",
-        params: { workspaceId },
-        search: { environment_id: environmentId },
-      }),
-    );
-  });
-
  useHotKey(
    "request.rename",
    async () => {
@@ -1,8 +1,9 @@
 import { linter } from "@codemirror/lint";
 import type { EditorView } from "@codemirror/view";
 import { jsoncLanguage } from "@shopify/lang-jsonc";
-import { type GrpcRequest, patchModel } from "@yaakapp-internal/models";
-import { Banner, FormattedError, Icon, InlineCode, VStack } from "@yaakapp-internal/ui";
+import type { GrpcRequest } from "@yaakapp-internal/models";
+import { FormattedError, InlineCode, VStack } from "@yaakapp-internal/ui";
+import classNames from "classnames";
 import {
  handleRefresh,
  jsonCompletion,
@@ -10,23 +11,15 @@ import {
  stateExtensions,
  updateSchema,
 } from "codemirror-json-schema";
-import type { JSONSchema7 } from "json-schema";
-import type { ReactNode } from "react";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import type { ReflectResponseService } from "../hooks/useGrpc";
-import { wasUpdatedExternally } from "../hooks/useRequestUpdateKey";
 import { showAlert } from "../lib/alert";
-import { showConfirm } from "../lib/confirm";
 import { showDialog } from "../lib/dialog";
-import type { JsonSchema } from "../lib/jsonSchemaExample";
-import { buildExampleFromSchema } from "../lib/jsonSchemaExample";
-import { queryClient } from "../lib/queryClient";
+import { pluralizeCount } from "../lib/pluralize";
 import { Button } from "./core/Button";
-import { Dropdown } from "./core/Dropdown";
 import type { EditorProps } from "./core/Editor/Editor";
 import { Editor } from "./core/Editor/LazyEditor";
 import { GrpcProtoSelectionDialog } from "./GrpcProtoSelectionDialog";
-import { pluralizeCount } from "@yaakapp-internal/lib/pluralize";

 type Props = Pick<EditorProps, "heightMode" | "onChange" | "className" | "forceUpdateKey"> & {
  services: ReflectResponseService[] | null;
@@ -36,11 +29,6 @@ type Props = Pick<EditorProps, "heightMode" | "onChange" | "className" | "forceU
  protoFiles: string[];
 };

-type MethodSchema =
-  | { type: "none" }
-  | { type: "schema"; schema: JsonSchema }
-  | { type: "error"; id: string; title: string; body: ReactNode; log: unknown[] };
-
 export function GrpcEditor({
  services,
  reflectionError,
@@ -54,16 +42,21 @@ export function GrpcEditor({
    setEditorView(h);
  }, []);

-  // Find the schema for the selected service and method
-  const methodSchema = useMemo<MethodSchema>(() => {
-    if (services === null || request.service === null || request.method === null) {
-      return { type: "none" };
+  // Find the schema for the selected service and method and update the editor
+  useEffect(() => {
+    if (
+      editorView == null ||
+      services === null ||
+      request.service === null ||
+      request.method === null
+    ) {
+      return;
    }

    const s = services.find((s) => s.name === request.service);
    if (s == null) {
-      return {
-        type: "error",
+      console.log("Failed to find service", { service: request.service, services });
+      showAlert({
        id: "grpc-find-service-error",
        title: "Couldn't Find Service",
        body: (
@@ -71,14 +64,14 @@ export function GrpcEditor({
            Failed to find service <InlineCode>{request.service}</InlineCode> in schema
          </>
        ),
-        log: ["Failed to find service", { service: request.service, services }],
-      };
+      });
+      return;
    }

    const schema = s.methods.find((m) => m.name === request.method)?.schema;
-    if (schema == null) {
-      return {
-        type: "error",
+    if (request.method != null && schema == null) {
+      console.log("Failed to find method", { method: request.method, methods: s?.methods });
+      showAlert({
        id: "grpc-find-schema-error",
        title: "Couldn't Find Method",
        body: (
@@ -87,15 +80,18 @@ export function GrpcEditor({
            <InlineCode>{request.service}</InlineCode> in schema
          </>
        ),
-        log: ["Failed to find method", { method: request.method, methods: s.methods }],
-      };
+      });
+      return;
+    }
+
+    if (schema == null) {
+      return;
    }

    try {
-      return { type: "schema", schema: JSON.parse(schema) as JsonSchema };
+      updateSchema(editorView, JSON.parse(schema));
    } catch (err) {
-      return {
-        type: "error",
+      showAlert({
        id: "grpc-parse-schema-error",
        title: "Failed to Parse Schema",
        body: (
@@ -107,22 +103,9 @@ export function GrpcEditor({
            <FormattedError>{String(err)}</FormattedError>
          </VStack>
        ),
-        log: ["Failed to parse schema", err],
-      };
+      });
    }
-  }, [services, request.method, request.service]);
-
-  useEffect(() => {
-    if (methodSchema.type !== "error") return;
-    console.log(...methodSchema.log);
-    showAlert({ id: methodSchema.id, title: methodSchema.title, body: methodSchema.body });
-  }, [methodSchema]);
-
-  // Update the editor whenever the schema changes
-  useEffect(() => {
-    if (editorView == null || methodSchema.type !== "schema") return;
-    updateSchema(editorView, methodSchema.schema as JSONSchema7);
-  }, [editorView, methodSchema]);
+  }, [editorView, services, request.method, request.service]);

  const extraExtensions = useMemo(
    () => [
@@ -141,146 +124,45 @@ export function GrpcEditor({
  const reflectionUnavailable = reflectionError?.match(/unimplemented/i);
  reflectionError = reflectionUnavailable ? undefined : reflectionError;

-  const handleGenerateExample = useCallback(async () => {
-    if (methodSchema.type !== "schema") return;
-
-    if (request.message.trim() !== "") {
-      const confirmed = await showConfirm({
-        id: "grpc-generate-example",
-        title: "Generate Example",
-        description: "The current message will be replaced with an example.",
-        confirmText: "Generate",
-      });
-      if (!confirmed) return;
-    }
-
-    const message = JSON.stringify(buildExampleFromSchema(methodSchema.schema), null, 2);
-    await patchModel(request, { message });
-
-    // Force the editor to pick up the new message
-    wasUpdatedExternally(request.id);
-  }, [methodSchema, request]);
-
-  // The reflect query is keyed by request, url and proto files, so a prefix invalidate
-  // reaches it without threading a refetch down from the connection layout.
-  const handleReloadSchema = useCallback(
-    () => queryClient.invalidateQueries({ queryKey: ["grpc_reflect", request.id] }),
-    [request.id],
-  );
-
-  const handleShowReflectionError = useCallback(() => {
-    showDialog({
-      id: "grpc-reflection-error",
-      title: "Reflection Failed",
-      size: "sm",
-      render: ({ hide }) => (
-        <>
-          <FormattedError>{reflectionError ?? "unknown"}</FormattedError>
-          <div className="w-full my-4">
-            <Button
-              className="ml-auto"
-              color="primary"
-              size="sm"
-              onClick={async () => {
-                hide();
-                await handleReloadSchema();
-              }}
-            >
-              Retry
-            </Button>
-          </div>
-        </>
-      ),
-    });
-  }, [handleReloadSchema, reflectionError]);
-
  const actions = useMemo(
    () => [
-      // Matches the GraphQL editor: one always-visible control labelled by schema state,
-      // with everything schema-related behind it.
-      <div key="schema" className="opacity-100!">
-        <Dropdown
-          items={[
-            {
-              // Hidden for servers without reflection, which isn't an error
-              hidden: !reflectionError,
-              type: "content",
-              label: (
-                <Banner color="danger">
-                  <p className="mb-1">Reflection failed</p>
-                  <Button
-                    size="xs"
-                    color="danger"
-                    variant="border"
-                    onClick={handleShowReflectionError}
-                  >
-                    View Error
-                  </Button>
-                </Banner>
-              ),
-            },
-            {
-              label: "Generate Example Message",
-              leftSlot: <Icon icon="magic_wand" />,
-              disabled: methodSchema.type !== "schema",
-              onSelect: handleGenerateExample,
-            },
-            { type: "separator" },
-            {
-              label: "Reload Schema",
-              leftSlot: <Icon icon="refresh" spin={reflectionLoading} />,
-              keepOpenOnSelect: true,
-              onSelect: handleReloadSchema,
-            },
-            {
-              label: protoFiles.length > 0 ? "Select Proto Files\u2026" : "Configure Schema\u2026",
-              leftSlot: <Icon icon="settings" />,
-              onSelect: () => {
-                showDialog({
-                  title: "Configure Schema",
-                  size: "md",
-                  className: "h-[30rem]",
-                  id: "grpc-configure-schema",
-                  render: ({ hide }) => <GrpcProtoSelectionDialog onDone={hide} />,
-                });
-              },
-            },
-          ]}
-        >
-          <Button
-            size="sm"
-            variant="border"
-            title="Schema"
-            forDropdown
-            isLoading={reflectionLoading}
-            color={reflectionUnavailable ? "info" : reflectionError ? "danger" : "default"}
-          >
-            {reflectionLoading
-              ? "Inspecting Schema"
+      <div key="reflection" className={classNames(services == null && "!opacity-100")}>
+        <Button
+          size="xs"
+          color={
+            reflectionLoading
+              ? "secondary"
              : reflectionUnavailable
-                ? "Select Proto Files"
+                ? "info"
                : reflectionError
-                  ? "Server Error"
-                  : protoFiles.length > 0
-                    ? pluralizeCount("File", protoFiles.length)
-                    : services != null
-                      ? "Schema Detected"
-                      : "Select Schema"}
-          </Button>
-        </Dropdown>
+                  ? "danger"
+                  : "secondary"
+          }
+          isLoading={reflectionLoading}
+          onClick={() => {
+            showDialog({
+              title: "Configure Schema",
+              size: "md",
+              id: "reflection-failed",
+              render: ({ hide }) => <GrpcProtoSelectionDialog onDone={hide} />,
+            });
+          }}
+        >
+          {reflectionLoading
+            ? "Inspecting Schema"
+            : reflectionUnavailable
+              ? "Select Proto Files"
+              : reflectionError
+                ? "Server Error"
+                : protoFiles.length > 0
+                  ? pluralizeCount("File", protoFiles.length)
+                  : services != null && protoFiles.length === 0
+                    ? "Schema Detected"
+                    : "Select Schema"}
+        </Button>
      </div>,
    ],
-    [
-      handleGenerateExample,
-      handleReloadSchema,
-      handleShowReflectionError,
-      methodSchema.type,
-      protoFiles.length,
-      reflectionError,
-      reflectionLoading,
-      reflectionUnavailable,
-      services,
-    ],
+    [protoFiles.length, reflectionError, reflectionLoading, reflectionUnavailable, services],
  );

  return (
@@ -1,13 +1,13 @@
+import { open } from "@tauri-apps/plugin-dialog";
 import type { GrpcRequest } from "@yaakapp-internal/models";
-import { Banner, InlineCode, VStack } from "@yaakapp-internal/ui";
+import { Banner, HStack, Icon, InlineCode, VStack } from "@yaakapp-internal/ui";
 import { useActiveRequest } from "../hooks/useActiveRequest";
 import { useGrpc } from "../hooks/useGrpc";
 import { useGrpcProtoFiles } from "../hooks/useGrpcProtoFiles";
-import { DialogFooter } from "./core/Dialog";
-import { PathList } from "./core/PathList";
+import { pluralizeCount } from "../lib/pluralize";
+import { Button } from "./core/Button";
+import { IconButton } from "./core/IconButton";
 import { Link } from "./core/Link";
-import { platform } from "@yaakapp-internal/platform";
-import { pluralizeCount } from "@yaakapp-internal/lib/pluralize";

 interface Props {
  onDone: () => void;
@@ -20,10 +20,7 @@ export function GrpcProtoSelectionDialog(props: Props) {
  return <GrpcProtoSelectionDialogWithRequest request={request} {...props} />;
 }

-function GrpcProtoSelectionDialogWithRequest({
-  request,
-  onDone,
-}: Props & { request: GrpcRequest }) {
+function GrpcProtoSelectionDialogWithRequest({ request }: Props & { request: GrpcRequest }) {
  const protoFilesKv = useGrpcProtoFiles(request.id);
  const protoFiles = protoFilesKv.value ?? [];
  const grpc = useGrpc(request, null, protoFiles);
@@ -41,8 +38,54 @@ function GrpcProtoSelectionDialogWithRequest({
  }

  return (
-    <>
-      <VStack space={5} className="pb-4">
+    <VStack className="flex-col-reverse mb-3" space={3}>
+      {/* Buttons on top so they get focus first */}
+      <HStack space={2} justifyContent="start" className="flex-row-reverse mt-3">
+        <Button
+          color="primary"
+          variant="border"
+          onClick={async () => {
+            const selected = await open({
+              title: "Select Proto Files",
+              multiple: true,
+              filters: [{ name: "Proto Files", extensions: ["proto"] }],
+            });
+            if (selected == null) return;
+
+            const newFiles = selected.filter((p) => !protoFiles.includes(p));
+            await protoFilesKv.set([...protoFiles, ...newFiles]);
+            await grpc.reflect.refetch();
+          }}
+        >
+          Add Proto Files
+        </Button>
+        <Button
+          variant="border"
+          color="primary"
+          onClick={async () => {
+            const selected = await open({
+              title: "Select Proto Directory",
+              directory: true,
+            });
+            if (selected == null) return;
+
+            await protoFilesKv.set([...protoFiles.filter((f) => f !== selected), selected]);
+            await grpc.reflect.refetch();
+          }}
+        >
+          Add Import Folders
+        </Button>
+        <Button
+          isLoading={grpc.reflect.isFetching}
+          disabled={grpc.reflect.isFetching}
+          variant="border"
+          color="secondary"
+          onClick={() => grpc.reflect.refetch()}
+        >
+          Refresh Schema
+        </Button>
+      </HStack>
+      <VStack space={5}>
        {reflectError && (
          <Banner color="warning">
            <h1 className="font-bold">
@@ -85,47 +128,46 @@ function GrpcProtoSelectionDialogWithRequest({
          </Banner>
        )}

-        <PathList
-          items={protoFiles.map((path) => ({
-            path,
-            icon: path.endsWith(".proto") ? "file_code" : "folder_code",
-          }))}
-          onRemove={async (path) => {
-            await protoFilesKv.set(protoFiles.filter((p) => p !== path));
-            await grpc.reflect.refetch();
-          }}
-          addLabel="Add proto files or an import folder"
-          addItems={[
-            {
-              label: "Proto files",
-              icon: "file_code",
-              onSelect: async () => {
-                const selected = await platform.dialog.open({
-                  title: "Select Proto Files",
-                  multiple: true,
-                  filters: [{ name: "Proto Files", extensions: ["proto"] }],
-                });
-                if (selected == null) return;
-                const newFiles = selected.filter((p) => !protoFiles.includes(p));
-                await protoFilesKv.set([...protoFiles, ...newFiles]);
-                await grpc.reflect.refetch();
-              },
-            },
-            {
-              label: "Import folder",
-              icon: "folder_code",
-              onSelect: async () => {
-                const selected = await platform.dialog.open({
-                  title: "Select Proto Directory",
-                  directory: true,
-                });
-                if (selected == null) return;
-                await protoFilesKv.set([...protoFiles.filter((f) => f !== selected), selected]);
-                await grpc.reflect.refetch();
-              },
-            },
-          ]}
-        />
+        {protoFiles.length > 0 && (
+          <table className="w-full divide-y divide-surface-highlight">
+            <thead>
+              <tr>
+                <th className="text-text-subtlest" colSpan={3}>
+                  Added File Paths
+                </th>
+              </tr>
+            </thead>
+            <tbody className="divide-y divide-surface-highlight">
+              {protoFiles.map((f, i) => {
+                const parts = f.split("/");
+                // oxlint-disable-next-line no-array-index-key -- none
+                return (
+                  <tr key={f + i} className="group">
+                    <td>
+                      <Icon icon={f.endsWith(".proto") ? "file_code" : "folder_code"} />
+                    </td>
+                    <td className="pl-1 font-mono text-sm" title={f}>
+                      {parts.length > 3 && ".../"}
+                      {parts.slice(-3).join("/")}
+                    </td>
+                    <td className="w-0 py-0.5">
+                      <IconButton
+                        title="Remove file"
+                        variant="border"
+                        size="xs"
+                        icon="trash"
+                        className="my-0.5 ml-auto opacity-50 transition-opacity group-hover:opacity-100"
+                        onClick={async () => {
+                          await protoFilesKv.set(protoFiles.filter((p) => p !== f));
+                        }}
+                      />
+                    </td>
+                  </tr>
+                );
+              })}
+            </tbody>
+          </table>
+        )}
        {reflectionUnimplemented && protoFiles.length === 0 && (
          <Banner>
            <InlineCode>{request.url}</InlineCode> doesn&apos;t implement{" "}
@@ -136,17 +178,6 @@ function GrpcProtoSelectionDialogWithRequest({
          </Banner>
        )}
      </VStack>
-      <DialogFooter
-        actions={[
-          {
-            label: "Refresh Schema",
-            isLoading: grpc.reflect.isFetching,
-            disabled: grpc.reflect.isFetching,
-            onClick: () => grpc.reflect.refetch(),
-          },
-          { label: "Done", color: "primary", onClick: onDone },
-        ]}
-      />
-    </>
+    </VStack>
  );
 }
@@ -1,10 +1,5 @@
-import {
-  type GrpcRequest,
-  type HttpRequestHeader,
-  patchModel,
-  patchModelDebounced,
-} from "@yaakapp-internal/models";
-import { HStack, Icon, useContainerSize, VStack, CountBadge } from "@yaakapp-internal/ui";
+import { type GrpcRequest, type HttpRequestHeader, patchModel } from "@yaakapp-internal/models";
+import { HStack, Icon, useContainerSize, VStack } from "@yaakapp-internal/ui";
 import classNames from "classnames";
 import type { CSSProperties } from "react";
 import { useCallback, useMemo, useRef } from "react";
@@ -15,6 +10,7 @@ import { useInheritedHeaders } from "../hooks/useInheritedHeaders";
 import { useRequestUpdateKey } from "../hooks/useRequestUpdateKey";
 import { resolvedModelName } from "../lib/resolvedModelName";
 import { Button } from "./core/Button";
+import { CountBadge } from "./core/CountBadge";
 import { IconButton } from "./core/IconButton";
 import { PlainInput } from "./core/PlainInput";
 import { RadioDropdown } from "./core/RadioDropdown";
@@ -79,13 +75,11 @@ export function GrpcRequestPane({
  const { width: paneWidth } = useContainerSize(urlContainerEl);

  const handleChangeUrl = useCallback(
-    (url: string) => patchModelDebounced(activeRequest, { url }),
+    (url: string) => patchModel(activeRequest, { url }),
    [activeRequest],
  );

  const handleChangeMessage = useCallback(
-    // Not debounced: handleSend reads message from the store, so a pending
-    // debounced patch would send stale text
    (message: string) => patchModel(activeRequest, { message }),
    [activeRequest],
  );
@@ -132,8 +126,6 @@ export function GrpcRequestPane({
    onSend({ message: activeRequest.message });
  }, [activeRequest, onSend]);

-  const hasDescription = activeRequest.description.trim().length > 0;
-
  const tabs: TabItem[] = useMemo(
    () => [
      { value: TAB_MESSAGE, label: "Message" },
@@ -147,19 +139,19 @@ export function GrpcRequestPane({
      {
        value: TAB_DESCRIPTION,
        label: "Info",
-        rightSlot: hasDescription && <CountBadge count={true} />,
+        rightSlot: activeRequest.description && <CountBadge count={true} />,
      },
    ],
-    [authTab, hasDescription, metadataTab, numSettingsOverrides],
+    [activeRequest.description, authTab, metadataTab, numSettingsOverrides],
  );

  const handleMetadataChange = useCallback(
-    (metadata: HttpRequestHeader[]) => patchModelDebounced(activeRequest, { metadata }),
+    (metadata: HttpRequestHeader[]) => patchModel(activeRequest, { metadata }),
    [activeRequest],
  );

  const handleDescriptionChange = useCallback(
-    (description: string) => patchModelDebounced(activeRequest, { description }),
+    (description: string) => patchModel(activeRequest, { description }),
    [activeRequest],
  );

@@ -170,7 +162,7 @@ export function GrpcRequestPane({
        className={classNames(
          "grid grid-cols-[minmax(0,1fr)_auto] gap-1.5",
          paneWidth === 0 && "opacity-0",
-          paneWidth > 0 && paneWidth < 400 && "grid-cols-1!",
+          paneWidth > 0 && paneWidth < 400 && "!grid-cols-1",
        )}
      >
        <UrlBar
@@ -195,6 +187,13 @@ export function GrpcRequestPane({
              type: "default",
              shortLabel: o.label,
            }))}
+            itemsAfter={[
+              {
+                label: "Refresh",
+                type: "default",
+                leftSlot: <Icon size="sm" icon="refresh" />,
+              },
+            ]}
          >
            <Button
              size="sm"
@@ -202,7 +201,7 @@ export function GrpcRequestPane({
              rightSlot={<Icon size="sm" icon="chevron_down" />}
              disabled={isStreaming || services == null}
              className={classNames(
-                "font-mono text-editor min-w-20 ring-0!",
+                "font-mono text-editor min-w-[5rem] !ring-0",
                paneWidth < 400 && "flex-1",
              )}
            >
@@ -260,7 +259,7 @@ export function GrpcRequestPane({
      <Tabs
        label="Request"
        tabs={tabs}
-        tabListClassName="mt-1 mb-1.5!"
+        tabListClassName="mt-1 !mb-1.5"
        storageKey="grpc_request_tabs"
        activeTabKey={activeRequest.id}
      >
@@ -297,10 +296,10 @@ export function GrpcRequestPane({
              hideLabel
              forceUpdateKey={forceUpdateKey}
              defaultValue={activeRequest.name}
-              className="font-sans text-xl! px-0!"
+              className="font-sans !text-xl !px-0"
              containerClassName="border-0"
              placeholder={resolvedModelName(activeRequest)}
-              onChange={(name) => patchModelDebounced(activeRequest, { name })}
+              onChange={(name) => patchModel(activeRequest, { name })}
            />
            <MarkdownEditor
              name="request-description"
@@ -1,13 +1,5 @@
 import type { GrpcEvent, GrpcRequest } from "@yaakapp-internal/models";
-import {
-  HStack,
-  Icon,
-  type IconProps,
-  LoadingIcon,
-  VStack,
-  useStateWithDeps,
-  KeyValueRows,
-} from "@yaakapp-internal/ui";
+import { HStack, Icon, type IconProps, LoadingIcon, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue, useSetAtom } from "jotai";
 import type { CSSProperties } from "react";
 import { useEffect, useMemo, useState } from "react";
@@ -17,12 +9,13 @@ import {
  pinnedGrpcConnectionIdAtom,
  useGrpcEvents,
 } from "../hooks/usePinnedGrpcConnection";
+import { useStateWithDeps } from "../hooks/useStateWithDeps";
 import { Button } from "./core/Button";
 import { Editor } from "./core/Editor/LazyEditor";
 import { EventDetailHeader, EventViewer } from "./core/EventViewer";
 import { EventViewerRow } from "./core/EventViewerRow";
 import { HotkeyList } from "./core/HotkeyList";
-import { KeyValueRow } from "./core/KeyValueRow";
+import { KeyValueRow, KeyValueRows } from "./core/KeyValueRow";
 import { EmptyStateText } from "./EmptyStateText";
 import { ErrorBoundary } from "./ErrorBoundary";
 import { RecentGrpcConnectionsDropdown } from "./RecentGrpcConnectionsDropdown";
@@ -1 +1,168 @@
-export { HeadersEditor } from "@yaakapp-internal/ui";
+import type { HttpRequestHeader } from "@yaakapp-internal/models";
+import type { GenericCompletionOption } from "@yaakapp-internal/plugins";
+import { HStack } from "@yaakapp-internal/ui";
+import { charsets } from "../lib/data/charsets";
+import { connections } from "../lib/data/connections";
+import { encodings } from "../lib/data/encodings";
+import { headerNames } from "../lib/data/headerNames";
+import { mimeTypes } from "../lib/data/mimetypes";
+import { CountBadge } from "./core/CountBadge";
+import { DetailsBanner } from "./core/DetailsBanner";
+import type { GenericCompletionConfig } from "./core/Editor/genericCompletion";
+import type { InputProps } from "./core/Input";
+import type { Pair, PairEditorProps } from "./core/PairEditor";
+import { PairEditorRow } from "./core/PairEditor";
+import { ensurePairId } from "./core/PairEditor.util";
+import { PairOrBulkEditor } from "./core/PairOrBulkEditor";
+
+type Props = {
+  forceUpdateKey: string;
+  headers: HttpRequestHeader[];
+  inheritedHeaders?: HttpRequestHeader[];
+  inheritedHeadersLabel?: string;
+  stateKey: string;
+  onChange: (headers: HttpRequestHeader[]) => void;
+  label?: string;
+};
+
+export function HeadersEditor({
+  stateKey,
+  headers,
+  inheritedHeaders,
+  inheritedHeadersLabel = "Inherited",
+  onChange,
+  forceUpdateKey,
+}: Props) {
+  // Get header names defined at current level (case-insensitive)
+  const currentHeaderNames = new Set(
+    headers.filter((h) => h.name).map((h) => h.name.toLowerCase()),
+  );
+  // Filter inherited headers: must be enabled, have content, and not be overridden by current level
+  const validInheritedHeaders =
+    inheritedHeaders?.filter(
+      (pair) =>
+        pair.enabled &&
+        (pair.name || pair.value) &&
+        !currentHeaderNames.has(pair.name.toLowerCase()),
+    ) ?? [];
+  const hasInheritedHeaders = validInheritedHeaders.length > 0;
+  return (
+    <div
+      className={
+        hasInheritedHeaders
+          ? "@container w-full h-full grid grid-rows-[auto_minmax(0,1fr)] gap-y-1.5"
+          : "@container w-full h-full"
+      }
+    >
+      {hasInheritedHeaders && (
+        <DetailsBanner
+          color="secondary"
+          className="text-sm"
+          summary={
+            <HStack>
+              {inheritedHeadersLabel} <CountBadge count={validInheritedHeaders.length} />
+            </HStack>
+          }
+        >
+          <div className="pb-2">
+            {validInheritedHeaders?.map((pair, i) => (
+              <PairEditorRow
+                key={`${pair.id}.${i}`}
+                index={i}
+                disabled
+                disableDrag
+                className="py-1"
+                pair={ensurePairId(pair)}
+                stateKey={null}
+                nameAutocompleteFunctions
+                nameAutocompleteVariables
+                valueAutocompleteFunctions
+                valueAutocompleteVariables
+              />
+            ))}
+          </div>
+        </DetailsBanner>
+      )}
+      <PairOrBulkEditor
+        forceUpdateKey={forceUpdateKey}
+        nameAutocomplete={nameAutocomplete}
+        nameAutocompleteFunctions
+        nameAutocompleteVariables
+        namePlaceholder="Header-Name"
+        nameValidate={validateHttpHeader}
+        onChange={onChange}
+        pairs={headers}
+        preferenceName="headers"
+        stateKey={stateKey}
+        valueType={valueType}
+        valueAutocomplete={valueAutocomplete}
+        valueAutocompleteFunctions
+        valueAutocompleteVariables
+      />
+    </div>
+  );
+}
+
+const MIN_MATCH = 3;
+
+const headerOptionsMap: Record<string, string[]> = {
+  "content-type": mimeTypes,
+  accept: ["*/*", ...mimeTypes],
+  "accept-encoding": encodings,
+  connection: connections,
+  "accept-charset": charsets,
+};
+
+const valueType = (pair: Pair): InputProps["type"] => {
+  const name = pair.name.toLowerCase().trim();
+  if (
+    name.includes("authorization") ||
+    name.includes("api-key") ||
+    name.includes("access-token") ||
+    name.includes("auth") ||
+    name.includes("secret") ||
+    name.includes("token") ||
+    name === "cookie" ||
+    name === "set-cookie"
+  ) {
+    return "password";
+  }
+  return "text";
+};
+
+const valueAutocomplete = (headerName: string): GenericCompletionConfig | undefined => {
+  const name = headerName.toLowerCase().trim();
+  const options: GenericCompletionOption[] =
+    headerOptionsMap[name]?.map((o) => ({
+      label: o,
+      type: "constant",
+      boost: 1, // Put above other completions
+    })) ?? [];
+  return { minMatch: MIN_MATCH, options };
+};
+
+const nameAutocomplete: PairEditorProps["nameAutocomplete"] = {
+  minMatch: MIN_MATCH,
+  options: headerNames.map((t) =>
+    typeof t === "string"
+      ? {
+          label: t,
+          type: "constant",
+          boost: 1, // Put above other completions
+        }
+      : {
+          ...t,
+          boost: 1, // Put above other completions
+        },
+  ),
+};
+
+const validateHttpHeader = (v: string) => {
+  if (v === "") {
+    return true;
+  }
+
+  // Template strings are not allowed so we replace them with a valid example string
+  const withoutTemplateStrings = v.replace(/\$\{\[\s*[^\]\s]+\s*]}/gi, "123");
+  return withoutTemplateStrings.match(/^[a-zA-Z0-9-_]+$/) !== null;
+};
@@ -6,21 +6,19 @@ import type {
  Workspace,
 } from "@yaakapp-internal/models";
 import { patchModel } from "@yaakapp-internal/models";
-import { HStack, Icon, InlineCode, SegmentedControl } from "@yaakapp-internal/ui";
+import { HStack, Icon, InlineCode } from "@yaakapp-internal/ui";
 import { useCallback } from "react";
 import { openFolderSettings } from "../commands/openFolderSettings";
 import { openWorkspaceSettings } from "../commands/openWorkspaceSettings";
-import { useAuthDropdownOptions } from "../hooks/useAuthTab";
 import { useHttpAuthenticationConfig } from "../hooks/useHttpAuthenticationConfig";
 import { useInheritedAuthentication } from "../hooks/useInheritedAuthentication";
 import { useRenderTemplate } from "../hooks/useRenderTemplate";
 import { resolvedModelName } from "../lib/resolvedModelName";
-import { Button } from "./core/Button";
 import { Dropdown, type DropdownItem } from "./core/Dropdown";
 import { IconButton } from "./core/IconButton";
 import { Input, type InputProps } from "./core/Input";
 import { Link } from "./core/Link";
-import { RadioDropdown } from "./core/RadioDropdown";
+import { SegmentedControl } from "./core/SegmentedControl";
 import { DynamicForm } from "./DynamicForm";
 import { EmptyStateText } from "./EmptyStateText";

@@ -37,8 +35,7 @@ export function HttpAuthenticationEditor({ model }: Props) {
  );

  const handleChange = useCallback(
-    async (authentication: Record<string, unknown>) =>
-      await patchModel(model, { authentication }),
+    async (authentication: Record<string, unknown>) => await patchModel(model, { authentication }),
    [model],
  );

@@ -50,8 +47,7 @@ export function HttpAuthenticationEditor({ model }: Props) {
    return (
      <EmptyStateText>
        <p>
-          Auth plugin not found for{" "}
-          <InlineCode>{model.authenticationType}</InlineCode>
+          Auth plugin not found for <InlineCode>{model.authenticationType}</InlineCode>
        </p>
      </EmptyStateText>
    );
@@ -60,20 +56,11 @@ export function HttpAuthenticationEditor({ model }: Props) {
  if (inheritedAuth == null) {
    if (model.model === "workspace" || model.model === "folder") {
      return (
-        <EmptyStateText className="flex-col gap-3">
-          <div className="not-italic flex flex-col items-center gap-3 text-center">
-            <p className="max-w-md text-sm text-text-subtle">
-              Choose an auth method to apply it to all requests in{" "}
-              <strong className="font-semibold text-text-subtle">
-                {resolvedModelName(model)}
-              </strong>
-              .
-            </p>
-            <AuthenticationTypeDropdown model={model} />
-            <Link href="https://yaak.app/docs/using-yaak/request-inheritance">
-              Documentation
-            </Link>
-          </div>
+        <EmptyStateText className="flex-col gap-1">
+          <p>
+            Apply auth to all requests in <strong>{resolvedModelName(model)}</strong>
+          </p>
+          <Link href="https://yaak.app/docs/using-yaak/request-inheritance">Documentation</Link>
        </EmptyStateText>
      );
    }
@@ -96,8 +83,7 @@ export function HttpAuthenticationEditor({ model }: Props) {
            type="submit"
            className="underline hover:text-text"
            onClick={() => {
-              if (inheritedAuth.model === "folder")
-                openFolderSettings(inheritedAuth.id, "auth");
+              if (inheritedAuth.model === "folder") openFolderSettings(inheritedAuth.id, "auth");
              else openWorkspaceSettings("auth");
            }}
          >
@@ -117,8 +103,7 @@ export function HttpAuthenticationEditor({ model }: Props) {
            hideLabel
            name="enabled"
            value={
-              model.authentication.disabled === false ||
-              model.authentication.disabled == null
+              model.authentication.disabled === false || model.authentication.disabled == null
                ? "__TRUE__"
                : model.authentication.disabled === true
                  ? "__FALSE__"
@@ -155,7 +140,7 @@ export function HttpAuthenticationEditor({ model }: Props) {
                title="Authentication Actions"
                icon="settings"
                size="xs"
-                className="text-secondary!"
+                className="!text-secondary"
              />
            </Dropdown>
          )}
@@ -166,9 +151,7 @@ export function HttpAuthenticationEditor({ model }: Props) {
              className="w-full"
              stateKey={`auth.${model.id}.dynamic`}
              value={model.authentication.disabled}
-              onChange={(v) =>
-                handleChange({ ...model.authentication, disabled: v })
-              }
+              onChange={(v) => handleChange({ ...model.authentication, disabled: v })}
            />
          </div>
        )}
@@ -186,33 +169,6 @@ export function HttpAuthenticationEditor({ model }: Props) {
  );
 }

-function AuthenticationTypeDropdown({ model }: Props) {
-  const options = useAuthDropdownOptions(model);
-
-  if (options == null) return null;
-
-  return (
-    <RadioDropdown
-      items={options.items}
-      itemsAfter={options.itemsAfter}
-      itemsBefore={options.itemsBefore}
-      value={options.value}
-      onChange={options.onChange}
-    >
-      <Button
-        color="secondary"
-        variant="border"
-        size="sm"
-        rightSlot={
-          <Icon icon="chevron_down" size="sm" className="text-text-subtle" />
-        }
-      >
-        Select Auth
-      </Button>
-    </RadioDropdown>
-  );
-}
-
 function AuthenticationDisabledInput({
  value,
  onChange,
@@ -242,11 +198,7 @@ function AuthenticationDisabledInput({
      rightSlot={
        <div className="px-1 flex items-center">
          <div className="rounded-full bg-surface-highlight text-xs px-1.5 py-0.5 text-text-subtle whitespace-nowrap">
-            {rendered.isPending
-              ? "loading"
-              : rendered.data
-                ? "enabled"
-                : "disabled"}
+            {rendered.isPending ? "loading" : rendered.data ? "enabled" : "disabled"}
          </div>
        </div>
      }
@@ -57,7 +57,7 @@ export function HttpRequestLayout({ activeRequest, style }: Props) {
          <GraphQLDocsExplorer
            requestId={activeRequest.id}
            schema={graphQLSchema}
-            className={classNames(orientation === "horizontal" && "ml-0!")}
+            className={classNames(orientation === "horizontal" && "!ml-0")}
            style={style}
          />
        )}
@@ -1,29 +1,24 @@
 import type { HttpRequest } from "@yaakapp-internal/models";
-import { getModel, patchModel, patchModelDebounced } from "@yaakapp-internal/models";
+import { patchModel } from "@yaakapp-internal/models";
 import type { GenericCompletionOption } from "@yaakapp-internal/plugins";
-import {
-  CountBadge,
-  type EditablePair,
-  type ExtraPaneTab,
-  HttpRequestPaneView,
-  InlineCode,
-  languageFromContentType,
-} from "@yaakapp-internal/ui";
+import classNames from "classnames";
 import { atom, useAtomValue } from "jotai";
-import type { CSSProperties, ReactNode } from "react";
+import type { CSSProperties } from "react";
 import { lazy, Suspense, useCallback, useMemo, useRef, useState } from "react";
-import { importCurl, looksLikeCurl } from "../commands/importCurl";
-import { allRequestUrlsAtom } from "../hooks/useAllRequests";
+import { activeRequestIdAtom } from "../hooks/useActiveRequestId";
+import { allRequestsAtom } from "../hooks/useAllRequests";
 import { useAuthTab } from "../hooks/useAuthTab";
 import { useCancelHttpResponse } from "../hooks/useCancelHttpResponse";
 import { useHeadersTab } from "../hooks/useHeadersTab";
+import { useImportCurl } from "../hooks/useImportCurl";
 import { useInheritedHeaders } from "../hooks/useInheritedHeaders";
 import { usePinnedHttpResponse } from "../hooks/usePinnedHttpResponse";
 import { useRequestEditor, useRequestEditorEvent } from "../hooks/useRequestEditor";
 import { useRequestUpdateKey } from "../hooks/useRequestUpdateKey";
 import { useSendAnyHttpRequest } from "../hooks/useSendAnyHttpRequest";
-import { fireAndForget } from "../lib/fireAndForget";
-import { httpRequestToView } from "../lib/httpViews";
+import { deepEqualAtom } from "../lib/atoms";
+import { languageFromContentType } from "../lib/contentType";
+import { generateId } from "../lib/generateId";
 import {
  BODY_TYPE_BINARY,
  BODY_TYPE_FORM_MULTIPART,
@@ -35,24 +30,30 @@ import {
  BODY_TYPE_XML,
  getContentTypeFromHeaders,
 } from "../lib/model_util";
-import { derivePathPlaceholderPairs, renamePathPlaceholder } from "../lib/pathPlaceholders";
 import { prepareImportQuerystring } from "../lib/prepareImportQuerystring";
-import { convertRequestBody } from "../lib/requestBodyConversion";
 import { resolvedModelName } from "../lib/resolvedModelName";
 import { showToast } from "../lib/toast";
 import { BinaryFileEditor } from "./BinaryFileEditor";
 import { ConfirmLargeRequestBody } from "./ConfirmLargeRequestBody";
+import { CountBadge } from "./core/CountBadge";
 import type { GenericCompletionConfig } from "./core/Editor/genericCompletion";
-import { getUrlCompletionConfig } from "./core/Editor/url/completion";
+import { Editor } from "./core/Editor/LazyEditor";
+import { InlineCode } from "@yaakapp-internal/ui";
+import type { Pair } from "./core/PairEditor";
 import { PlainInput } from "./core/PlainInput";
 import type { TabItem, TabsRef } from "./core/Tabs/Tabs";
-import { setActiveTab } from "./core/Tabs/Tabs";
+import { setActiveTab, TabContent, Tabs } from "./core/Tabs/Tabs";
+import { EmptyStateText } from "./EmptyStateText";
+import { FormMultipartEditor } from "./FormMultipartEditor";
+import { FormUrlencodedEditor } from "./FormUrlencodedEditor";
+import { HeadersEditor } from "./HeadersEditor";
 import { HttpAuthenticationEditor } from "./HttpAuthenticationEditor";
+import { JsonBodyEditor } from "./JsonBodyEditor";
 import { MarkdownEditor } from "./MarkdownEditor";
-import { countOverriddenSettings, ModelSettingsEditor } from "./ModelSettingsEditor";
 import { RequestMethodDropdown } from "./RequestMethodDropdown";
+import { countOverriddenSettings, ModelSettingsEditor } from "./ModelSettingsEditor";
+import { UrlBar } from "./UrlBar";
 import { UrlParametersEditor } from "./UrlParameterEditor";
-import { generateId } from "@yaakapp-internal/lib/generateId";

 const GraphQLEditor = lazy(() =>
  import("./graphql/GraphQLEditor").then((m) => ({ default: m.GraphQLEditor })),
@@ -73,12 +74,15 @@ const TAB_SETTINGS = "settings";
 const TAB_DESCRIPTION = "description";
 const TABS_STORAGE_KEY = "http_request_tabs";

-// Derived from the identity-stable URL list so this only recomputes when a URL
-// actually changes. The active request's own URL is included, but exact matches
-// are filtered out at completion time by genericCompletion.
-const requestUrlOptionsAtom = atom((get): GenericCompletionOption[] =>
-  get(allRequestUrlsAtom).map((url) => ({ type: "constant", label: url })),
-);
+const nonActiveRequestUrlsAtom = atom((get) => {
+  const activeRequestId = get(activeRequestIdAtom);
+  const requests = get(allRequestsAtom);
+  return requests
+    .filter((r) => r.id !== activeRequestId)
+    .map((r): GenericCompletionOption => ({ type: "constant", label: r.url }));
+});
+
+const memoNotActiveRequestUrlsAtom = deepEqualAtom(nonActiveRequestUrlsAtom);

 export function HttpRequestPane({ style, fullHeight, className, activeRequest }: Props) {
  const activeRequestId = activeRequest.id;
@@ -126,33 +130,22 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
    [activeRequest],
  );

-  // Renaming a path placeholder has to rewrite the URL and rename the parameter together, or the
-  // value detaches from the placeholder.
-  // NOTE: Reads the request fresh rather than closing over `activeRequest`. The row that calls this
-  //  holds onto it until the URL's placeholders change, so a captured request would go stale and
-  //  patch its parameter list back over newer edits.
-  const handleRenamePathPlaceholder = useCallback(
-    (oldName: string, newName: string) => {
-      const request = getModel("http_request", activeRequestId);
-      if (request == null) return false;
-
-      const patch = renamePathPlaceholder(request, oldName, newName);
-      if (patch == null) return false; // Unusable name, so the editor reverts the field
-      void patchModel(request, patch);
-      return true;
-    },
-    [activeRequestId],
-  );
-
-  const { urlParameterPairs, urlParametersKey } = useMemo(
-    () =>
-      derivePathPlaceholderPairs(
-        activeRequest.url,
-        activeRequest.urlParameters,
-        handleRenamePathPlaceholder,
-      ),
-    [activeRequest.url, activeRequest.urlParameters, handleRenamePathPlaceholder],
-  );
+  const { urlParameterPairs, urlParametersKey } = useMemo(() => {
+    const placeholderNames = Array.from(activeRequest.url.matchAll(/\/(:[^/]+)/g)).map(
+      (m) => m[1] ?? "",
+    );
+    const nonEmptyParameters = activeRequest.urlParameters.filter((p) => p.name || p.value);
+    const items: Pair[] = [...nonEmptyParameters];
+    for (const name of placeholderNames) {
+      const item = items.find((p) => p.name === name);
+      if (item) {
+        item.readOnlyName = true;
+      } else {
+        items.push({ name, value: "", enabled: true, readOnlyName: true, id: generateId() });
+      }
+    }
+    return { urlParameterPairs: items, urlParametersKey: placeholderNames.join(",") };
+  }, [activeRequest.url, activeRequest.urlParameters]);

  let numParams = 0;
  if (
@@ -164,11 +157,9 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
      : 0;
  }

-  const hasDescription = activeRequest.description.trim().length > 0;
-
-  const bodyTab = useMemo<TabItem>(
-    () =>
-      ({
+  const tabs = useMemo<TabItem[]>(
+    () => [
+      {
        value: TAB_BODY,
        rightSlot: numParams > 0 ? <CountBadge count={numParams} /> : null,
        options: {
@@ -205,14 +196,7 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
              });
            };

-            const patch: Partial<HttpRequest> = {
-              bodyType,
-              body: convertRequestBody({
-                body: activeRequest.body,
-                fromBodyType: activeRequest.bodyType,
-                toBodyType: bodyType,
-              }),
-            };
+            const patch: Partial<HttpRequest> = { bodyType };
            let newContentType: string | null | undefined;
            if (bodyType === BODY_TYPE_NONE) {
              newContentType = null;
@@ -245,36 +229,72 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
            }
          },
        },
-      }) satisfies TabItem,
-    [activeRequest, contentType, handleContentTypeChange, numParams],
+      },
+      {
+        value: TAB_PARAMS,
+        rightSlot: <CountBadge count={urlParameterPairs.length} />,
+        label: "Params",
+      },
+      ...headersTab,
+      ...authTab,
+      {
+        value: TAB_SETTINGS,
+        label: "Settings",
+        rightSlot: <CountBadge count={numSettingsOverrides} />,
+      },
+      {
+        value: TAB_DESCRIPTION,
+        label: "Info",
+      },
+    ],
+    [
+      activeRequest,
+      authTab,
+      contentType,
+      handleContentTypeChange,
+      headersTab,
+      numParams,
+      numSettingsOverrides,
+      urlParameterPairs.length,
+    ],
  );

  const { mutate: sendRequest } = useSendAnyHttpRequest();
  const { activeResponse } = usePinnedHttpResponse(activeRequestId);
  const { mutate: cancelResponse } = useCancelHttpResponse(activeResponse?.id ?? null);
  const updateKey = useRequestUpdateKey(activeRequestId);
+  const { mutate: importCurl } = useImportCurl();

  const handleBodyChange = useCallback(
-    (body: HttpRequest["body"]) => patchModelDebounced(activeRequest, { body }),
+    (body: HttpRequest["body"]) => patchModel(activeRequest, { body }),
    [activeRequest],
  );

  const handleBodyTextChange = useCallback(
-    (text: string) => patchModelDebounced(activeRequest, { body: { ...activeRequest.body, text } }),
+    (text: string) => patchModel(activeRequest, { body: { ...activeRequest.body, text } }),
    [activeRequest],
  );

-  const autocompleteUrls = useAtomValue(requestUrlOptionsAtom);
+  const autocompleteUrls = useAtomValue(memoNotActiveRequestUrlsAtom);

  const autocomplete: GenericCompletionConfig = useMemo(
-    () => getUrlCompletionConfig(autocompleteUrls),
+    () => ({
+      minMatch: 3,
+      options:
+        autocompleteUrls.length > 0
+          ? autocompleteUrls
+          : [
+              { label: "http://", type: "constant" },
+              { label: "https://", type: "constant" },
+            ],
+    }),
    [autocompleteUrls],
  );

  const handlePaste = useCallback(
    async (e: ClipboardEvent, text: string) => {
-      if (looksLikeCurl(text)) {
-        importCurl.mutate({ overwriteRequestId: activeRequestId, command: text });
+      if (text.startsWith("curl ")) {
+        importCurl({ overwriteRequestId: activeRequestId, command: text });
      } else {
        const patch = prepareImportQuerystring(text);
        if (patch != null) {
@@ -296,7 +316,7 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
        }
      }
    },
-    [activeRequest, activeRequestId, forceParamsRefresh, forceUrlRefresh],
+    [activeRequest, activeRequestId, forceParamsRefresh, forceUrlRefresh, importCurl],
  );
  const handleSend = useCallback(
    () => sendRequest(activeRequest.id ?? null),
@@ -304,156 +324,158 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
  );

  const handleUrlChange = useCallback(
-    (url: string) => patchModelDebounced(activeRequest, { url }),
+    (url: string) => patchModel(activeRequest, { url }),
    [activeRequest],
  );

-  const handleJsonOrBodyTextChange = useCallback(
-    (text: string, bodyType: string | null) => {
-      // JSON writes at once, as its editor always has; other text debounces
-      if (bodyType === BODY_TYPE_JSON) {
-        return patchModel(activeRequest, { body: { ...activeRequest.body, text } });
-      }
-      return handleBodyTextChange(text);
-    },
-    [activeRequest, handleBodyTextChange],
-  );
-
-  const handleSendJsonCommentsChange = useCallback(
-    (sendJsonComments: boolean) => {
-      const newBody = { ...activeRequest.body };
-      if (sendJsonComments) {
-        newBody.sendJsonComments = true;
-      } else {
-        delete newBody.sendJsonComments;
-      }
-      fireAndForget(patchModel(activeRequest, { body: newBody }));
-    },
-    [activeRequest],
-  );
-
-  const requestView = useMemo(() => httpRequestToView(activeRequest), [activeRequest]);
-
-  const extraTabs = useMemo<ExtraPaneTab[]>(
-    () => [
-      {
-        tab: {
-          value: TAB_SETTINGS,
-          label: "Settings",
-          rightSlot: <CountBadge count={numSettingsOverrides} />,
-        },
-        content: <ModelSettingsEditor model={activeRequest} />,
-      },
-      {
-        tab: {
-          value: TAB_DESCRIPTION,
-          label: "Info",
-          rightSlot: hasDescription && <CountBadge count={true} />,
-        },
-        content: (
-          <div className="grid grid-rows-[auto_minmax(0,1fr)] h-full">
-            <PlainInput
-              label="Request Name"
-              hideLabel
-              forceUpdateKey={updateKey}
-              defaultValue={activeRequest.name}
-              className="font-sans text-xl! px-0!"
-              containerClassName="border-0"
-              placeholder={resolvedModelName(activeRequest)}
-              onChange={(name) => patchModel(activeRequest, { name })}
-            />
-            <MarkdownEditor
-              name="request-description"
-              placeholder="Request description"
-              defaultValue={activeRequest.description}
-              stateKey={`description.${activeRequest.id}`}
-              forceUpdateKey={updateKey}
-              onChange={(description) => patchModel(activeRequest, { description })}
-            />
-          </div>
-        ),
-      },
-    ],
-    [activeRequest, hasDescription, numSettingsOverrides, updateKey],
-  );
-
-  const renderBody = useCallback(
-    (sharedEditor: ReactNode) => (
-      <ConfirmLargeRequestBody request={activeRequest}>
-        {activeRequest.bodyType === BODY_TYPE_GRAPHQL ? (
-          <Suspense>
-            <GraphQLEditor
-              forceUpdateKey={forceUpdateKey}
-              baseRequest={activeRequest}
-              request={activeRequest}
-              onChange={handleBodyChange}
-            />
-          </Suspense>
-        ) : activeRequest.bodyType === BODY_TYPE_BINARY ? (
-          <BinaryFileEditor
-            requestId={activeRequest.id}
-            contentType={contentType}
-            body={activeRequest.body}
-            onChange={(body) => patchModelDebounced(activeRequest, { body })}
-            onChangeContentType={handleContentTypeChange}
-          />
-        ) : (
-          sharedEditor
-        )}
-      </ConfirmLargeRequestBody>
-    ),
-    [activeRequest, contentType, forceUpdateKey, handleBodyChange, handleContentTypeChange],
-  );
-
-  const renderUrlParameters = useCallback(
-    (pairs: EditablePair[]) => (
-      <UrlParametersEditor
-        stateKey={`params.${activeRequest.id}`}
-        forceUpdateKey={forceUpdateKey + urlParametersKey}
-        pairs={pairs}
-        onChange={(urlParameters) => patchModelDebounced(activeRequest, { urlParameters })}
-      />
-    ),
-    [activeRequest, forceUpdateKey, urlParametersKey],
-  );
-
  return (
-    <HttpRequestPaneView
-      editable
+    <div
      style={style}
-      className={className}
-      fullHeight={fullHeight}
-      request={requestView}
-      tabsRef={tabsRef}
-      tabsStorageKey={TABS_STORAGE_KEY}
-      forceUpdateKey={forceUpdateKey}
-      urlBarKey={forceUpdateKey + urlKey}
-      urlForceUpdateKey={updateKey}
-      urlAutocomplete={autocomplete}
-      onUrlChange={handleUrlChange}
-      onUrlPasteOverwrite={handlePaste}
-      onSend={handleSend}
-      onCancel={cancelResponse}
-      isSending={activeResponse != null && activeResponse.state !== "closed"}
-      sendHotkeyAction="request.send"
-      focusHotkeyAction="url_bar.focus"
-      methodSlot={<RequestMethodDropdown request={activeRequest} className="ml-0.5 h-full!" />}
-      bodyTab={bodyTab}
-      renderBody={renderBody}
-      onBodyChange={handleBodyChange}
-      onBodyTextChange={handleJsonOrBodyTextChange}
-      onSendJsonCommentsChange={handleSendJsonCommentsChange}
-      jsonNoticeStorageKey={activeRequest.workspaceId}
-      urlParameterPairs={urlParameterPairs}
-      renderUrlParameters={renderUrlParameters}
-      headersTabs={headersTab}
-      inheritedHeaders={inheritedHeaders}
-      headersForceUpdateKey={`${forceUpdateHeaderEditorKey}::${forceUpdateKey}`}
-      onHeadersChange={(headers) => patchModelDebounced(activeRequest, { headers })}
-      authTabs={authTab}
-      authContent={<HttpAuthenticationEditor model={activeRequest} />}
-      extraTabs={extraTabs}
-    />
+      className={classNames(className, "h-full grid grid-rows-[auto_minmax(0,1fr)] grid-cols-1")}
+    >
+      {activeRequest && (
+        <>
+          <UrlBar
+            stateKey={`url.${activeRequest.id}`}
+            key={forceUpdateKey + urlKey}
+            url={activeRequest.url}
+            placeholder="https://example.com"
+            onPasteOverwrite={handlePaste}
+            autocomplete={autocomplete}
+            onSend={handleSend}
+            onCancel={cancelResponse}
+            onUrlChange={handleUrlChange}
+            leftSlot={
+              <div className="py-0.5">
+                <RequestMethodDropdown request={activeRequest} className="ml-0.5 !h-full" />
+              </div>
+            }
+            forceUpdateKey={updateKey}
+            isLoading={activeResponse != null && activeResponse.state !== "closed"}
+          />
+          <Tabs
+            ref={tabsRef}
+            label="Request"
+            tabs={tabs}
+            tabListClassName="mt-1 -mb-1.5"
+            storageKey={TABS_STORAGE_KEY}
+            activeTabKey={activeRequestId}
+          >
+            <TabContent value={TAB_AUTH}>
+              <HttpAuthenticationEditor model={activeRequest} />
+            </TabContent>
+            <TabContent value={TAB_HEADERS}>
+              <HeadersEditor
+                inheritedHeaders={inheritedHeaders}
+                forceUpdateKey={`${forceUpdateHeaderEditorKey}::${forceUpdateKey}`}
+                headers={activeRequest.headers}
+                stateKey={`headers.${activeRequest.id}`}
+                onChange={(headers) => patchModel(activeRequest, { headers })}
+              />
+            </TabContent>
+            <TabContent value={TAB_PARAMS}>
+              <UrlParametersEditor
+                stateKey={`params.${activeRequest.id}`}
+                forceUpdateKey={forceUpdateKey + urlParametersKey}
+                pairs={urlParameterPairs}
+                onChange={(urlParameters) => patchModel(activeRequest, { urlParameters })}
+              />
+            </TabContent>
+            <TabContent value={TAB_SETTINGS}>
+              <ModelSettingsEditor model={activeRequest} />
+            </TabContent>
+            <TabContent value={TAB_BODY}>
+              <ConfirmLargeRequestBody request={activeRequest}>
+                {activeRequest.bodyType === BODY_TYPE_JSON ? (
+                  <JsonBodyEditor
+                    forceUpdateKey={forceUpdateKey}
+                    heightMode={fullHeight ? "full" : "auto"}
+                    request={activeRequest}
+                  />
+                ) : activeRequest.bodyType === BODY_TYPE_XML ? (
+                  <Editor
+                    forceUpdateKey={forceUpdateKey}
+                    autocompleteFunctions
+                    autocompleteVariables
+                    placeholder="..."
+                    heightMode={fullHeight ? "full" : "auto"}
+                    defaultValue={`${activeRequest.body?.text ?? ""}`}
+                    language="xml"
+                    onChange={handleBodyTextChange}
+                    stateKey={`xml.${activeRequest.id}`}
+                  />
+                ) : activeRequest.bodyType === BODY_TYPE_GRAPHQL ? (
+                  <Suspense>
+                    <GraphQLEditor
+                      forceUpdateKey={forceUpdateKey}
+                      baseRequest={activeRequest}
+                      request={activeRequest}
+                      onChange={handleBodyChange}
+                    />
+                  </Suspense>
+                ) : activeRequest.bodyType === BODY_TYPE_FORM_URLENCODED ? (
+                  <FormUrlencodedEditor
+                    forceUpdateKey={forceUpdateKey}
+                    request={activeRequest}
+                    onChange={handleBodyChange}
+                  />
+                ) : activeRequest.bodyType === BODY_TYPE_FORM_MULTIPART ? (
+                  <FormMultipartEditor
+                    forceUpdateKey={forceUpdateKey}
+                    request={activeRequest}
+                    onChange={handleBodyChange}
+                  />
+                ) : activeRequest.bodyType === BODY_TYPE_BINARY ? (
+                  <BinaryFileEditor
+                    requestId={activeRequest.id}
+                    contentType={contentType}
+                    body={activeRequest.body}
+                    onChange={(body) => patchModel(activeRequest, { body })}
+                    onChangeContentType={handleContentTypeChange}
+                  />
+                ) : typeof activeRequest.bodyType === "string" ? (
+                  <Editor
+                    forceUpdateKey={forceUpdateKey}
+                    autocompleteFunctions
+                    autocompleteVariables
+                    language={languageFromContentType(contentType)}
+                    placeholder="..."
+                    heightMode={fullHeight ? "full" : "auto"}
+                    defaultValue={`${activeRequest.body?.text ?? ""}`}
+                    onChange={handleBodyTextChange}
+                    stateKey={`other.${activeRequest.id}`}
+                  />
+                ) : (
+                  <EmptyStateText>No Body</EmptyStateText>
+                )}
+              </ConfirmLargeRequestBody>
+            </TabContent>
+            <TabContent value={TAB_DESCRIPTION}>
+              <div className="grid grid-rows-[auto_minmax(0,1fr)] h-full">
+                <PlainInput
+                  label="Request Name"
+                  hideLabel
+                  forceUpdateKey={updateKey}
+                  defaultValue={activeRequest.name}
+                  className="font-sans !text-xl !px-0"
+                  containerClassName="border-0"
+                  placeholder={resolvedModelName(activeRequest)}
+                  onChange={(name) => patchModel(activeRequest, { name })}
+                />
+                <MarkdownEditor
+                  name="request-description"
+                  placeholder="Request description"
+                  defaultValue={activeRequest.description}
+                  stateKey={`description.${activeRequest.id}`}
+                  forceUpdateKey={updateKey}
+                  onChange={(description) => patchModel(activeRequest, { description })}
+                />
+              </div>
+            </TabContent>
+          </Tabs>
+        </>
+      )}
+    </div>
  );
 }

@@ -1,36 +1,47 @@
 import type { HttpResponse, HttpResponseEvent } from "@yaakapp-internal/models";
-import {
-  CountBadge,
-  type ExtraPaneTab,
-  type HostBodyViewerArgs,
-  HttpResponsePaneView,
-  Icon,
-  type ResponseTextViewerExtras,
-  type TextFilterApi,
-  Tooltip,
-  VStack,
-} from "@yaakapp-internal/ui";
-import type { CSSProperties } from "react";
-import { useCallback, useMemo } from "react";
+import { Banner, HStack, Icon, LoadingIcon, VStack } from "@yaakapp-internal/ui";
+import classNames from "classnames";
+import type { ComponentType, CSSProperties } from "react";
+import { lazy, Suspense, useMemo } from "react";
 import { useCancelHttpResponse } from "../hooks/useCancelHttpResponse";
-import { useCopyHttpResponse } from "../hooks/useCopyHttpResponse";
-import { useRequestBodyLoader, useResponseBodyLoader } from "../hooks/useHttpBodyLoaders";
 import { useHttpResponseEvents } from "../hooks/useHttpResponseEvents";
 import { usePinnedHttpResponse } from "../hooks/usePinnedHttpResponse";
-import { useRecentFilters } from "../hooks/useRecentFilters";
+import { useResponseBodyBytes, useResponseBodyText } from "../hooks/useResponseBodyText";
 import { useResponseViewMode } from "../hooks/useResponseViewMode";
-import { useSaveResponse } from "../hooks/useSaveResponse";
 import { useTimelineViewMode } from "../hooks/useTimelineViewMode";
-import { httpResponseToView } from "../lib/httpViews";
-import { getCookieCounts } from "../lib/model_util";
-import { CopyButton } from "./CopyButton";
+import { getMimeTypeFromContentType } from "../lib/contentType";
+import { getContentTypeFromHeaders, getCookieCounts } from "../lib/model_util";
+import { ConfirmLargeResponse } from "./ConfirmLargeResponse";
+import { ConfirmLargeResponseRequest } from "./ConfirmLargeResponseRequest";
+import { Button } from "./core/Button";
+import { CountBadge } from "./core/CountBadge";
 import { HotkeyList } from "./core/HotkeyList";
-import { IconButton } from "./core/IconButton";
+import { HttpResponseDurationTag } from "./core/HttpResponseDurationTag";
+import { HttpStatusTag } from "./core/HttpStatusTag";
 import { PillButton } from "./core/PillButton";
+import { SizeTag } from "./core/SizeTag";
+import type { TabItem } from "./core/Tabs/Tabs";
+import { TabContent, Tabs } from "./core/Tabs/Tabs";
+import { Tooltip } from "./core/Tooltip";
+import { EmptyStateText } from "./EmptyStateText";
+import { ErrorBoundary } from "./ErrorBoundary";
 import { HttpResponseTimeline } from "./HttpResponseTimeline";
 import { RecentHttpResponsesDropdown } from "./RecentHttpResponsesDropdown";
+import { RequestBodyViewer } from "./RequestBodyViewer";
+import { ResponseCookies } from "./ResponseCookies";
+import { ResponseHeaders } from "./ResponseHeaders";
+import { AudioViewer } from "./responseViewers/AudioViewer";
+import { CsvViewer } from "./responseViewers/CsvViewer";
 import { EventStreamViewer } from "./responseViewers/EventStreamViewer";
-import { RecentFiltersDropdown } from "./responseViewers/RecentFiltersDropdown";
+import { HTMLOrTextViewer } from "./responseViewers/HTMLOrTextViewer";
+import { ImageViewer } from "./responseViewers/ImageViewer";
+import { MultipartViewer } from "./responseViewers/MultipartViewer";
+import { SvgViewer } from "./responseViewers/SvgViewer";
+import { VideoViewer } from "./responseViewers/VideoViewer";
+
+const PdfViewer = lazy(() =>
+  import("./responseViewers/PdfViewer").then((m) => ({ default: m.PdfViewer })),
+);

 interface Props {
  style?: CSSProperties;
@@ -38,6 +49,10 @@ interface Props {
  activeRequestId: string;
 }

+const TAB_BODY = "body";
+const TAB_REQUEST = "request";
+const TAB_HEADERS = "headers";
+const TAB_COOKIES = "cookies";
 const TAB_TIMELINE = "timeline";

 export type TimelineViewMode = "timeline" | "text";
@@ -47,11 +62,12 @@ interface RedirectDropWarning {
  droppedHeaders: string[];
 }

-/** The shared response pane, bound to the pinned response of the active request */
 export function HttpResponsePane({ style, className, activeRequestId }: Props) {
  const { activeResponse, setPinnedResponseId, responses } = usePinnedHttpResponse(activeRequestId);
  const [viewMode, setViewMode] = useResponseViewMode(activeResponse?.requestId);
  const [timelineViewMode, setTimelineViewMode] = useTimelineViewMode();
+  const contentType = getContentTypeFromHeaders(activeResponse?.headers ?? null);
+  const mimeType = contentType == null ? null : getMimeTypeFromContentType(contentType).essence;

  const responseEvents = useHttpResponseEvents(activeResponse);
  const redirectDropWarning = useMemo(
@@ -62,183 +78,258 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
    activeResponse?.state === "closed" && redirectDropWarning != null;

  const cookieCounts = useMemo(() => getCookieCounts(responseEvents.data), [responseEvents.data]);
-  const saveResponse = useSaveResponse(activeResponse ?? null);
-  const copyResponse = useCopyHttpResponse(activeResponse ?? null);
-  const cancel = useCancelHttpResponse(activeResponse?.id ?? null);
-  const body = useResponseBodyLoader(activeResponse ?? null);
-  const requestBody = useRequestBodyLoader(activeResponse ?? null);
-  const textViewer = useResponseTextViewerExtras(activeResponse ?? null);

-  const responseView = useMemo(
-    () => (activeResponse == null ? null : httpResponseToView(activeResponse, responseEvents.data)),
-    [activeResponse, responseEvents.data],
-  );
-
-  const extraTabs = useMemo<ExtraPaneTab[]>(
-    () =>
-      activeResponse == null
-        ? []
-        : [
-            {
-              tab: {
-                value: TAB_TIMELINE,
-                rightSlot: <CountBadge count={responseEvents.data?.length ?? 0} />,
-                options: {
-                  value: timelineViewMode,
-                  onChange: (v) => setTimelineViewMode((v as TimelineViewMode) ?? "timeline"),
-                  items: [
-                    { label: "Timeline", value: "timeline" },
-                    { label: "Timeline (Text)", shortLabel: "Timeline", value: "text" },
-                  ],
-                },
-              },
-              content: (
-                <HttpResponseTimeline response={activeResponse} viewMode={timelineViewMode} />
-              ),
-            },
+  const tabs = useMemo<TabItem[]>(
+    () => [
+      {
+        value: TAB_BODY,
+        label: "Response",
+        options: {
+          value: viewMode,
+          onChange: setViewMode,
+          items: [
+            { label: "Response", value: "pretty" },
+            ...(mimeType?.startsWith("image")
+              ? []
+              : [{ label: "Response (Raw)", shortLabel: "Raw", value: "raw" }]),
          ],
-    [activeResponse, responseEvents.data?.length, setTimelineViewMode, timelineViewMode],
+        },
+      },
+      {
+        value: TAB_REQUEST,
+        label: "Request",
+        rightSlot:
+          (activeResponse?.requestContentLength ?? 0) > 0 ? <CountBadge count={true} /> : null,
+      },
+      {
+        value: TAB_HEADERS,
+        label: "Headers",
+        rightSlot: (
+          <CountBadge
+            count={activeResponse?.requestHeaders.length ?? 0}
+            count2={activeResponse?.headers.length ?? 0}
+            showZero
+          />
+        ),
+      },
+      {
+        value: TAB_COOKIES,
+        label: "Cookies",
+        rightSlot:
+          cookieCounts.sent > 0 || cookieCounts.received > 0 ? (
+            <CountBadge count={cookieCounts.sent} count2={cookieCounts.received} showZero />
+          ) : null,
+      },
+      {
+        value: TAB_TIMELINE,
+        rightSlot: <CountBadge count={responseEvents.data?.length ?? 0} />,
+        options: {
+          value: timelineViewMode,
+          onChange: (v) => setTimelineViewMode((v as TimelineViewMode) ?? "timeline"),
+          items: [
+            { label: "Timeline", value: "timeline" },
+            { label: "Timeline (Text)", shortLabel: "Timeline", value: "text" },
+          ],
+        },
+      },
+    ],
+    [
+      activeResponse?.headers,
+      activeResponse?.requestContentLength,
+      activeResponse?.requestHeaders.length,
+      cookieCounts.sent,
+      cookieCounts.received,
+      mimeType,
+      responseEvents.data?.length,
+      setViewMode,
+      viewMode,
+      timelineViewMode,
+      setTimelineViewMode,
+    ],
  );

-  const renderBodyViewer = useCallback(
-    ({ mimeType, viewMode }: HostBodyViewerArgs) =>
-      activeResponse != null && mimeType?.match(/^text\/event-stream/i) && viewMode === "pretty" ? (
-        <EventStreamViewer response={activeResponse} />
-      ) : null,
-    [activeResponse],
-  );
+  const cancel = useCancelHttpResponse(activeResponse?.id ?? null);

  return (
-    <HttpResponsePaneView
+    <div
      style={style}
-      className={className}
-      response={responseView}
-      body={body}
-      requestBody={requestBody}
-      emptyState={
+      className={classNames(
+        className,
+        "x-theme-responsePane",
+        "max-h-full h-full",
+        "bg-surface rounded-md border border-border-subtle overflow-hidden",
+        "relative",
+      )}
+    >
+      {activeResponse == null ? (
        <HotkeyList hotkeys={["request.send", "model.create", "sidebar.focus", "url_bar.focus"]} />
-      }
-      viewMode={viewMode === "raw" ? "raw" : "pretty"}
-      onViewModeChange={setViewMode}
-      activeTabKey={activeRequestId}
-      onSaveBody={saveResponse.mutate}
-      onCopyBody={copyResponse.mutate}
-      onCancel={cancel.mutate}
-      cookieCounts={cookieCounts}
-      extraTabs={extraTabs}
-      textViewer={textViewer}
-      renderBodyViewer={renderBodyViewer}
-      renderCopyButton={renderCopyButton}
-      statusLineCenter={
-        shouldShowRedirectDropWarning ? (
-          <Tooltip
-            tabIndex={0}
-            className="my-auto pl-3 shrink-0 max-w-full justify-self-end overflow-hidden"
-            content={
-              <VStack alignItems="start" space={1} className="text-xs">
-                <span className="font-medium text-warning">Redirect changed this request</span>
-                {redirectDropWarning.droppedBodyCount > 0 && (
-                  <span>
-                    Body dropped on {redirectDropWarning.droppedBodyCount}{" "}
-                    {redirectDropWarning.droppedBodyCount === 1 ? "redirect hop" : "redirect hops"}
-                  </span>
-                )}
-                {redirectDropWarning.droppedHeaders.length > 0 && (
-                  <span>
-                    Headers dropped:{" "}
-                    <span className="font-mono">
-                      {redirectDropWarning.droppedHeaders.join(", ")}
-                    </span>
-                  </span>
-                )}
-                <span className="text-text-subtle">See Timeline for details.</span>
-              </VStack>
-            }
+      ) : (
+        <div className="h-full w-full grid grid-rows-[auto_minmax(0,1fr)] grid-cols-1">
+          <HStack
+            className={classNames(
+              "text-text-subtle w-full flex-shrink-0",
+              // Remove a bit of space because the tabs have lots too
+              "-mb-1.5",
+            )}
          >
-            <span className="inline-flex min-w-0">
-              <PillButton
-                color="warning"
-                className="font-sans text-sm shrink! max-w-full"
-                innerClassName="flex items-center"
-                leftSlot={<Icon icon="alert_triangle" size="xs" color="warning" />}
+            {activeResponse && (
+              <div
+                className={classNames(
+                  "grid grid-cols-[auto_minmax(4rem,1fr)_auto]",
+                  "cursor-default select-none",
+                  "whitespace-nowrap w-full pl-3 overflow-x-auto font-mono text-sm hide-scrollbars",
+                )}
              >
-                <span className="truncate">{getRedirectWarningLabel(redirectDropWarning)}</span>
-              </PillButton>
-            </span>
-          </Tooltip>
-        ) : null
-      }
-      statusLineRight={
-        activeResponse != null && (
-          <RecentHttpResponsesDropdown
-            responses={responses}
-            activeResponse={activeResponse}
-            onPinnedResponseId={setPinnedResponseId}
-          />
-        )
-      }
-    />
+                <HStack space={2} className="w-full flex-shrink-0">
+                  {activeResponse.state !== "closed" && <LoadingIcon size="sm" />}
+                  <HttpStatusTag showReason response={activeResponse} />
+                  <span>&bull;</span>
+                  <HttpResponseDurationTag response={activeResponse} />
+                  <span>&bull;</span>
+                  <SizeTag
+                    contentLength={activeResponse.contentLength ?? 0}
+                    contentLengthCompressed={activeResponse.contentLengthCompressed}
+                  />
+                </HStack>
+                {shouldShowRedirectDropWarning ? (
+                  <Tooltip
+                    tabIndex={0}
+                    className="my-auto pl-3 flex-shrink-0 max-w-full justify-self-end overflow-hidden"
+                    content={
+                      <VStack alignItems="start" space={1} className="text-xs">
+                        <span className="font-medium text-warning">
+                          Redirect changed this request
+                        </span>
+                        {redirectDropWarning.droppedBodyCount > 0 && (
+                          <span>
+                            Body dropped on {redirectDropWarning.droppedBodyCount}{" "}
+                            {redirectDropWarning.droppedBodyCount === 1
+                              ? "redirect hop"
+                              : "redirect hops"}
+                          </span>
+                        )}
+                        {redirectDropWarning.droppedHeaders.length > 0 && (
+                          <span>
+                            Headers dropped:{" "}
+                            <span className="font-mono">
+                              {redirectDropWarning.droppedHeaders.join(", ")}
+                            </span>
+                          </span>
+                        )}
+                        <span className="text-text-subtle">See Timeline for details.</span>
+                      </VStack>
+                    }
+                  >
+                    <span className="inline-flex min-w-0">
+                      <PillButton
+                        color="warning"
+                        className="font-sans text-sm !flex-shrink max-w-full"
+                        innerClassName="flex items-center"
+                        leftSlot={<Icon icon="alert_triangle" size="xs" color="warning" />}
+                      >
+                        <span className="truncate">
+                          {getRedirectWarningLabel(redirectDropWarning)}
+                        </span>
+                      </PillButton>
+                    </span>
+                  </Tooltip>
+                ) : (
+                  <span />
+                )}
+                <div className="justify-self-end flex-shrink-0">
+                  <RecentHttpResponsesDropdown
+                    responses={responses}
+                    activeResponse={activeResponse}
+                    onPinnedResponseId={setPinnedResponseId}
+                  />
+                </div>
+              </div>
+            )}
+          </HStack>
+
+          <div className="overflow-hidden flex flex-col min-h-0">
+            {activeResponse?.error && (
+              <Banner color="danger" className="mx-3 mt-1 flex-shrink-0">
+                {activeResponse.error}
+              </Banner>
+            )}
+            {/* Show tabs if we have any data (headers, body, etc.) even if there's an error */}
+            <Tabs
+              tabs={tabs}
+              label="Response"
+              className="ml-3 mr-3 mb-3 min-h-0 flex-1"
+              tabListClassName="mt-0.5 -mb-1.5"
+              storageKey="http_response_tabs"
+              activeTabKey={activeRequestId}
+            >
+              <TabContent value={TAB_BODY}>
+                <ErrorBoundary name="Http Response Viewer">
+                  <Suspense>
+                    <ConfirmLargeResponse response={activeResponse}>
+                      {activeResponse.state === "initialized" ? (
+                        <EmptyStateText>
+                          <VStack space={3}>
+                            <HStack space={3}>
+                              <LoadingIcon className="text-text-subtlest" />
+                              Sending Request
+                            </HStack>
+                            <Button size="sm" variant="border" onClick={() => cancel.mutate()}>
+                              Cancel
+                            </Button>
+                          </VStack>
+                        </EmptyStateText>
+                      ) : activeResponse.state === "closed" &&
+                        (activeResponse.contentLength ?? 0) === 0 ? (
+                        <EmptyStateText>Empty</EmptyStateText>
+                      ) : mimeType?.match(/^text\/event-stream/i) && viewMode === "pretty" ? (
+                        <EventStreamViewer response={activeResponse} />
+                      ) : mimeType?.match(/^image\/svg/) ? (
+                        <HttpSvgViewer response={activeResponse} />
+                      ) : mimeType?.match(/^image/i) ? (
+                        <EnsureCompleteResponse response={activeResponse} Component={ImageViewer} />
+                      ) : mimeType?.match(/^audio/i) ? (
+                        <EnsureCompleteResponse response={activeResponse} Component={AudioViewer} />
+                      ) : mimeType?.match(/^video/i) ? (
+                        <EnsureCompleteResponse response={activeResponse} Component={VideoViewer} />
+                      ) : mimeType?.match(/^multipart/i) && viewMode === "pretty" ? (
+                        <HttpMultipartViewer response={activeResponse} />
+                      ) : mimeType?.match(/pdf/i) ? (
+                        <EnsureCompleteResponse response={activeResponse} Component={PdfViewer} />
+                      ) : mimeType?.match(/csv|tab-separated/i) && viewMode === "pretty" ? (
+                        <HttpCsvViewer className="pb-2" response={activeResponse} />
+                      ) : (
+                        <HTMLOrTextViewer
+                          textViewerClassName="-mr-2 bg-surface" // Pull to the right
+                          response={activeResponse}
+                          pretty={viewMode === "pretty"}
+                        />
+                      )}
+                    </ConfirmLargeResponse>
+                  </Suspense>
+                </ErrorBoundary>
+              </TabContent>
+              <TabContent value={TAB_REQUEST}>
+                <ConfirmLargeResponseRequest response={activeResponse}>
+                  <RequestBodyViewer response={activeResponse} />
+                </ConfirmLargeResponseRequest>
+              </TabContent>
+              <TabContent value={TAB_HEADERS}>
+                <ResponseHeaders response={activeResponse} />
+              </TabContent>
+              <TabContent value={TAB_COOKIES}>
+                <ResponseCookies response={activeResponse} />
+              </TabContent>
+              <TabContent value={TAB_TIMELINE}>
+                <HttpResponseTimeline response={activeResponse} viewMode={timelineViewMode} />
+              </TabContent>
+            </Tabs>
+          </div>
+        </div>
+      )}
+    </div>
  );
 }

-/** The client's additions to the response text viewer: filter history, save and copy */
-function useResponseTextViewerExtras(
-  response: HttpResponse | null,
-): ResponseTextViewerExtras | undefined {
-  const filterStateKey = `response.body.${response?.requestId ?? ""}`;
-  const { recentFilters, addFilter, removeFilter, togglePin, clearFilters } =
-    useRecentFilters(filterStateKey);
-  const saveResponse = useSaveResponse(response);
-  const copyResponse = useCopyHttpResponse(response);
-  const filterLeftSlot = useCallback(
-    (filter: TextFilterApi) => (
-      <div className="py-0.5 flex">
-        <RecentFiltersDropdown
-          recentFilters={recentFilters}
-          activeFilter={filter.appliedFilter}
-          onSelect={filter.replaceFilter}
-          onRemove={removeFilter}
-          onTogglePin={togglePin}
-          onClear={clearFilters}
-        />
-      </div>
-    ),
-    [recentFilters, removeFilter, togglePin, clearFilters],
-  );
-
-  if (response == null) return undefined;
-  const actionsDisabled = response.state !== "closed" && response.status >= 100;
-  return {
-    filterStateKey,
-    onFilterApplied: addFilter,
-    filterLeftSlot,
-    footerActions: [
-      <IconButton
-        key="save"
-        size="sm"
-        icon="save"
-        title="Save response to file"
-        disabled={actionsDisabled}
-        onClick={() => saveResponse.mutate()}
-        className="border !border-border-subtle"
-      />,
-      <IconButton
-        key="copy"
-        size="sm"
-        icon="copy"
-        title="Copy response body"
-        disabled={actionsDisabled}
-        onClick={() => copyResponse.mutate()}
-        className="border !border-border-subtle"
-      />,
-    ],
-  };
-}
-
-function renderCopyButton(getText: () => Promise<string | null>) {
-  return <CopyButton color="secondary" variant="border" size="xs" text={getText} />;
-}
-
 function getRedirectDropWarning(
  events: HttpResponseEvent[] | undefined,
 ): RedirectDropWarning | null {
@@ -286,3 +377,51 @@ function getRedirectWarningLabel(warning: RedirectDropWarning): string {
  }
  return "Dropped headers";
 }
+
+function EnsureCompleteResponse({
+  response,
+  Component,
+}: {
+  response: HttpResponse;
+  Component: ComponentType<{ bodyPath: string }>;
+}) {
+  if (response.bodyPath === null) {
+    return <div>Empty response body</div>;
+  }
+
+  // Wait until the response has been fully-downloaded
+  if (response.state !== "closed") {
+    return (
+      <EmptyStateText>
+        <LoadingIcon />
+      </EmptyStateText>
+    );
+  }
+
+  return <Component bodyPath={response.bodyPath} />;
+}
+
+function HttpSvgViewer({ response }: { response: HttpResponse }) {
+  const body = useResponseBodyText({ response, filter: null });
+
+  if (!body.data) return null;
+
+  return <SvgViewer text={body.data} />;
+}
+
+function HttpCsvViewer({ response, className }: { response: HttpResponse; className?: string }) {
+  const body = useResponseBodyText({ response, filter: null });
+
+  return <CsvViewer text={body.data ?? null} className={className} />;
+}
+
+function HttpMultipartViewer({ response }: { response: HttpResponse }) {
+  const body = useResponseBodyBytes({ response });
+
+  if (body.data == null) return null;
+
+  const contentTypeHeader = getContentTypeFromHeaders(response.headers);
+  const boundary = contentTypeHeader?.split("boundary=")[1] ?? "unknown";
+
+  return <MultipartViewer data={body.data} boundary={boundary} idPrefix={response.id} />;
+}
@@ -13,8 +13,9 @@ import { resolvedModelName } from "../lib/resolvedModelName";
 import { Editor } from "./core/Editor/LazyEditor";
 import { type EventDetailAction, EventDetailHeader, EventViewer } from "./core/EventViewer";
 import { EventViewerRow } from "./core/EventViewerRow";
-import { Icon, type IconProps, HttpStatusTagRaw, KeyValueRows } from "@yaakapp-internal/ui";
-import { KeyValueRow } from "./core/KeyValueRow";
+import { HttpStatusTagRaw } from "./core/HttpStatusTag";
+import { Icon, type IconProps } from "@yaakapp-internal/ui";
+import { KeyValueRow, KeyValueRows } from "./core/KeyValueRow";
 import type { TimelineViewMode } from "./HttpResponsePane";

 interface Props {
@@ -1,112 +0,0 @@
-import { platform, useCapability } from "@yaakapp-internal/platform";
-import { Icon } from "@yaakapp-internal/ui";
-import * as m from "motion/react-m";
-import { useEffect, useState } from "react";
-import { importCurl, looksLikeCurl } from "../commands/importCurl";
-import { useWindowFocus } from "../hooks/useWindowFocus";
-import { showToast } from "../lib/toast";
-import { Button } from "./core/Button";
-
-/**
- * Offers to create a request from a Curl command on the clipboard. A host that can read
- * the clipboard on its own offers it whenever the window is focused; one that would have
- * to prompt for permission first waits for the user to paste instead.
- */
-export function ImportCurl() {
-  return useCapability("clipboardRead") ? <ImportCurlButton /> : <ImportCurlOnPaste />;
-}
-
-function ImportCurlButton() {
-  const focused = useWindowFocus();
-  const [clipboardText, setClipboardText] = useState("");
-  const [isLoading, setIsLoading] = useState(false);
-
-  // oxlint-disable-next-line react-hooks/exhaustive-deps -- none
-  useEffect(() => {
-    void platform.clipboard.readText().then(setClipboardText);
-  }, [focused]);
-
-  if (!looksLikeCurl(clipboardText)) {
-    return null;
-  }
-
-  return (
-    <m.div
-      initial={{ opacity: 0, scale: 0 }}
-      animate={{ opacity: 1, scale: 1 }}
-      transition={{ delay: 0.5 }}
-    >
-      <Button
-        size="2xs"
-        variant="border"
-        color="success"
-        className="rounded-full"
-        rightSlot={<Icon icon="import" size="sm" />}
-        isLoading={isLoading}
-        title="Import Curl command from clipboard"
-        onClick={async () => {
-          setIsLoading(true);
-          try {
-            await importCurl.mutateAsync({ command: clipboardText });
-            setClipboardText(""); // Hide the button until the clipboard changes
-          } catch (e) {
-            console.log("Failed to import curl", e);
-          } finally {
-            setIsLoading(false);
-          }
-        }}
-      >
-        Import Curl
-      </Button>
-    </m.div>
-  );
-}
-
-function ImportCurlOnPaste() {
-  useEffect(() => {
-    const handlePaste = (e: ClipboardEvent) => {
-      const command = e.clipboardData?.getData("text/plain") ?? "";
-      if (!looksLikeCurl(command)) return;
-
-      // Editable targets keep the text as text. The URL editor imports it itself.
-      if (isEditable(e.target)) return;
-
-      showToast({
-        id: "curl-paste",
-        color: "success",
-        message: (
-          <div>
-            <h2 className="font-semibold">Curl command detected</h2>
-            <p className="text-text-subtle text-sm">Create a request from the pasted command?</p>
-          </div>
-        ),
-        action: ({ hide }) => (
-          <Button
-            size="xs"
-            color="success"
-            className="mr-auto min-w-20"
-            rightSlot={<Icon icon="import" size="sm" />}
-            onClick={() => {
-              hide();
-              importCurl.mutate({ command });
-            }}
-          >
-            Create Request
-          </Button>
-        ),
-      });
-    };
-
-    document.addEventListener("paste", handlePaste);
-    return () => document.removeEventListener("paste", handlePaste);
-  }, []);
-
-  return null;
-}
-
-function isEditable(target: EventTarget | null) {
-  if (!(target instanceof HTMLElement)) return false;
-  if (target.isContentEditable) return true;
-  if (target.closest(".cm-editor") != null) return true;
-  return ["INPUT", "TEXTAREA", "SELECT"].includes(target.tagName);
-}
@@ -0,0 +1,56 @@
+import { clear, readText } from "@tauri-apps/plugin-clipboard-manager";
+import * as m from "motion/react-m";
+import { useEffect, useState } from "react";
+import { useImportCurl } from "../hooks/useImportCurl";
+import { useWindowFocus } from "../hooks/useWindowFocus";
+import { Button } from "./core/Button";
+import { Icon } from "@yaakapp-internal/ui";
+
+export function ImportCurlButton() {
+  const focused = useWindowFocus();
+  const [clipboardText, setClipboardText] = useState("");
+
+  const importCurl = useImportCurl();
+  const [isLoading, setIsLoading] = useState(false);
+
+  // oxlint-disable-next-line react-hooks/exhaustive-deps -- none
+  useEffect(() => {
+    void readText().then(setClipboardText);
+  }, [focused]);
+
+  if (!clipboardText?.trim().startsWith("curl ")) {
+    return null;
+  }
+
+  return (
+    <m.div
+      initial={{ opacity: 0, scale: 0 }}
+      animate={{ opacity: 1, scale: 1 }}
+      transition={{ delay: 0.5 }}
+    >
+      <Button
+        size="2xs"
+        variant="border"
+        color="success"
+        className="rounded-full"
+        rightSlot={<Icon icon="import" size="sm" />}
+        isLoading={isLoading}
+        title="Import Curl command from clipboard"
+        onClick={async () => {
+          setIsLoading(true);
+          try {
+            await importCurl.mutateAsync({ command: clipboardText });
+            await clear(); // Clear the clipboard so the button goes away
+            setClipboardText("");
+          } catch (e) {
+            console.log("Failed to import curl", e);
+          } finally {
+            setIsLoading(false);
+          }
+        }}
+      >
+        Import Curl
+      </Button>
+    </m.div>
+  );
+}
@@ -1,769 +1,54 @@
-import {
-  type ImportDestination,
-  type ImportPlan,
-  type ImportPlanItem,
-  type ImportSource,
-  type Workspace,
-} from "@yaakapp-internal/models";
-import {
-  Banner,
-  FormattedError,
-  HStack,
-  Icon,
-  VStack,
-  IconTooltip,
-  SegmentedControl,
-} from "@yaakapp-internal/ui";
-import classNames from "classnames";
-import { type ComponentProps, useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { errorMessage } from "../lib/errorMessage";
-import { CommercialUseBanner } from "./CommercialUseBanner";
-import {
-  ImportSourceList,
-  type ImportSourceDetection,
-  type ImportSourcePath,
-  InlineButton,
-  toSourcePath,
-} from "./ImportSourceList";
-import type { CheckboxTreeNode } from "./core/CheckboxTree";
-import { CheckboxTree } from "./core/CheckboxTree";
-import { Chip } from "./core/Chip";
-import { DialogFooter } from "./core/Dialog";
-import { Select } from "./core/Select";
-import { pluralize } from "@yaakapp-internal/lib/pluralize";
+import { VStack } from "@yaakapp-internal/ui";
+import { useState } from "react";
+import { useLocalStorage } from "react-use";
+import { Button } from "./core/Button";
+import { SelectFile } from "./SelectFile";

 interface Props {
-  currentWorkspace: Workspace | null;
-  workspaces: Workspace[];
-  planSources: (sources: ImportSourcePath[], destination: ImportDestination) => Promise<ImportPlan>;
-  detectSource: (source: ImportSourcePath) => Promise<string>;
-  listSources: (workspaceId: string) => Promise<ImportSource[]>;
-  findSourcesForOrigin: (args: { filePath?: string; url?: string }) => Promise<ImportSource[]>;
-  commit: (plan: ImportPlan) => Promise<void>;
-  cancel: () => void;
-  onError: (err: unknown) => void;
+  importData: (filePath: string) => Promise<void>;
 }

-/**
- * Loads the current workspace's linked sources before rendering the dialog, so the inner
- * component can construct its initial state (prefilled path, destination) in one pass instead of
- * patching it in with effects after the first paint.
- */
-export function ImportDataDialog(props: Props) {
-  const [initialSources, setInitialSources] = useState<ImportSource[] | null>(null);
-  const { currentWorkspace, listSources } = props;
-
-  useEffect(() => {
-    let cancelled = false;
-    const load = currentWorkspace == null ? Promise.resolve([]) : listSources(currentWorkspace.id);
-    load
-      .then((sources) => {
-        if (!cancelled) setInitialSources(sources);
-      })
-      .catch(() => {
-        if (!cancelled) setInitialSources([]);
-      });
-    return () => {
-      cancelled = true;
-    };
-  }, [currentWorkspace, listSources]);
-
-  if (initialSources == null) return null;
-  return <LoadedImportDataDialog {...props} initialSources={initialSources} />;
-}
-
-function LoadedImportDataDialog({
-  currentWorkspace,
-  workspaces,
-  planSources,
-  detectSource,
-  findSourcesForOrigin,
-  commit,
-  cancel,
-  onError,
-  initialSources,
-}: Props & { initialSources: ImportSource[] }) {
+export function ImportDataDialog({ importData }: Props) {
  const [isLoading, setIsLoading] = useState<boolean>(false);
-  const [sourceError, setSourceError] = useState<unknown>(null);
-  const [plan, setPlan] = useState<ImportPlan | null>(null);
-  const [items, setItems] = useState<ImportPlanItem[]>([]);
-  // null means no explicit choice yet, so the default below applies
-  const [destinationChoice, setDestinationChoice] = useState<"new" | "current" | "other" | null>(
-    null,
-  );
-  const [otherWorkspaceId, setOtherWorkspaceId] = useState<string | null>(null);
-  const [originSources, setOriginSources] = useState<ImportSource[]>(initialSources);
-  const initialPaths = useMemo(
-    () => [...new Set(initialSources.map((source) => source.origin))].map(toSourcePath),
-    [initialSources],
-  );
-  const [sources, setSources] = useState<ImportSourcePath[]>(initialPaths);
-  const knownPaths = useRef(new Set(initialPaths.map((source) => source.path)));
-  const [detections, setDetections] = useState<Record<string, ImportSourceDetection>>({});
-  const detect = useCallback(
-    (added: ImportSourcePath[]) => {
-      setDetections((prev) => ({
-        ...prev,
-        ...Object.fromEntries(added.map((s) => [s.path, { status: "loading" as const }])),
-      }));
-      for (const source of added) {
-        const settle = (detection: ImportSourceDetection) =>
-          setDetections((prev) =>
-            source.path in prev ? { ...prev, [source.path]: detection } : prev,
-          );
-        detectSource(source).then(
-          (importer) => settle({ status: "ok", importer }),
-          (err) => settle({ status: "error", message: errorMessage(err) }),
-        );
-      }
-    },
-    [detectSource],
-  );
-  const allDetected = sources.every((source) => detections[source.path]?.status === "ok");
-  useEffect(() => {
-    detect(initialPaths);
-  }, [detect, initialPaths]);
-
-  const addSources = useCallback(
-    (added: ImportSourcePath[]) => {
-      setSourceError(null);
-      const fresh = added.filter(({ path }) => {
-        if (knownPaths.current.has(path)) return false;
-        knownPaths.current.add(path);
-        return true;
-      });
-      if (fresh.length === 0) return;
-      setSources((existing) => [...existing, ...fresh]);
-      detect(fresh);
-    },
-    [detect],
-  );
-  const removeSource = (path: string) => {
-    setSourceError(null);
-    knownPaths.current.delete(path);
-    setSources((current) => current.filter((source) => source.path !== path));
-    setDetections(({ [path]: _removed, ...rest }) => rest);
-  };
-
-  useEffect(() => {
-    let cancelled = false;
-    if (sources.length === 0) {
-      setOriginSources([]);
-      return;
-    }
-    Promise.all(
-      sources.map(({ path, kind }) =>
-        findSourcesForOrigin(kind === "url" ? { url: path } : { filePath: path }),
-      ),
-    )
-      .then((found) => {
-        if (!cancelled) setOriginSources(found.flat());
-      })
-      .catch(() => {
-        if (!cancelled) setOriginSources([]);
-      });
-    return () => {
-      cancelled = true;
-    };
-  }, [sources, findSourcesForOrigin]);
-
-  // The one workspace these sources are linked to, if there is exactly one.
-  const linkedWorkspace = useMemo(() => {
-    const ids = [...new Set(originSources.map((s) => s.workspaceId))];
-    if (ids.length !== 1) return null;
-    return workspaces.find((w) => w.id === ids[0]) ?? null;
-  }, [originSources, workspaces]);
-
-  // A file linked to the current workspace defaults back into it, so re-importing doesn't
-  // accidentally create a duplicate workspace. A file linked elsewhere only gets a suggestion —
-  // silently targeting a workspace that is neither new nor current is too surprising. An
-  // explicit choice always wins.
-  const destinationKind =
-    destinationChoice ??
-    (linkedWorkspace != null && linkedWorkspace.id === currentWorkspace?.id ? "current" : "new");
-
-  const destinationWorkspaceId =
-    destinationKind === "current"
-      ? (currentWorkspace?.id ?? null)
-      : destinationKind === "other"
-        ? otherWorkspaceId
-        : null;
-
-  const destination = (): ImportDestination => {
-    if (destinationWorkspaceId == null) {
-      return { type: "new_workspace" };
-    }
-    return {
-      type: "existing_workspace",
-      workspaceId: destinationWorkspaceId,
-    };
-  };
-
-  const handlePreview = async () => {
-    setIsLoading(true);
-    setSourceError(null);
-    try {
-      const nextPlan = await planSources(sources, destination());
-      setPlan(nextPlan);
-      setItems(nextPlan.items);
-    } catch (err) {
-      setSourceError(err);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const handleCommit = async () => {
-    if (plan == null) return;
-    setIsLoading(true);
-    try {
-      await commit({ ...plan, items });
-    } catch (err) {
-      onError(err);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  // A folder row's checkbox carries everything beneath it, deletions included — the row labels
-  // say which of those are destructive. Checking anything also brings back the folders it needs
-  // to live in.
-  const toggleNode = (node: CheckboxTreeNode<TreeRow>, checked: boolean) => {
-    const targets = new Set(togglableItems(node).map((i) => i.modelId));
-    if (checked && node.data.kind === "item") {
-      const byId = new Map(items.map((i) => [i.modelId, i]));
-      for (const ancestor of ancestorsOf(node.data.item, byId)) {
-        if (isMissingFolder(ancestor)) targets.add(ancestor.modelId);
-      }
-    }
-    setItems((prev) => prev.map((i) => (targets.has(i.modelId) ? { ...i, selected: checked } : i)));
-  };
-
-  const resolveConflict = (modelId: string, resolution: "keep_mine" | "take_source") => {
-    setItems((prev) =>
-      prev.map((item) => (item.modelId === modelId ? { ...item, resolution } : item)),
-    );
-  };
-
-  // Deleting a folder takes its contents with it, so those rows have nothing left to decide.
-  const disabledIds = useMemo(() => {
-    const disabled = new Set<string>();
-    const byId = new Map(items.map((i) => [i.modelId, i]));
-    for (const item of items) {
-      if (item.action !== "delete") continue;
-      for (const parent of ancestorsOf(item, byId)) {
-        if (parent.action === "delete" && parent.selected) {
-          disabled.add(item.modelId);
-        }
-      }
-    }
-    return disabled;
-  }, [items]);
-
-  if (plan != null) {
-    const unchanged = items.filter((i) => i.action === "unchanged");
-    const footerNote =
-      unchanged.length > 0
-        ? `${unchanged.length} ${pluralize("resource", unchanged.length)} unchanged`
-        : "";
-    const changeCount = items.filter((item) => {
-      if (disabledIds.has(item.modelId)) return false;
-      if (item.action === "conflict") return item.resolution === "take_source";
-      if (item.action === "unchanged") return false;
-      return item.selected;
-    }).length;
-
-    // The row's label carries what kind of destination it is, so the value can just be its name
-    const [destinationLabel, destinationValue] = ((): [string, string] => {
-      if (plan.destination.type === "new_workspace") {
-        const names = plan.resources.workspaces.map((w) => w.name).filter((n) => n !== "");
-        if (names.length === 0) return ["New workspace", "Untitled"];
-        return [
-          names.length === 1 ? "New workspace" : `${names.length} new workspaces`,
-          names.join(", "),
-        ];
-      }
-      const { workspaceId } = plan.destination;
-      const name = workspaces.find((w) => w.id === workspaceId)?.name ?? "Unknown workspace";
-      return ["Destination", name];
-    })();
-
-    // The destination workspace roots the tree. It is not a plan item — commit always applies
-    // it — so its checkbox only aggregates the subtree.
-    const workspaceRoots: CheckboxTreeNode<TreeRow>[] = (() => {
-      const planDestination = plan.destination;
-      const existing =
-        planDestination.type === "existing_workspace"
-          ? workspaces.find((w) => w.id === planDestination.workspaceId)
-          : null;
-      const destinations = existing ? [existing] : plan.resources.workspaces;
-      if (destinations.length === 1) {
-        const workspace = destinations[0]!;
-        return [
-          {
-            key: workspace.id,
-            data: {
-              kind: "destination",
-              label: workspace.name,
-              isNew: planDestination.type === "new_workspace",
-            },
-            children: buildItemTree(items),
-          },
-        ];
-      }
-      const workspaceById = new Map(
-        [
-          ...plan.resources.environments,
-          ...plan.resources.folders,
-          ...plan.resources.httpRequests,
-          ...plan.resources.grpcRequests,
-          ...plan.resources.websocketRequests,
-        ].map((resource) => [resource.id, resource.workspaceId]),
-      );
-      return destinations.map((workspace) => ({
-        key: workspace.id,
-        data: {
-          kind: "destination",
-          label: workspace.name,
-          isNew: planDestination.type === "new_workspace",
-        },
-        children: buildItemTree(
-          items.filter((item) => workspaceById.get(item.modelId) === workspace.id),
-        ),
-      }));
-    })();
-
-    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={destinationLabel} value={destinationValue} />
-          </div>
-
-          {plan.warnings
-            .filter(
-              (warning, index, warnings) =>
-                warnings.findIndex(
-                  (other) =>
-                    other.title === warning.title &&
-                    other.detail === warning.detail &&
-                    other.level === warning.level,
-                ) === index,
-            )
-            .map((warning) => (
-              <Banner
-                key={`${warning.level}:${warning.title}:${warning.detail}`}
-                color={warning.level === "warning" ? "warning" : "info"}
-                className="flex items-start gap-2.5"
-              >
-                <Icon
-                  icon={warning.level === "warning" ? "alert_triangle" : "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>
-              </Banner>
-            ))}
-
-          {workspaceRoots.map((root) => (
-            <div key={root.key} className="rounded-lg border border-border-subtle px-3 py-2">
-              <CheckboxTree
-                node={root}
-                checked={nodeCheckedStatus}
-                onCheck={toggleNode}
-                isCheckboxDisabled={(n) => disabledIds.has(n.key)}
-                isCollapsedByDefault={(n) =>
-                  (n.data.kind === "destination" && workspaceRoots.length > 1) ||
-                  (n.data.kind === "item" && n.data.item.action === "ignored")
-                }
-                isRelevant={(n) =>
-                  n.data.kind === "destination" ||
-                  (n.data.kind === "item" && n.data.item.action !== "unchanged")
-                }
-                renderRow={(n) => (
-                  <ImportTreeRow row={n.data} onResolveConflict={resolveConflict} />
-                )}
-              />
-            </div>
-          ))}
-        </VStack>
-        <DialogFooter
-          leftSlot={
-            footerNote !== "" ? (
-              <div className="text-xs text-text-subtle">{footerNote}</div>
-            ) : undefined
-          }
-          actions={[
-            {
-              label: "Back",
-              disabled: isLoading,
-              onClick: () => {
-                setPlan(null);
-                setItems([]);
-              },
-            },
-            {
-              label: isLoading
-                ? "Importing"
-                : changeCount > 0
-                  ? `Apply ${changeCount} ${changeCount === 1 ? "Change" : "Changes"}`
-                  : "Done",
-              color: "primary",
-              isLoading,
-              onClick: handleCommit,
-            },
-          ]}
-        />
-      </>
-    );
-  }
-
-  const destinationPicker = (
-    <HStack
-      space={2}
-      alignItems="center"
-      className={classNames(workspaces.length === 0 && "hidden")}
-    >
-      <Select
-        name="import-destination-kind"
-        label="Import into"
-        labelPosition="left"
-        size="sm"
-        value={destinationKind}
-        onChange={setDestinationChoice}
-        options={[
-          { value: "new", label: "New Workspace" },
-          ...(currentWorkspace != null
-            ? [{ value: "current" as const, label: "Current Workspace" }]
-            : []),
-          { value: "other", label: "Other Workspace" },
-        ]}
-      />
-      {destinationKind === "other" && (
-        <Select
-          name="import-destination-workspace"
-          label="Workspace"
-          hideLabel
-          size="sm"
-          value={otherWorkspaceId ?? ""}
-          onChange={(id) => setOtherWorkspaceId(id === "" ? null : id)}
-          filterable
-          options={[
-            { value: "", label: "Select a workspace" },
-            ...workspaces
-              .filter((w) => w.id !== currentWorkspace?.id)
-              .map((w) => ({ value: w.id, label: w.name })),
-          ]}
-        />
-      )}
-    </HStack>
-  );
+  const [filePath, setFilePath] = useLocalStorage<string | null>("importFilePath", null);

  return (
-    <>
-      <VStack space={4} className="h-full pb-4">
-        <CommercialUseBanner source="data-import" title="Importing work data?" />
-
-        <ImportSourceList
-          sources={sources}
-          detections={detections}
-          disabled={isLoading}
-          onAdd={addSources}
-          onRemove={removeSource}
-          onError={setSourceError}
+    <VStack space={5} className="pb-4">
+      <VStack space={1}>
+        <ul className="list-disc pl-5">
+          <li>OpenAPI 3.0, 3.1</li>
+          <li>Postman Collection v2, v2.1</li>
+          <li>Insomnia v4+</li>
+          <li>Swagger 2.0</li>
+          <li>
+            Curl commands <em className="text-text-subtle">(or paste into URL)</em>
+          </li>
+        </ul>
+      </VStack>
+      <VStack space={2}>
+        <SelectFile
+          filePath={filePath ?? null}
+          onChange={({ filePath }) => setFilePath(filePath)}
        />
-
-        {sourceError != null && (
-          <Banner color="warning">
-            <FormattedError>{errorMessage(sourceError)}</FormattedError>
-          </Banner>
-        )}
-
-        {linkedWorkspace != null && linkedWorkspace.id !== destinationWorkspaceId && (
-          <div className="text-xs text-text-subtle">
-            {sources.length === 1 ? "This source was" : "These sources were"} last imported into{" "}
-            <InlineButton
-              onClick={() => {
-                if (linkedWorkspace.id === currentWorkspace?.id) {
-                  setDestinationChoice("current");
-                } else {
-                  setDestinationChoice("other");
-                  setOtherWorkspaceId(linkedWorkspace.id);
-                }
-              }}
-            >
-              {linkedWorkspace.name}
-            </InlineButton>
-          </div>
+        {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>
-      <DialogFooter
-        leftSlot={destinationPicker}
-        actions={[
-          { label: "Cancel", disabled: isLoading, onClick: cancel },
-          {
-            label: isLoading ? "Analyzing" : "Preview Import",
-            color: "primary",
-            disabled:
-              sources.length === 0 ||
-              !allDetected ||
-              isLoading ||
-              (destinationKind === "other" && otherWorkspaceId == null),
-            isLoading,
-            onClick: handlePreview,
-          },
-        ]}
-      />
-    </>
-  );
-}
-
-function ImportTreeRow({
-  row,
-  onResolveConflict,
-}: {
-  row: TreeRow;
-  onResolveConflict: (modelId: string, resolution: "keep_mine" | "take_source") => void;
-}) {
-  if (row.kind !== "item") {
-    return (
-      <>
-        {row.kind === "destination" && (
-          <Icon icon="box" size="sm" className="shrink-0 text-text-subtle" />
-        )}
-        <div className="truncate flex-1">{row.label}</div>
-        {row.kind === "destination" && row.isNew && (
-          <ActionChip label="new" help="Created by this import" color="success" />
-        )}
-      </>
-    );
-  }
-
-  const { item } = row;
-  const label = actionLabel(item);
-  return (
-    <>
-      <div className="truncate flex-1">{item.name}</div>
-      {item.action === "conflict" ? (
-        <div className="shrink-0">
-          <SegmentedControl
-            name={`conflict-${item.modelId}`}
-            label={`Resolve conflict for ${item.name}`}
-            hideLabel
-            size="2xs"
-            help={actionHelp(item)}
-            value={item.resolution ?? "keep_mine"}
-            onChange={(v) => onResolveConflict(item.modelId, v)}
-            options={[
-              { value: "keep_mine", label: "Keep mine" },
-              { value: "take_source", label: "Take source" },
-            ]}
-          />
-        </div>
-      ) : (
-        label != null && (
-          <ActionChip label={label} help={actionHelp(item)} color={actionColor(item)} />
-        )
-      )}
-    </>
-  );
-}
-
-function ActionChip({
-  label,
-  help,
-  color,
-}: {
-  label: string;
-  help: string | null;
-  color: ComponentProps<typeof Chip>["color"];
-}) {
-  return (
-    <Chip color={color}>
-      {label}
-      {help != null && <IconTooltip content={help} iconSize="xs" />}
-    </Chip>
-  );
-}
-
-function actionColor(item: ImportPlanItem): ComponentProps<typeof Chip>["color"] {
-  switch (item.action) {
-    case "create":
-      return "success";
-    case "update":
-      return "info";
-    case "delete":
-      return "danger";
-    case "keep_local":
-      return item.selected ? "warning" : "default";
-    case "unchanged":
-    case "conflict":
-    case "ignored":
-      return "default";
-  }
-}
-
-function actionLabel(item: ImportPlanItem): string | null {
-  switch (item.action) {
-    case "create":
-      return "new";
-    case "update":
-      return "updated";
-    case "delete":
-      return "removed";
-    case "keep_local":
-      return "edited";
-    case "ignored":
-      return "ignored";
-    default:
-      return null;
-  }
-}
-
-function actionHelp(item: ImportPlanItem): string | null {
-  const help = (text: string) =>
-    item.changedFields.length > 0
-      ? `${text} · ${item.changedFields.map(fieldLabel).join(", ")}`
-      : text;
-  switch (item.action) {
-    case "create":
-      return "Not in this workspace yet";
-    case "update":
-      return item.reason === "moved_into_ignored_folder"
-        ? "Moved into a folder that isn't imported. Importing that folder brings it along"
-        : help("Changed in the source since the last import");
-    case "delete":
-      return "Gone from the source since the last import. Checking it deletes it here";
-    case "keep_local":
-      return help("Changed here since the last import. Checking it reverts to the source");
-    case "conflict":
-      return help("Changed here and in the source since the last import");
-    case "ignored":
-      return "Not in this workspace. Imports leave it alone until you check it";
-    default:
-      return null;
-  }
-}
-
-function fieldLabel(field: string): string {
-  return field.replace(/([A-Z])/g, " $1").toLowerCase();
-}
-
-/** Every plan item above `item`, nearest first. */
-function ancestorsOf(item: ImportPlanItem, byId: Map<string, ImportPlanItem>): ImportPlanItem[] {
-  const ancestors: ImportPlanItem[] = [];
-  const seen = new Set<string>();
-  let parentId = item.parentId;
-  while (parentId != null && !seen.has(parentId)) {
-    seen.add(parentId);
-    const parent = byId.get(parentId);
-    if (parent == null) break;
-    ancestors.push(parent);
-    parentId = parent.parentId;
-  }
-  return ancestors;
-}
-
-/**
- * A row of the preview tree. Most are plan items, but the destination workspace and the group the
- * workspace's environments sit in are headings: they aggregate their children and decide nothing
- * themselves.
- */
-type TreeRow =
-  | { kind: "destination"; label: string; isNew: boolean }
-  | { kind: "group"; label: string }
-  | { kind: "item"; item: ImportPlanItem };
-
-function buildItemTree(items: ImportPlanItem[]): CheckboxTreeNode<TreeRow>[] {
-  const byId = new Map(items.map((i) => [i.modelId, i]));
-  const childrenOf = new Map<string, ImportPlanItem[]>();
-  const roots: ImportPlanItem[] = [];
-  for (const item of items) {
-    if (item.parentId != null && byId.has(item.parentId)) {
-      const siblings = childrenOf.get(item.parentId) ?? [];
-      siblings.push(item);
-      childrenOf.set(item.parentId, siblings);
-    } else {
-      roots.push(item);
-    }
-  }
-
-  const byKind = (list: ImportPlanItem[]) => [
-    ...list.filter((i) => i.model === "environment"),
-    ...list.filter((i) => i.model === "folder"),
-    ...list.filter((i) => i.model !== "environment" && i.model !== "folder"),
-  ];
-
-  const toNode = (item: ImportPlanItem, seen: Set<string>): CheckboxTreeNode<TreeRow> => ({
-    key: item.modelId,
-    data: { kind: "item", item },
-    children: seen.has(item.modelId)
-      ? []
-      : byKind(childrenOf.get(item.modelId) ?? []).map((c) =>
-          toNode(c, new Set([...seen, item.modelId])),
-        ),
-  });
-
-  // The workspace's environments have nothing to sit under — a sub-environment is a sibling of
-  // the base one, not its child — so a heading groups them into one thing to turn on and off.
-  const environments = roots.filter((i) => i.model === "environment");
-  const others = byKind(roots.filter((i) => i.model !== "environment"));
-  const nodes = others.map((r) => toNode(r, new Set()));
-  if (environments.length === 0) return nodes;
-  return [
-    {
-      key: "group:environments",
-      data: { kind: "group", label: "Variables" },
-      children: environments.map((e) => toNode(e, new Set())),
-    },
-    ...nodes,
-  ];
-}
-
-function collectRows(node: CheckboxTreeNode<TreeRow>): TreeRow[] {
-  return [node.data, ...node.children.flatMap(collectRows)];
-}
-
-/** A folder that isn't there yet, so anything inside it needs it brought in first. */
-function isMissingFolder(item: ImportPlanItem): boolean {
-  return item.model === "folder" && (item.action === "create" || item.action === "ignored");
-}
-
-/**
- * The plan item a row's checkbox decides, if it decides one. An unchanged resource has nothing to
- * decide and a conflict is decided by its own control, so neither takes a checkbox — nor rides
- * along with a parent's.
- */
-function togglableItem(row: TreeRow): ImportPlanItem | null {
-  if (row.kind !== "item") return null;
-  const { item } = row;
-  return item.action === "unchanged" || item.action === "conflict" ? null : item;
-}
-
-function togglableItems(node: CheckboxTreeNode<TreeRow>): ImportPlanItem[] {
-  return collectRows(node)
-    .map(togglableItem)
-    .filter((i) => i != null);
-}
-
-function nodeCheckedStatus(node: CheckboxTreeNode<TreeRow>): boolean | "indeterminate" | "hidden" {
-  const covered = togglableItems(node);
-  if (covered.length === 0) return "hidden";
-  const selected = covered.filter((i) => i.selected).length;
-  if (selected === covered.length) return true;
-  if (selected === 0) return false;
-  return "indeterminate";
-}
-
-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>
+    </VStack>
  );
 }
@@ -1,271 +0,0 @@
-import { platform } from "@yaakapp-internal/platform";
-import { Icon, LoadingIcon } from "@yaakapp-internal/ui";
-import classNames from "classnames";
-import { type KeyboardEvent, type ReactNode, useEffect, useRef, useState } from "react";
-import { Button } from "./core/Button";
-import { IconButton } from "./core/IconButton";
-import { PathList, splitPath } from "./core/PathList";
-import { PlainInput } from "./core/PlainInput";
-
-export interface ImportSourcePath {
-  path: string;
-  kind?: "file" | "folder" | "url";
-}
-
-export type ImportSourceDetection =
-  | { status: "loading" }
-  | { status: "ok"; importer: string }
-  | { status: "error"; message: string };
-
-interface Props {
-  sources: ImportSourcePath[];
-  detections: Record<string, ImportSourceDetection>;
-  disabled?: boolean;
-  onAdd: (sources: ImportSourcePath[]) => void;
-  onRemove: (path: string) => void;
-  onError: (err: unknown) => void;
-}
-
-/** A bare hostname is a URL; local paths need an absolute or explicit relative prefix. */
-export function isImportFilePath(value: string): boolean {
-  return (
-    value.startsWith("/") ||
-    value.startsWith("./") ||
-    value.startsWith("../") ||
-    value.startsWith("~/") ||
-    value.startsWith("\\\\") ||
-    /^[a-zA-Z]:[\\/]/.test(value)
-  );
-}
-
-/** A typed or prefilled path is a URL unless it looks like a local path; kind is left for the host */
-export function toSourcePath(path: string): ImportSourcePath {
-  return { path, kind: isImportFilePath(path) ? undefined : "url" };
-}
-
-export function ImportSourceList({
-  sources,
-  detections,
-  disabled,
-  onAdd,
-  onRemove,
-  onError,
-}: Props) {
-  const ref = useRef<HTMLDivElement>(null);
-  const [isHovering, setIsHovering] = useState(false);
-  const [pathInput, setPathInput] = useState("");
-  const [showPathInput, setShowPathInput] = useState(false);
-  const pathInputRef = useRef<{ focus: () => void }>(null);
-  const trimmedPath = pathInput.trim();
-
-  const openPathInput = () => {
-    setShowPathInput(true);
-    // The add-row menu hands focus back to its trigger as it closes, on a timer, so focus after it
-    setTimeout(() => pathInputRef.current?.focus(), 50);
-  };
-
-  const closePathInput = () => {
-    setPathInput("");
-    setShowPathInput(false);
-  };
-
-  const addPath = () => {
-    if (!trimmedPath || disabled) return;
-    onAdd([toSourcePath(trimmedPath)]);
-    closePathInput();
-  };
-
-  useEffect(() => {
-    if (disabled) return;
-    return platform.window.onDragDrop((event) => {
-      if (event.type === "leave") {
-        setIsHovering(false);
-        return;
-      }
-      const rect = ref.current?.getBoundingClientRect();
-      const { x, y } = event.position;
-      const isOver =
-        rect != null && x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom;
-      if (event.type === "drop") {
-        if (isOver) onAdd(event.paths.map((path) => ({ path })));
-        setIsHovering(false);
-      } else {
-        setIsHovering(isOver);
-      }
-    });
-  }, [disabled, onAdd]);
-
-  const pick = async (directory: boolean) => {
-    try {
-      const selected = await platform.dialog.open({
-        title: directory ? "Select Import Folder" : "Select Import Files",
-        multiple: true,
-        directory,
-      });
-      if (selected == null) return;
-      onAdd(selected.map((path) => ({ path, kind: directory ? "folder" : "file" })));
-    } catch (err) {
-      onError(err);
-    }
-  };
-
-  const handlePathKeyDown = (event: KeyboardEvent) => {
-    if (event.key === "Enter") {
-      event.preventDefault();
-      addPath();
-    } else if (event.key === "Escape") {
-      event.stopPropagation();
-      closePathInput();
-    }
-  };
-
-  const pathInputEl = (
-    <PlainInput
-      ref={pathInputRef}
-      label="URL or file path"
-      hideLabel
-      size="sm"
-      autoFocus
-      disabled={disabled}
-      placeholder="Paste a URL or a file path"
-      onChange={setPathInput}
-      onKeyDownCapture={handlePathKeyDown}
-      rightSlot={
-        <div className="flex items-center gap-1 my-1 mr-1">
-          {trimmedPath !== "" && (
-            <Button size="xs" variant="border" onClick={addPath}>
-              Add
-            </Button>
-          )}
-          <IconButton size="xs" icon="x" title="Cancel" onClick={closePathInput} />
-        </div>
-      }
-    />
-  );
-
-  if (sources.length === 0) {
-    return (
-      <div className="flex-1 flex flex-col gap-2">
-        <div
-          ref={ref}
-          className={classNames(
-            "flex-1 rounded-lg border min-h-28 flex flex-col items-center justify-center gap-2 px-4 py-5 text-center text-text-subtle",
-            isHovering ? "border-notice bg-surface-highlight" : "border-dashed border-border",
-          )}
-        >
-          <Icon icon="folder_input" className="text-text-subtlest w-10! h-10! mb-1" />
-          {isHovering ? (
-            <span>Drop to add</span>
-          ) : (
-            <span>
-              Choose{" "}
-              <InlineButton disabled={disabled} onClick={() => pick(false)}>
-                files
-              </InlineButton>
-              , a{" "}
-              <InlineButton disabled={disabled} onClick={() => pick(true)}>
-                folder
-              </InlineButton>
-              , or a{" "}
-              <InlineButton disabled={disabled} onClick={openPathInput}>
-                URL
-              </InlineButton>
-              , or drag them here
-            </span>
-          )}
-          <span className="text-xs text-text-subtlest">
-            Supports OpenAPI, Swagger, Postman, Insomnia, Bruno, curl, and Yaak exports
-          </span>
-        </div>
-        {showPathInput && pathInputEl}
-      </div>
-    );
-  }
-
-  return (
-    <PathList
-      ref={ref}
-      hovering={isHovering}
-      disabled={disabled}
-      onRemove={onRemove}
-      addLabel="Add files, a folder, or a URL"
-      addHint="or drop them here"
-      addItems={[
-        { label: "Files", icon: "file", onSelect: () => pick(false) },
-        { label: "Folder", icon: "folder", onSelect: () => pick(true) },
-        { label: "URL or file path", icon: "globe", onSelect: openPathInput },
-      ]}
-      items={sources.map((source) => {
-        const detection = detections[source.path];
-        return {
-          path: source.path,
-          icon: sourceIcon(source),
-          failed: detection?.status === "error",
-          subtitle: <DetectionSubtitle path={source.path} detection={detection} />,
-        };
-      })}
-    >
-      {showPathInput && pathInputEl}
-    </PathList>
-  );
-}
-
-function DetectionSubtitle({
-  path,
-  detection,
-}: {
-  path: string;
-  detection: ImportSourceDetection | undefined;
-}) {
-  const { parent } = splitPath(path);
-  if (detection?.status === "loading") {
-    return (
-      <>
-        <LoadingIcon size="xs" />
-        Detecting format
-      </>
-    );
-  }
-  if (detection?.status === "error") return detection.message;
-  return (
-    <>
-      {detection?.status === "ok" && <span>{detection.importer}</span>}
-      {detection?.status === "ok" && parent !== "" && <span>·</span>}
-      {parent !== "" && <span className="truncate font-mono">{parent}</span>}
-    </>
-  );
-}
-
-function sourceIcon({ kind }: ImportSourcePath) {
-  switch (kind) {
-    case "url":
-      return "globe";
-    case "folder":
-      return "folder";
-    case "file":
-      return "file";
-    case undefined:
-      return "import";
-  }
-}
-
-export function InlineButton({
-  children,
-  disabled,
-  onClick,
-}: {
-  children: ReactNode;
-  disabled?: boolean;
-  onClick: () => void;
-}) {
-  return (
-    <button
-      type="button"
-      disabled={disabled}
-      className="underline decoration-current/40 underline-offset-3 hocus:decoration-current disabled:opacity-disabled"
-      onClick={onClick}
-    >
-      {children}
-    </button>
-  );
-}
@@ -0,0 +1,122 @@
+import { linter } from "@codemirror/lint";
+import type { HttpRequest } from "@yaakapp-internal/models";
+import { patchModel } from "@yaakapp-internal/models";
+import { Banner, Icon } from "@yaakapp-internal/ui";
+import { useCallback, useMemo } from "react";
+import { useKeyValue } from "../hooks/useKeyValue";
+import { fireAndForget } from "../lib/fireAndForget";
+import { textLikelyContainsJsonComments } from "../lib/jsonComments";
+import type { DropdownItem } from "./core/Dropdown";
+import { Dropdown } from "./core/Dropdown";
+import type { EditorProps } from "./core/Editor/Editor";
+import { jsonParseLinter } from "./core/Editor/json-lint";
+import { Editor } from "./core/Editor/LazyEditor";
+import { IconButton } from "./core/IconButton";
+import { IconTooltip } from "./core/IconTooltip";
+
+interface Props {
+  forceUpdateKey: string;
+  heightMode: EditorProps["heightMode"];
+  request: HttpRequest;
+}
+
+export function JsonBodyEditor({ forceUpdateKey, heightMode, request }: Props) {
+  const handleChange = useCallback(
+    (text: string) => patchModel(request, { body: { ...request.body, text } }),
+    [request],
+  );
+
+  const autoFix = request.body?.sendJsonComments !== true;
+
+  const lintExtension = useMemo(
+    () =>
+      linter(
+        jsonParseLinter(
+          autoFix
+            ? { allowComments: true, allowTrailingCommas: true }
+            : { allowComments: false, allowTrailingCommas: false },
+        ),
+      ),
+    [autoFix],
+  );
+
+  const hasComments = useMemo(
+    () => textLikelyContainsJsonComments(request.body?.text ?? ""),
+    [request.body?.text],
+  );
+
+  const { value: bannerDismissed, set: setBannerDismissed } = useKeyValue<boolean>({
+    namespace: "no_sync",
+    key: ["json-fix-3", request.workspaceId],
+    fallback: false,
+  });
+
+  const handleToggleAutoFix = useCallback(() => {
+    const newBody = { ...request.body };
+    if (autoFix) {
+      newBody.sendJsonComments = true;
+    } else {
+      delete newBody.sendJsonComments;
+    }
+    fireAndForget(patchModel(request, { body: newBody }));
+  }, [request, autoFix]);
+
+  const handleDropdownOpen = useCallback(() => {
+    if (!bannerDismissed) {
+      fireAndForget(setBannerDismissed(true));
+    }
+  }, [bannerDismissed, setBannerDismissed]);
+
+  const showBanner = hasComments && autoFix && !bannerDismissed;
+
+  const stripMessage = "Automatically strip comments and trailing commas before sending";
+  const actions = useMemo<EditorProps["actions"]>(
+    () => [
+      showBanner && (
+        <Banner color="notice" className="!opacity-100 h-sm !py-0 !px-2 flex items-center text-xs">
+          <p className="inline-flex items-center gap-1 min-w-0">
+            <span className="truncate">Auto-fix enabled</span>
+            <Icon icon="arrow_right" size="sm" className="opacity-disabled" />
+          </p>
+        </Banner>
+      ),
+      <div key="settings" className="!opacity-100 !shadow">
+        <Dropdown
+          onOpen={handleDropdownOpen}
+          items={
+            [
+              {
+                label: "Automatically Fix JSON",
+                keepOpenOnSelect: true,
+                onSelect: handleToggleAutoFix,
+                rightSlot: <IconTooltip content={stripMessage} />,
+                leftSlot: (
+                  <Icon icon={autoFix ? "check_square_checked" : "check_square_unchecked"} />
+                ),
+              },
+            ] satisfies DropdownItem[]
+          }
+        >
+          <IconButton size="sm" variant="border" icon="settings" title="JSON Settings" />
+        </Dropdown>
+      </div>,
+    ],
+    [handleDropdownOpen, handleToggleAutoFix, autoFix, showBanner],
+  );
+
+  return (
+    <Editor
+      forceUpdateKey={forceUpdateKey}
+      autocompleteFunctions
+      autocompleteVariables
+      placeholder="..."
+      heightMode={heightMode}
+      defaultValue={`${request.body?.text ?? ""}`}
+      language="json"
+      onChange={handleChange}
+      stateKey={`json.${request.id}`}
+      actions={actions}
+      lintExtension={lintExtension}
+    />
+  );
+}
@@ -1,279 +0,0 @@
-import { formatSize } from "@yaakapp-internal/lib/formatSize";
-import {
-  Banner,
-  Button,
-  HStack,
-  LoadingIcon,
-  AudioViewer,
-  ImageViewer,
-  SvgViewer,
-  VideoViewer,
-} from "@yaakapp-internal/ui";
-import type { ReactNode } from "react";
-import { lazy, Suspense, useEffect, useMemo, useState } from "react";
-import type { SniffedValue } from "./core/Editor/sniffValue";
-import { showDialog } from "../lib/dialog";
-import { decodeValue, largeValueActions } from "../lib/largeValue";
-import { Dropdown } from "./core/Dropdown";
-
-const PdfViewer = lazy(() =>
-  import("./responseViewers/PdfViewer").then((m) => ({ default: m.PdfViewer })),
-);
-
-interface Props {
-  /** The whole value, exactly as it reads in the document */
-  text: string;
-  sniffed: SniffedValue | null;
-}
-
-/**
- * Shows a value the editor collapsed, in whatever viewer its type calls for.
- *
- * The editor only ever read the value's head, so this is where it is decoded in full — on an
- * explicit click, behind a spinner, rather than during layout.
- */
-export function LargeValueDialog({ text, sniffed }: Props) {
-  const viewer = sniffed == null ? null : viewerFor(sniffed.mime);
-  const decoded = useDecoded(text, viewer == null ? null : sniffed);
-
-  // Nothing recognised it, so there is nothing to decode it into
-  if (sniffed == null || viewer == null) {
-    return (
-      <PagedText text={text}>
-        {sniffed != null && (
-          <Banner color="info" className="mb-3">
-            {sniffed.label} content cannot be previewed, so it is shown as it appears in the
-            response.
-          </Banner>
-        )}
-      </PagedText>
-    );
-  }
-
-  if (decoded == null) {
-    return (
-      <HStack className="h-full" alignItems="center" justifyContent="center">
-        <LoadingIcon />
-      </HStack>
-    );
-  }
-
-  if ("error" in decoded) {
-    return (
-      <PagedText text={text}>
-        <Banner color="danger" className="mb-3">
-          Failed to decode this {sniffed.label} value: {decoded.error}
-        </Banner>
-      </PagedText>
-    );
-  }
-
-  const { bytes } = decoded;
-
-  switch (viewer) {
-    case "svg":
-      return <DecodedSvg bytes={bytes} />;
-    case "image":
-      return (
-        <div className="h-full overflow-auto flex items-center justify-center">
-          <ImageViewer data={toArrayBuffer(bytes)} mimeType={sniffed.mime} />
-        </div>
-      );
-    case "audio":
-      return <AudioViewer data={bytes} mimeType={sniffed.mime} />;
-    case "video":
-      return <VideoViewer data={bytes} mimeType={sniffed.mime} />;
-    case "pdf":
-      return (
-        <Suspense fallback={<LoadingIcon />}>
-          <PdfViewer data={bytes} />
-        </Suspense>
-      );
-    case "text":
-      return <DecodedText bytes={bytes} />;
-  }
-}
-
-/**
- * Decoding megabytes is worth doing once, not on every render — and the viewers below key their
- * blob URLs off the string, so a fresh one each time would rebuild them for nothing.
- */
-function DecodedSvg({ bytes }: { bytes: Uint8Array }) {
-  const text = useMemo(() => new TextDecoder().decode(bytes), [bytes]);
-  return <SvgViewer text={text} />;
-}
-
-function DecodedText({ bytes }: { bytes: Uint8Array }) {
-  const text = useMemo(() => new TextDecoder().decode(bytes), [bytes]);
-  return <PagedText text={text} />;
-}
-
-/**
- * The same menu the tag in the editor carries, minus the one entry that would only reopen this.
- *
- * It lives in the dialog's title rather than above the content, which would cost a band of
- * whitespace the width of the dialog to hold one small button.
- */
-function LargeValueActions({ text, sniffed }: Props) {
-  const items = useMemo(
-    () =>
-      largeValueActions({
-        value: () => text,
-        sniffed,
-        // The tag copies only what it hides; in here, what you see is the whole value
-        copyText: () => text,
-      }),
-    [text, sniffed],
-  );
-
-  return (
-    <Dropdown items={items}>
-      <Button size="xs" variant="border" forDropdown>
-        Actions
-      </Button>
-    </Dropdown>
-  );
-}
-
-type Viewer = "image" | "svg" | "audio" | "video" | "pdf" | "text";
-
-/** Which viewer a media type calls for, or null if none of them can show it. */
-function viewerFor(mime: string): Viewer | null {
-  if (mime.startsWith("image/svg")) return "svg";
-  if (mime.startsWith("image/")) return "image";
-  if (mime.startsWith("audio/")) return "audio";
-  if (mime.startsWith("video/")) return "video";
-  if (mime === "application/pdf") return "pdf";
-  if (mime.startsWith("text/") || /\b(json|xml|javascript|csv)\b/.test(mime)) return "text";
-  return null;
-}
-
-type Decoded = { bytes: Uint8Array } | { error: string };
-
-/**
- * The value's bytes, once they exist.
- *
- * Decoding a few megabytes takes long enough to be seen, so it happens in an effect rather than
- * during render — the dialog paints with a spinner first, instead of opening late.
- */
-function useDecoded(text: string, sniffed: SniffedValue | null): Decoded | null {
-  const [decoded, setDecoded] = useState<Decoded | null>(null);
-
-  useEffect(() => {
-    if (sniffed == null) return;
-
-    setDecoded(null);
-    let cancelled = false;
-    const timer = setTimeout(() => {
-      let result: Decoded;
-      try {
-        result = { bytes: decodeValue(text, sniffed) };
-      } catch (err) {
-        result = { error: err instanceof Error ? err.message : String(err) };
-      }
-      if (!cancelled) setDecoded(result);
-    });
-
-    return () => {
-      cancelled = true;
-      clearTimeout(timer);
-    };
-  }, [text, sniffed]);
-
-  return decoded;
-}
-
-/** A copy, since a `Uint8Array` may be a view onto a larger buffer */
-function toArrayBuffer(bytes: Uint8Array): ArrayBuffer {
-  return bytes.slice().buffer;
-}
-
-/** Characters shown at once. A page this size lays out instantly once its lines are short. */
-const PAGE_CHARS = 50_000;
-
-/** Where a line is broken. The long-line cost this whole feature avoids is per line. */
-const WRAP_CHARS = 120;
-
-/**
- * The raw text, in pages of short lines.
- *
- * What is left when nothing can render the value. Handing it to an editor whole would walk
- * straight back into the layout stall that collapsed it in the first place, so it is paged and
- * hard-wrapped instead: no line is ever long, and no page is ever big.
- */
-function PagedText({ text, children }: { text: string; children?: ReactNode }) {
-  const [page, setPage] = useState(0);
-  const pages = Math.max(1, Math.ceil(text.length / PAGE_CHARS));
-  const from = page * PAGE_CHARS;
-  const to = Math.min(from + PAGE_CHARS, text.length);
-  const body = useMemo(() => wrap(text.slice(from, to)), [text, from, to]);
-
-  return (
-    <div className="h-full grid grid-rows-[auto_minmax(0,1fr)_auto] gap-3">
-      <div>{children}</div>
-      <pre className="overflow-auto font-mono text-sm text-text-subtle select-text">{body}</pre>
-      <HStack space={2} alignItems="center" className="text-sm text-text-subtle">
-        <span>
-          {(to - from).toLocaleString()} of {text.length.toLocaleString()} characters
-        </span>
-        {pages > 1 && (
-          <HStack space={2} alignItems="center" className="ml-auto">
-            <Button
-              size="xs"
-              variant="border"
-              disabled={page === 0}
-              onClick={() => setPage((p) => p - 1)}
-            >
-              Previous
-            </Button>
-            <span>
-              Page {page + 1} of {pages.toLocaleString()}
-            </span>
-            <Button
-              size="xs"
-              variant="border"
-              disabled={page >= pages - 1}
-              onClick={() => setPage((p) => p + 1)}
-            >
-              Next
-            </Button>
-          </HStack>
-        )}
-      </HStack>
-    </div>
-  );
-}
-
-/** Breaks every line at {@link WRAP_CHARS}, leaving the ones already shorter alone. */
-function wrap(text: string): string {
-  const lines: string[] = [];
-  for (const line of text.split("\n")) {
-    if (line.length <= WRAP_CHARS) {
-      lines.push(line);
-      continue;
-    }
-    for (let i = 0; i < line.length; i += WRAP_CHARS) {
-      lines.push(line.slice(i, i + WRAP_CHARS));
-    }
-  }
-  return lines.join("\n");
-}
-
-export function showLargeValueDialog({ text, sniffed }: Props) {
-  showDialog({
-    id: "large-value",
-    size: "lg",
-    className: "h-[calc(100vh-10rem)]",
-    // Everything in one line: the same words the tag uses, and the same menu it carries. A
-    // separate description and a row of its own for the button cost three bands to say this.
-    title: (
-      <HStack space={3} alignItems="center">
-        <span>
-          {sniffed == null ? "Hidden Value" : sniffed.label} · {formatSize(text.length)}
-        </span>
-        <LargeValueActions text={text} sniffed={sniffed} />
-      </HStack>
-    ),
-    render: () => <LargeValueDialog text={text} sniffed={sniffed} />,
-  });
-}
@@ -1,3 +1,4 @@
+import { openUrl } from "@tauri-apps/plugin-opener";
 import type { LicenseCheckStatus } from "@yaakapp-internal/license";
 import { useLicense } from "@yaakapp-internal/license";
 import { settingsAtom } from "@yaakapp-internal/models";
@@ -13,7 +14,6 @@ import type { ButtonProps } from "./core/Button";
 import { Dropdown, type DropdownItem } from "./core/Dropdown";
 import { Icon } from "@yaakapp-internal/ui";
 import { PillButton } from "./core/PillButton";
-import { platform } from "@yaakapp-internal/platform";

 const dismissedAtom = atomWithKVStorage<string | null>("dismissed_license_expired", null);

@@ -52,18 +52,18 @@ function getDetail(
            leftSlot: <Icon icon="gift" />,
            rightSlot: <Icon icon="external_link" size="sm" className="opacity-disabled" />,
            hidden: data.data.changes === 0 || data.data.changesUrl == null,
-            onSelect: () => platform.openUrl(data.data.changesUrl ?? ""),
+            onSelect: () => openUrl(data.data.changesUrl ?? ""),
          },
          {
            type: "separator",
            label: `License expired ${formatDate(data.data.periodEnd, "MMM dd, yyyy")}`,
          },
          {
-            label: <div className="min-w-48">Renew License</div>,
+            label: <div className="min-w-[12rem]">Renew License</div>,
            leftSlot: <Icon icon="refresh" />,
            rightSlot: <Icon icon="external_link" size="sm" className="opacity-disabled" />,
            hidden: data.data.changesUrl == null,
-            onSelect: () => platform.openUrl(data.data.billingUrl),
+            onSelect: () => openUrl(data.data.billingUrl),
          },
          {
            label: "Enter License Key",
@@ -1,6 +1,7 @@
 import { useQuery } from "@tanstack/react-query";
+import { convertFileSrc } from "@tauri-apps/api/core";
+import { resolveResource } from "@tauri-apps/api/path";
 import classNames from "classnames";
-import { platform } from "@yaakapp-internal/platform";

 interface Props {
  src: string;
@@ -11,8 +12,8 @@ export function LocalImage({ src: srcPath, className }: Props) {
  const src = useQuery({
    queryKey: ["local-image", srcPath],
    queryFn: async () => {
-      const p = await platform.files.resolveResource(srcPath);
-      return platform.files.url(p);
+      const p = await resolveResource(srcPath);
+      return convertFileSrc(p);
    },
  });

@@ -1,8 +1,8 @@
-import { SegmentedControl } from "@yaakapp-internal/ui";
 import classNames from "classnames";
 import { useRef, useState } from "react";
 import type { EditorProps } from "./core/Editor/Editor";
 import { Editor } from "./core/Editor/LazyEditor";
+import { SegmentedControl } from "./core/SegmentedControl";
 import { Markdown } from "./Markdown";

 type ViewMode = "edit" | "preview";
@@ -33,7 +33,7 @@ export function MarkdownEditor({
    <Editor
      hideGutter
      wrapLines
-      className={classNames(editorClassName, "[&_.cm-line]:max-w-lg! max-h-full")}
+      className={classNames(editorClassName, "[&_.cm-line]:!max-w-lg max-h-full")}
      language="markdown"
      defaultValue={defaultValue}
      onChange={onChange}
@@ -46,7 +46,7 @@ export function MarkdownEditor({
    defaultValue.length === 0 ? (
      <p className="text-text-subtlest">No description</p>
    ) : (
-      <div className="pr-1.5 overflow-y-auto max-h-full **:cursor-auto **:select-auto">
+      <div className="pr-1.5 overflow-y-auto max-h-full [&_*]:cursor-auto [&_*]:select-auto">
        <Markdown className="max-w-lg select-auto cursor-auto">{defaultValue}</Markdown>
      </div>
    );
@@ -2,9 +2,7 @@ import type {
  Folder,
  GrpcRequest,
  HttpRequest,
-  HttpVersion,
  InheritedBoolSetting,
-  InheritedHttpVersionSetting,
  InheritedIntSetting,
  WebsocketRequest,
  Workspace,
@@ -15,8 +13,6 @@ import {
  modelSupportsSetting,
  type RequestSettingDefinition,
  SETTING_FOLLOW_REDIRECTS,
-  SETTING_HTTP_VERSION,
-  SETTING_REQUEST_MESSAGE_SIZE,
  SETTING_REQUEST_TIMEOUT,
  SETTING_SEND_COOKIES,
  SETTING_STORE_COOKIES,
@@ -24,19 +20,14 @@ import {
 } from "../lib/requestSettings";
 import { Checkbox } from "./core/Checkbox";
 import { PlainInput } from "./core/PlainInput";
-import { Select } from "./core/Select";
 import {
  SettingOverrideRow,
-  SettingRow,
  SettingRowBoolean,
+  SettingRowNumber,
  SettingsList,
  SettingsSection,
 } from "./core/SettingRow";

-const BYTES_PER_MB = 1024 * 1024;
-const MAX_REQUEST_MESSAGE_SIZE_BYTES = 2_147_483_647;
-const MAX_MESSAGE_SIZE_MB = MAX_REQUEST_MESSAGE_SIZE_BYTES / BYTES_PER_MB;
-
 interface Props {
  showSectionTitles?: boolean;
  model: ModelWithSettings;
@@ -46,32 +37,25 @@ type ModelWithSettings = Workspace | Folder | HttpRequest | WebsocketRequest | G
 type ModelWithHttpSettings = Workspace | Folder | HttpRequest;
 type ModelWithTlsSettings = Workspace | Folder | HttpRequest | WebsocketRequest | GrpcRequest;
 type ModelWithCookieSettings = Workspace | Folder | HttpRequest | WebsocketRequest;
-type ModelWithMessageSizeSettings = Workspace | Folder | WebsocketRequest | GrpcRequest;
 type BooleanSetting = boolean | InheritedBoolSetting;
 type IntegerSetting = number | InheritedIntSetting;
-type HttpVersionSetting = HttpVersion | InheritedHttpVersionSetting;
 type CookieSettingsPatch = {
  settingSendCookies?: ModelWithCookieSettings["settingSendCookies"];
  settingStoreCookies?: ModelWithCookieSettings["settingStoreCookies"];
 };
 type HttpSettingsPatch = {
  settingFollowRedirects?: ModelWithHttpSettings["settingFollowRedirects"];
-  settingHttpVersion?: ModelWithHttpSettings["settingHttpVersion"];
  settingRequestTimeout?: ModelWithHttpSettings["settingRequestTimeout"];
 };
 type TlsSettingsPatch = {
  settingValidateCertificates?: ModelWithTlsSettings["settingValidateCertificates"];
 };
-type MessageSizeSettingsPatch = {
-  settingRequestMessageSize?: ModelWithMessageSizeSettings["settingRequestMessageSize"];
-};

 export function ModelSettingsEditor({ model, showSectionTitles = false }: Props) {
  const ancestors = useModelAncestors(model);
  const supportsHttpSettings = modelSupportsHttpSettings(model);
  const supportsCookieSettings = modelSupportsCookieSettings(model);
  const supportsTlsSettings = modelSupportsTlsSettings(model);
-  const supportsMessageSizeSettings = modelSupportsMessageSizeSettings(model);

  return (
    <SettingsList className="space-y-8">
@@ -93,22 +77,6 @@ export function ModelSettingsEditor({ model, showSectionTitles = false }: Props)
              }
            />
          )}
-          {supportsMessageSizeSettings && (
-            <MessageSizeSettingRow
-              settingDefinition={SETTING_REQUEST_MESSAGE_SIZE}
-              setting={model.settingRequestMessageSize}
-              inheritedValue={resolveInheritedValue(
-                ancestors,
-                SETTING_REQUEST_MESSAGE_SIZE.modelKey,
-                model.settingRequestMessageSize,
-              )}
-              onChange={(settingRequestMessageSize) =>
-                patchMessageSizeSettings(model, {
-                  settingRequestMessageSize,
-                })
-              }
-            />
-          )}
          <BooleanSettingRow
            settingDefinition={SETTING_VALIDATE_CERTIFICATES}
            setting={model.settingValidateCertificates}
@@ -139,22 +107,6 @@ export function ModelSettingsEditor({ model, showSectionTitles = false }: Props)
              }
            />
          )}
-          {supportsHttpSettings && (
-            <HttpVersionSettingRow
-              settingDefinition={SETTING_HTTP_VERSION}
-              setting={model.settingHttpVersion}
-              inheritedValue={resolveInheritedValue(
-                ancestors,
-                SETTING_HTTP_VERSION.modelKey,
-                model.settingHttpVersion,
-              )}
-              onChange={(settingHttpVersion) =>
-                patchHttpSettings(model, {
-                  settingHttpVersion,
-                })
-              }
-            />
-          )}
        </SettingsSection>
      )}
      {supportsCookieSettings && (
@@ -194,7 +146,7 @@ export function ModelSettingsEditor({ model, showSectionTitles = false }: Props)
 }

 export function countOverriddenSettings(model: ModelWithSettings) {
-  const settings: (BooleanSetting | IntegerSetting | HttpVersionSetting)[] = [];
+  const settings: (BooleanSetting | IntegerSetting)[] = [];

  if (modelSupportsCookieSettings(model)) {
    settings.push(model.settingSendCookies, model.settingStoreCookies);
@@ -203,15 +155,7 @@ export function countOverriddenSettings(model: ModelWithSettings) {
  settings.push(model.settingValidateCertificates);

  if (modelSupportsHttpSettings(model)) {
-    settings.push(
-      model.settingFollowRedirects,
-      model.settingRequestTimeout,
-      model.settingHttpVersion,
-    );
-  }
-
-  if (modelSupportsMessageSizeSettings(model)) {
-    settings.push(model.settingRequestMessageSize);
+    settings.push(model.settingFollowRedirects, model.settingRequestTimeout);
  }

  return settings.filter((setting) => isInheritedSetting(setting) && setting.enabled === true)
@@ -219,58 +163,27 @@ export function countOverriddenSettings(model: ModelWithSettings) {
 }

 function patchCookieSettings(model: ModelWithCookieSettings, patch: Partial<CookieSettingsPatch>) {
-  switch (model.model) {
-    case "workspace":
-      return patchModel(model, patch as Partial<Workspace>);
-    case "folder":
-      return patchModel(model, patch as Partial<Folder>);
-    case "http_request":
-      return patchModel(model, patch as Partial<HttpRequest>);
-    case "websocket_request":
-      return patchModel(model, patch as Partial<WebsocketRequest>);
-  }
+  if (model.model === "workspace") return patchModel(model, patch as Partial<Workspace>);
+  if (model.model === "folder") return patchModel(model, patch as Partial<Folder>);
+  if (model.model === "http_request") return patchModel(model, patch as Partial<HttpRequest>);
+  if (model.model === "websocket_request")
+    return patchModel(model, patch as Partial<WebsocketRequest>);
+  throw new Error("Unsupported cookie settings model");
 }

 function patchHttpSettings(model: ModelWithHttpSettings, patch: Partial<HttpSettingsPatch>) {
-  switch (model.model) {
-    case "workspace":
-      return patchModel(model, patch as Partial<Workspace>);
-    case "folder":
-      return patchModel(model, patch as Partial<Folder>);
-    case "http_request":
-      return patchModel(model, patch as Partial<HttpRequest>);
-  }
+  if (model.model === "workspace") return patchModel(model, patch as Partial<Workspace>);
+  if (model.model === "folder") return patchModel(model, patch as Partial<Folder>);
+  return patchModel(model, patch as Partial<HttpRequest>);
 }

 function patchTlsSettings(model: ModelWithTlsSettings, patch: Partial<TlsSettingsPatch>) {
-  switch (model.model) {
-    case "workspace":
-      return patchModel(model, patch as Partial<Workspace>);
-    case "folder":
-      return patchModel(model, patch as Partial<Folder>);
-    case "http_request":
-      return patchModel(model, patch as Partial<HttpRequest>);
-    case "websocket_request":
-      return patchModel(model, patch as Partial<WebsocketRequest>);
-    case "grpc_request":
-      return patchModel(model, patch as Partial<GrpcRequest>);
-  }
-}
-
-function patchMessageSizeSettings(
-  model: ModelWithMessageSizeSettings,
-  patch: Partial<MessageSizeSettingsPatch>,
-) {
-  switch (model.model) {
-    case "workspace":
-      return patchModel(model, patch as Partial<Workspace>);
-    case "folder":
-      return patchModel(model, patch as Partial<Folder>);
-    case "websocket_request":
-      return patchModel(model, patch as Partial<WebsocketRequest>);
-    case "grpc_request":
-      return patchModel(model, patch as Partial<GrpcRequest>);
-  }
+  if (model.model === "workspace") return patchModel(model, patch as Partial<Workspace>);
+  if (model.model === "folder") return patchModel(model, patch as Partial<Folder>);
+  if (model.model === "http_request") return patchModel(model, patch as Partial<HttpRequest>);
+  if (model.model === "websocket_request")
+    return patchModel(model, patch as Partial<WebsocketRequest>);
+  return patchModel(model, patch as Partial<GrpcRequest>);
 }

 function modelSupportsHttpSettings(model: ModelWithSettings): model is ModelWithHttpSettings {
@@ -285,12 +198,6 @@ function modelSupportsTlsSettings(model: ModelWithSettings): model is ModelWithT
  return modelSupportsSetting(model, SETTING_VALIDATE_CERTIFICATES);
 }

-function modelSupportsMessageSizeSettings(
-  model: ModelWithSettings,
-): model is ModelWithMessageSizeSettings {
-  return modelSupportsSetting(model, SETTING_REQUEST_MESSAGE_SIZE);
-}
-
 function BooleanSettingRow({
  inheritedValue,
  setting,
@@ -335,63 +242,6 @@ function BooleanSettingRow({
  );
 }

-const HTTP_VERSION_OPTIONS: { label: string; value: HttpVersion }[] = [
-  { label: "Automatic", value: "auto" },
-  { label: "HTTP/1.1", value: "http1" },
-  { label: "HTTP/2", value: "http2" },
-];
-
-function HttpVersionSettingRow({
-  inheritedValue,
-  setting,
-  settingDefinition,
-  onChange,
-}: {
-  inheritedValue: HttpVersion;
-  setting: HttpVersionSetting;
-  settingDefinition: RequestSettingDefinition<"settingHttpVersion">;
-  onChange: (setting: HttpVersionSetting) => void;
-}) {
-  const inherited = isInheritedSetting(setting);
-  const overridden = inherited ? setting.enabled === true : false;
-  const value = inherited ? (overridden ? setting.value : inheritedValue) : setting;
-
-  if (!inherited) {
-    return (
-      <SettingRow title={settingDefinition.title} description={settingDefinition.description}>
-        <Select
-          hideLabel
-          name={settingDefinition.modelKey}
-          label={settingDefinition.title}
-          size="sm"
-          value={value}
-          options={HTTP_VERSION_OPTIONS}
-          onChange={(value) => onChange(value)}
-        />
-      </SettingRow>
-    );
-  }
-
-  return (
-    <SettingOverrideRow
-      title={settingDefinition.title}
-      description={settingDefinition.description}
-      overridden={overridden}
-      onResetOverride={() => onChange({ ...setting, enabled: false })}
-    >
-      <Select
-        hideLabel
-        name={settingDefinition.modelKey}
-        label={settingDefinition.title}
-        size="sm"
-        value={value}
-        options={HTTP_VERSION_OPTIONS}
-        onChange={(value) => onChange({ ...setting, enabled: true, value })}
-      />
-    </SettingOverrideRow>
-  );
-}
-
 function IntegerSettingRow({
  inheritedValue,
  setting,
@@ -409,74 +259,15 @@ function IntegerSettingRow({

  if (!inherited) {
    return (
-      <SettingRow title={settingDefinition.title} description={settingDefinition.description}>
-        <NumberUnitInput
-          name={settingDefinition.modelKey}
-          label={settingDefinition.title}
-          unit="ms"
-          value={`${value}`}
-          placeholder={`${settingDefinition.defaultValue}`}
-          validate={isValidInteger}
-          onChange={(value) => onChange(parseInteger(value))}
-        />
-      </SettingRow>
-    );
-  }
-
-  return (
-    <SettingOverrideRow
-      title={settingDefinition.title}
-      description={settingDefinition.description}
-      overridden={overridden}
-      onResetOverride={() => onChange({ ...setting, enabled: false })}
-    >
-      <NumberUnitInput
+      <SettingRowNumber
        name={settingDefinition.modelKey}
-        label={settingDefinition.title}
-        unit="ms"
-        value={`${value}`}
+        title={settingDefinition.title}
+        description={settingDefinition.description}
+        value={value}
        placeholder={`${settingDefinition.defaultValue}`}
-        validate={isValidInteger}
-        onChange={(value) =>
-          onChange({
-            ...setting,
-            enabled: true,
-            value: parseInteger(value),
-          })
-        }
+        validate={(value) => value === "" || Number.parseInt(value, 10) >= 0}
+        onChange={(value) => onChange(value)}
      />
-    </SettingOverrideRow>
-  );
-}
-
-function MessageSizeSettingRow({
-  inheritedValue,
-  setting,
-  settingDefinition,
-  onChange,
-}: {
-  inheritedValue: number;
-  setting: IntegerSetting;
-  settingDefinition: RequestSettingDefinition<"settingRequestMessageSize">;
-  onChange: (setting: IntegerSetting) => void;
-}) {
-  const inherited = isInheritedSetting(setting);
-  const overridden = inherited ? setting.enabled === true : false;
-  const value = inherited ? (overridden ? setting.value : inheritedValue) : setting;
-  const displayValue = formatMegabytes(value);
-  const placeholder = "0";
-
-  if (!inherited) {
-    return (
-      <SettingRow title={settingDefinition.title} description={settingDefinition.description}>
-        <MessageSizeInput
-          name={settingDefinition.modelKey}
-          label={settingDefinition.title}
-          value={displayValue}
-          placeholder={placeholder}
-          onChange={(value) => onChange(parseMegabytes(value))}
-        />
-      </SettingRow>
    );
  }

@@ -487,16 +278,21 @@ function MessageSizeSettingRow({
      overridden={overridden}
      onResetOverride={() => onChange({ ...setting, enabled: false })}
    >
-      <MessageSizeInput
+      <PlainInput
+        hideLabel
        name={settingDefinition.modelKey}
        label={settingDefinition.title}
-        value={displayValue}
-        placeholder={placeholder}
+        size="sm"
+        type="number"
+        placeholder={`${settingDefinition.defaultValue}`}
+        defaultValue={`${value}`}
+        containerClassName="!w-48"
+        validate={(value) => value === "" || Number.parseInt(value, 10) >= 0}
        onChange={(value) =>
          onChange({
            ...setting,
            enabled: true,
-            value: parseMegabytes(value),
+            value: Number.parseInt(value, 10) || 0,
          })
        }
      />
@@ -504,79 +300,6 @@ function MessageSizeSettingRow({
  );
 }

-function MessageSizeInput({
-  label,
-  name,
-  onChange,
-  placeholder,
-  value,
-}: {
-  label: string;
-  name: string;
-  onChange: (value: string) => void;
-  placeholder: string;
-  value: string;
-}) {
-  return (
-    <NumberUnitInput
-      name={name}
-      label={label}
-      unit="MB"
-      value={value}
-      inputMode="decimal"
-      step="any"
-      placeholder={placeholder}
-      validate={isValidMegabytes}
-      onChange={onChange}
-    />
-  );
-}
-
-function NumberUnitInput({
-  inputMode,
-  label,
-  name,
-  onChange,
-  placeholder,
-  step,
-  unit,
-  validate,
-  value,
-}: {
-  inputMode?: "decimal" | "numeric";
-  label: string;
-  name: string;
-  onChange: (value: string) => void;
-  placeholder: string;
-  step?: number | "any";
-  unit: string;
-  validate: (value: string) => boolean;
-  value: string;
-}) {
-  return (
-    <PlainInput
-      hideLabel
-      name={name}
-      label={label}
-      size="sm"
-      type="number"
-      inputMode={inputMode}
-      step={step}
-      placeholder={placeholder}
-      defaultValue={value}
-      className="[appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
-      containerClassName="w-48!"
-      validate={validate}
-      rightSlot={
-        <span className="flex self-stretch items-center border-l border-border-subtle px-2 text-xs font-medium text-text-subtle">
-          {unit}
-        </span>
-      }
-      onChange={onChange}
-    />
-  );
-}
-
 function isInheritedSetting<T>(
  setting: T | { enabled?: boolean; value: T },
 ): setting is { enabled?: boolean; value: T } {
@@ -585,7 +308,7 @@ function isInheritedSetting<T>(

 function resolveInheritedValue(
  ancestors: (Folder | Workspace)[],
-  key: "settingRequestTimeout" | "settingRequestMessageSize",
+  key: "settingRequestTimeout",
  fallback: IntegerSetting,
 ): number;
 function resolveInheritedValue(
@@ -593,18 +316,13 @@ function resolveInheritedValue(
  key: BooleanWorkspaceSettingKey,
  fallback: BooleanSetting,
 ): boolean;
-function resolveInheritedValue(
-  ancestors: (Folder | Workspace)[],
-  key: "settingHttpVersion",
-  fallback: HttpVersionSetting,
-): HttpVersion;
 function resolveInheritedValue(
  ancestors: (Folder | Workspace)[],
  key: keyof WorkspaceSettings,
-  fallback: BooleanSetting | IntegerSetting | HttpVersionSetting,
+  fallback: BooleanSetting | IntegerSetting,
 ) {
  for (const ancestor of ancestors) {
-    const setting = ancestor[key] as BooleanSetting | IntegerSetting | HttpVersionSetting;
+    const setting = ancestor[key] as BooleanSetting | IntegerSetting;
    if (isInheritedSetting(setting)) {
      if (setting.enabled === true) {
        return setting.value;
@@ -620,41 +338,10 @@ function resolveInheritedValue(
 type WorkspaceSettings = Pick<
  Workspace,
  | "settingFollowRedirects"
-  | "settingHttpVersion"
-  | "settingRequestMessageSize"
  | "settingRequestTimeout"
  | "settingSendCookies"
  | "settingStoreCookies"
  | "settingValidateCertificates"
 >;

-type BooleanWorkspaceSettingKey = Exclude<
-  keyof WorkspaceSettings,
-  "settingRequestTimeout" | "settingRequestMessageSize" | "settingHttpVersion"
->;
-
-function formatMegabytes(bytes: number) {
-  const megabytes = bytes / BYTES_PER_MB;
-  return Number.isInteger(megabytes) ? `${megabytes}` : megabytes.toFixed(3).replace(/\.?0+$/, "");
-}
-
-function parseMegabytes(value: string) {
-  const megabytes = Number(value);
-  return Number.isFinite(megabytes) ? Math.round(megabytes * BYTES_PER_MB) : 0;
-}
-
-function parseInteger(value: string) {
-  const parsed = Number(value);
-  return Number.isFinite(parsed) ? Math.trunc(parsed) : 0;
-}
-
-function isValidInteger(value: string) {
-  const parsed = Number(value);
-  return value === "" || (Number.isInteger(parsed) && parsed >= 0);
-}
-
-function isValidMegabytes(value: string) {
-  if (value === "") return true;
-  const megabytes = Number(value);
-  return Number.isFinite(megabytes) && megabytes >= 0 && megabytes <= MAX_MESSAGE_SIZE_MB;
-}
+type BooleanWorkspaceSettingKey = Exclude<keyof WorkspaceSettings, "settingRequestTimeout">;
@@ -3,12 +3,12 @@ import { patchModel, workspacesAtom } from "@yaakapp-internal/models";
 import { InlineCode, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
 import { useState } from "react";
+import { pluralizeCount } from "../lib/pluralize";
 import { resolvedModelName } from "../lib/resolvedModelName";
 import { router } from "../lib/router";
 import { showToast } from "../lib/toast";
 import { Button } from "./core/Button";
 import { Select } from "./core/Select";
-import { pluralizeCount } from "@yaakapp-internal/lib/pluralize";

 interface Props {
  activeWorkspaceId: string;
@@ -66,7 +66,7 @@ export function MoveToWorkspaceDialog({ onDone, requests, activeWorkspaceId }: P
              <Button
                size="xs"
                color="secondary"
-                className="mr-auto min-w-20"
+                className="mr-auto min-w-[5rem]"
                onClick={async () => {
                  await router.navigate({
                    to: "/workspaces/$workspaceId",
@@ -1,212 +0,0 @@
-import type { Color } from "@yaakapp-internal/plugins";
-import { platform } from "@yaakapp-internal/platform";
-import { settingsAtom } from "@yaakapp-internal/models";
-import { HeaderSize, Heading, Icon, type IconProps, LoadingIcon } from "@yaakapp-internal/ui";
-import classNames from "classnames";
-import { useAtomValue } from "jotai";
-import { useState } from "react";
-import { openWorkspaceFromSyncDir } from "../commands/openWorkspaceFromSyncDir";
-import { showDialog } from "../lib/dialog";
-import { importData } from "../lib/importData";
-import {
-  createExampleWorkspace,
-  createFreshWorkspace,
-  type OnboardingChoice,
-  recordOnboardingChoice,
-} from "../lib/onboarding";
-import { showErrorToast } from "../lib/toast";
-import { CloneGitRepositoryDialog } from "./CloneGitRepositoryDialog";
-import { Button } from "./core/Button";
-
-/** Shown instead of a workspace when there are none. */
-export function Onboarding() {
-  const settings = useAtomValue(settingsAtom);
-  const { capabilities } = platform;
-  const canImport = capabilities.plugins;
-  const showAlreadyUsing = capabilities.localFiles || capabilities.git || canImport;
-  const [busy, setBusy] = useState<OnboardingChoice | null>(null);
-
-  const choose = (choice: OnboardingChoice, run: () => Promise<void> | void) => async () => {
-    recordOnboardingChoice(choice);
-    setBusy(choice);
-    try {
-      await run();
-    } catch (err) {
-      showErrorToast({
-        id: "onboarding-failed",
-        title: "Something went wrong",
-        message: String(err),
-      });
-    } finally {
-      setBusy(null);
-    }
-  };
-
-  return (
-    <div className="grid grid-rows-[auto_minmax(0,1fr)] h-full w-full">
-      <HeaderSize
-        data-tauri-drag-region
-        size="lg"
-        className="x-theme-appHeader bg-surface"
-        osType={platform.osType()}
-        hideWindowControls={settings.hideWindowControls}
-        useNativeTitlebar={settings.useNativeTitlebar}
-        interfaceScale={settings.interfaceScale}
-      />
-      <div className="overflow-auto px-6 py-10 grid">
-        <div className="m-auto w-full max-w-lg flex flex-col gap-7">
-          <div className="flex flex-col gap-1.5">
-            <Heading>How would you like to get started?</Heading>
-            <p className="text-text-subtle">
-              {canImport
-                ? "Bring over existing work, try a real API, or start fresh."
-                : "Try a real API, or start fresh."}
-            </p>
-          </div>
-
-          <div className="flex flex-col gap-2">
-            {canImport && (
-              <StartOption
-                color="primary"
-                icon="folder_input"
-                title="Migrate from another tool"
-                description="Postman, Insomnia, Bruno, OpenAPI, or curl"
-                busy={busy === "import"}
-                disabled={busy != null}
-                onClick={choose("import", () => importData.mutateAsync())}
-              />
-            )}
-            <StartOption
-              color="info"
-              icon="flask"
-              title="Try Yaak with a real API"
-              description="Ready-made requests you can send right away"
-              busy={busy === "example"}
-              disabled={busy != null}
-              onClick={choose("example", createExampleWorkspace)}
-            />
-            <StartOption
-              color="success"
-              icon="plus"
-              title="Start fresh"
-              description="An empty workspace for your first request"
-              busy={busy === "fresh"}
-              disabled={busy != null}
-              onClick={choose("fresh", createFreshWorkspace)}
-            />
-          </div>
-
-          {showAlreadyUsing && (
-            <div className="pt-5 border-t border-dashed border-border-subtle flex flex-col items-start gap-2.5">
-              <span className="text-sm text-text-subtle">Already using Yaak?</span>
-              <div className="flex flex-wrap gap-2">
-                {capabilities.localFiles && (
-                  <Button
-                    size="xs"
-                    variant="border"
-                    color="secondary"
-                    leftSlot={<Icon icon="folder_open" size="sm" />}
-                    disabled={busy != null}
-                    onClick={choose("open_folder", async () => {
-                      const dir = await platform.dialog.open({
-                        title: "Select Workspace Directory",
-                        directory: true,
-                        multiple: false,
-                      });
-                      if (dir == null) return;
-                      await openWorkspaceFromSyncDir.mutateAsync(dir);
-                    })}
-                  >
-                    Open folder
-                  </Button>
-                )}
-                {capabilities.git && (
-                  <Button
-                    size="xs"
-                    variant="border"
-                    color="secondary"
-                    leftSlot={<Icon icon="git_branch" size="sm" />}
-                    disabled={busy != null}
-                    onClick={choose("clone_git", () => {
-                      showDialog({
-                        id: "clone-git-repository",
-                        size: "md",
-                        title: "Clone Git Repository",
-                        render: ({ hide }) => <CloneGitRepositoryDialog hide={hide} />,
-                      });
-                    })}
-                  >
-                    Clone repository
-                  </Button>
-                )}
-                {canImport && (
-                  <Button
-                    size="xs"
-                    variant="border"
-                    color="secondary"
-                    leftSlot={<Icon icon="import" size="sm" />}
-                    disabled={busy != null}
-                    onClick={choose("import_yaak", () => importData.mutateAsync())}
-                  >
-                    Import
-                  </Button>
-                )}
-              </div>
-            </div>
-          )}
-        </div>
-      </div>
-    </div>
-  );
-}
-
-function StartOption({
-  color,
-  icon,
-  title,
-  description,
-  onClick,
-  busy,
-  disabled,
-}: {
-  color: Color;
-  icon: IconProps["icon"];
-  title: string;
-  description: string;
-  onClick: () => void;
-  busy: boolean;
-  disabled: boolean;
-}) {
-  return (
-    <button
-      type="button"
-      disabled={disabled}
-      onClick={onClick}
-      className={classNames(
-        "group w-full text-left rounded-lg px-3 py-2.5 border border-border-subtle",
-        "grid grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3.5",
-        "enabled:hocus:bg-surface-highlight/50 enabled:hocus:border-border",
-        "outline-border-focus focus-visible:outline-2",
-        disabled && !busy && "opacity-disabled",
-      )}
-    >
-      {/* The banner theme tints this tile from the theme's own color for each option */}
-      <div
-        className={classNames(
-          `x-theme-banner--${color}`,
-          "size-10 rounded-md bg-surface-highlight grid place-items-center",
-        )}
-      >
-        {busy ? <LoadingIcon size="sm" /> : <Icon icon={icon} color={color} size="md" />}
-      </div>
-      <div className="min-w-0">
-        <div className="font-semibold text-text">{title}</div>
-        <div className="text-sm text-text-subtle">{description}</div>
-      </div>
-      <Icon
-        icon="chevron_right"
-        className="text-text-subtlest group-enabled:group-hover:text-text-subtle group-enabled:group-focus-visible:text-text-subtle"
-      />
-    </button>
-  );
-}
@@ -1,5 +1,3 @@
-@reference "../main.css";
-
 .prose {
  @apply text-text;

@@ -100,7 +98,7 @@
    @apply text-notice hover:underline;

    * {
-      @apply text-notice!;
+      @apply text-notice !important;
    }
  }

@@ -115,12 +113,12 @@
  ol code,
  ul code {
    @apply text-xs bg-surface-active text-info font-normal whitespace-nowrap;
-    @apply px-1.5 py-0.5 rounded-sm not-italic;
+    @apply px-1.5 py-0.5 rounded not-italic;
    @apply select-text;
  }

  pre {
-    @apply bg-surface-highlight! text-text!;
+    @apply bg-surface-highlight text-text !important;
    @apply px-4 py-3 rounded-md;
    @apply overflow-auto whitespace-pre;
    @apply text-editor font-mono;
@@ -132,7 +130,7 @@

  .banner {
    @apply border border-dashed;
-    @apply border-border bg-surface-highlight text-text px-4 py-3 rounded-sm text-base;
+    @apply border-border bg-surface-highlight text-text px-4 py-3 rounded text-base;

    &::before {
      @apply block font-bold mb-1;
@@ -163,7 +161,7 @@
  }

  blockquote {
-    @apply italic py-3 pl-5 pr-3 border-l-8 border-surface-active text-lg text-text bg-surface-highlight rounded-sm shadow-lg;
+    @apply italic py-3 pl-5 pr-3 border-l-8 border-surface-active text-lg text-text bg-surface-highlight rounded shadow-lg;

    p {
      @apply m-0;
@@ -1,17 +1,11 @@
 import type { GrpcConnection } from "@yaakapp-internal/models";
 import { deleteModel } from "@yaakapp-internal/models";
-import { HStack, Icon, formatMillis } from "@yaakapp-internal/ui";
-import {
-  differenceInHours,
-  differenceInMinutes,
-  format,
-  isToday,
-  isYesterday,
-} from "date-fns";
+import { HStack, Icon } from "@yaakapp-internal/ui";
+import { formatDistanceToNowStrict } from "date-fns";
 import { useDeleteGrpcConnections } from "../hooks/useDeleteGrpcConnections";
-import { Dropdown, type DropdownItem } from "./core/Dropdown";
+import { pluralizeCount } from "../lib/pluralize";
+import { Dropdown } from "./core/Dropdown";
 import { IconButton } from "./core/IconButton";
-import { pluralizeCount } from "@yaakapp-internal/lib/pluralize";

 interface Props {
  connections: GrpcConnection[];
@@ -26,63 +20,6 @@ export function RecentGrpcConnectionsDropdown({
 }: Props) {
  const deleteAllConnections = useDeleteGrpcConnections(activeConnection?.requestId);
  const latestConnectionId = connections[0]?.id ?? "n/a";
-  const connectionHistoryItems: DropdownItem[] = [];
-  let lastHistoryGroup: string | null = null;
-  let hasRecentConnections = false;
-  let hasShownRecentEmptyState = false;
-  const now = new Date();
-
-  for (const c of connections) {
-    const createdAt = `${c.createdAt}Z`;
-    const createdAtDate = new Date(createdAt);
-    const minutesAgo = differenceInMinutes(now, createdAtDate);
-    const hoursAgo = differenceInHours(now, createdAtDate);
-    let historyGroup = format(createdAtDate, "MMM d, yyyy");
-    if (minutesAgo < 5) historyGroup = "Just now";
-    else if (minutesAgo < 15) historyGroup = "5 minutes ago";
-    else if (minutesAgo < 60) historyGroup = "15 minutes ago";
-    else if (hoursAgo < 3) historyGroup = "1 hour ago";
-    else if (hoursAgo < 6) historyGroup = "3 hours ago";
-    else if (isToday(createdAtDate)) historyGroup = "Today";
-    else if (isYesterday(createdAtDate)) historyGroup = "Yesterday";
-    else if (createdAtDate.getFullYear() === now.getFullYear()) historyGroup = format(createdAtDate, "MMM d");
-    const absoluteTime = format(createdAt, "MMM d, yyyy, h:mm:ss a O");
-
-    if (historyGroup === "Just now") {
-      hasRecentConnections = true;
-    } else if (!hasRecentConnections && !hasShownRecentEmptyState) {
-      connectionHistoryItems.push({
-        type: "content",
-        label: <span className="block px-4 py-1 text-sm text-text-subtle">No recent connections</span>,
-      });
-      hasShownRecentEmptyState = true;
-    }
-
-    if (historyGroup !== "Just now" && historyGroup !== lastHistoryGroup) {
-      connectionHistoryItems.push({
-        type: "separator",
-        label: <span title={absoluteTime}>{historyGroup}</span>,
-      });
-      lastHistoryGroup = historyGroup;
-    }
-
-    connectionHistoryItems.push({
-      label: (
-        <HStack space={2} className="text-sm" title={absoluteTime}>
-          <span className="font-mono">{formatMillis(c.elapsed)}</span>
-        </HStack>
-      ),
-      leftSlot: activeConnection?.id === c.id ? <Icon icon="check" /> : <Icon icon="empty" />,
-      onSelect: () => onPinnedConnectionId(c.id),
-    });
-  }
-
-  if (!hasRecentConnections && !hasShownRecentEmptyState) {
-    connectionHistoryItems.push({
-      type: "content",
-      label: <span className="block px-4 py-1 text-sm text-text-subtle">No recent connections</span>,
-    });
-  }

  return (
    <Dropdown
@@ -99,7 +36,16 @@ export function RecentGrpcConnectionsDropdown({
          disabled: connections.length === 0,
        },
        { type: "separator", label: "History" },
-        ...connectionHistoryItems,
+        ...connections.map((c) => ({
+          label: (
+            <HStack space={2}>
+              {formatDistanceToNowStrict(`${c.createdAt}Z`)} ago &bull;{" "}
+              <span className="font-mono text-sm">{c.elapsed}ms</span>
+            </HStack>
+          ),
+          leftSlot: activeConnection?.id === c.id ? <Icon icon="check" /> : <Icon icon="empty" />,
+          onSelect: () => onPinnedConnectionId(c.id),
+        })),
      ]}
    >
      <IconButton
@@ -1,17 +1,12 @@
 import type { HttpResponse } from "@yaakapp-internal/models";
 import { deleteModel } from "@yaakapp-internal/models";
-import { HStack, Icon, formatMillis, HttpStatusTag, SizeTag } from "@yaakapp-internal/ui";
-import {
-  differenceInHours,
-  differenceInMinutes,
-  format,
-  isToday,
-  isYesterday,
-} from "date-fns";
+import { HStack, Icon } from "@yaakapp-internal/ui";
+import { useCopyHttpResponse } from "../hooks/useCopyHttpResponse";
 import { useDeleteHttpResponses } from "../hooks/useDeleteHttpResponses";
-import { useKeyValue } from "../hooks/useKeyValue";
-import { DismissibleBanner } from "./core/DismissibleBanner";
-import { Dropdown, type DropdownItem } from "./core/Dropdown";
+import { useSaveResponse } from "../hooks/useSaveResponse";
+import { pluralize } from "../lib/pluralize";
+import { Dropdown } from "./core/Dropdown";
+import { HttpStatusTag } from "./core/HttpStatusTag";
 import { IconButton } from "./core/IconButton";

 interface Props {
@@ -27,95 +22,32 @@ export const RecentHttpResponsesDropdown = function ResponsePane({
  onPinnedResponseId,
 }: Props) {
  const deleteAllResponses = useDeleteHttpResponses(activeResponse?.requestId);
-  const movedActionsBannerId = "response-actions-moved-to-response-menu-2026-07-02-v2";
-  const { value: dismissedMovedActions } = useKeyValue<boolean>({
-    namespace: "global",
-    key: ["dismiss-banner", movedActionsBannerId],
-    fallback: false,
-  });
  const latestResponseId = responses[0]?.id ?? "n/a";
-  const responseHistoryItems: DropdownItem[] = [];
-  let lastHistoryGroup: string | null = null;
-  let hasRecentResponses = false;
-  let hasShownRecentEmptyState = false;
-  const now = new Date();
-
-  for (const r of responses) {
-    const createdAt = `${r.createdAt}Z`;
-    const createdAtDate = new Date(createdAt);
-    const minutesAgo = differenceInMinutes(now, createdAtDate);
-    const hoursAgo = differenceInHours(now, createdAtDate);
-    let historyGroup = format(createdAtDate, "MMM d, yyyy");
-    if (minutesAgo < 5) historyGroup = "Just now";
-    else if (minutesAgo < 15) historyGroup = "5 minutes ago";
-    else if (minutesAgo < 60) historyGroup = "15 minutes ago";
-    else if (hoursAgo < 3) historyGroup = "1 hour ago";
-    else if (hoursAgo < 6) historyGroup = "3 hours ago";
-    else if (isToday(createdAtDate)) historyGroup = "Today";
-    else if (isYesterday(createdAtDate)) historyGroup = "Yesterday";
-    else if (createdAtDate.getFullYear() === now.getFullYear()) historyGroup = format(createdAtDate, "MMM d");
-    const absoluteTime = format(createdAt, "MMM d, yyyy, h:mm:ss a O");
-
-    if (historyGroup === "Just now") {
-      hasRecentResponses = true;
-    } else if (!hasRecentResponses && !hasShownRecentEmptyState) {
-      responseHistoryItems.push({
-        type: "content",
-        label: <span className="block px-4 py-1 text-sm text-text-subtle">No recent requests</span>,
-      });
-      hasShownRecentEmptyState = true;
-    }
-
-    if (historyGroup !== "Just now" && historyGroup !== lastHistoryGroup) {
-      responseHistoryItems.push({
-        type: "separator",
-        label: <span title={absoluteTime}>{historyGroup}</span>,
-      });
-      lastHistoryGroup = historyGroup;
-    }
-
-    responseHistoryItems.push({
-      label: (
-        <HStack space={2} className="text-sm" title={absoluteTime}>
-          <HttpStatusTag short className="text-xs" response={r} />
-          <span className="text-text-subtlest">&bull;</span>
-          <span className="font-mono">{r.elapsed >= 0 ? formatMillis(r.elapsed) : "n/a"}</span>
-          <span className="text-text-subtlest">&bull;</span>
-          <SizeTag
-            className="text-xs"
-            contentLength={r.contentLength ?? 0}
-            contentLengthCompressed={r.contentLengthCompressed}
-          />
-        </HStack>
-      ),
-      leftSlot: activeResponse?.id === r.id ? <Icon icon="check" /> : <Icon icon="empty" />,
-      onSelect: () => {
-        onPinnedResponseId(r.id);
-      },
-    });
-  }
-
-  if (!hasRecentResponses && !hasShownRecentEmptyState) {
-    responseHistoryItems.push({
-      type: "content",
-      label: <span className="block px-4 py-1 text-sm text-text-subtle">No recent requests</span>,
-    });
-  }
+  const saveResponse = useSaveResponse(activeResponse);
+  const copyResponse = useCopyHttpResponse(activeResponse);

  return (
    <Dropdown
      items={[
+        {
+          label: "Save to File",
+          onSelect: saveResponse.mutate,
+          leftSlot: <Icon icon="save" />,
+          hidden: responses.length === 0 || !!activeResponse.error,
+          disabled: activeResponse.state !== "closed" && activeResponse.status >= 100,
+        },
+        {
+          label: "Copy Body",
+          onSelect: copyResponse.mutate,
+          leftSlot: <Icon icon="copy" />,
+          hidden: responses.length === 0 || !!activeResponse.error,
+          disabled: activeResponse.state !== "closed" && activeResponse.status >= 100,
+        },
        {
          label: "Delete",
          leftSlot: <Icon icon="trash" />,
          onSelect: () => deleteModel(activeResponse),
        },
-        {
-          label: "Delete all",
-          leftSlot: <Icon icon="trash" />,
-          onSelect: deleteAllResponses.mutate,
-          disabled: responses.length === 0,
-        },
        {
          label: "Unpin Response",
          onSelect: () => onPinnedResponseId(activeResponse.id),
@@ -123,25 +55,25 @@ export const RecentHttpResponsesDropdown = function ResponsePane({
          hidden: latestResponseId === activeResponse.id,
          disabled: responses.length === 0,
        },
+        { type: "separator", label: "History" },
        {
-          type: "content",
-          hidden: dismissedMovedActions === true,
+          label: `Delete ${responses.length} ${pluralize("Response", responses.length)}`,
+          onSelect: deleteAllResponses.mutate,
+          hidden: responses.length === 0,
+          disabled: responses.length === 0,
+        },
+        { type: "separator" },
+        ...responses.map((r: HttpResponse) => ({
          label: (
-            <DismissibleBanner
-              id={movedActionsBannerId}
-              color="info"
-              size="xs"
-              className="max-w-72"
-            >
-              <p>Copy and save actions moved to the Response tab menu.</p>
-            </DismissibleBanner>
+            <HStack space={2}>
+              <HttpStatusTag short className="text-xs" response={r} />
+              <span className="text-text-subtle">&rarr;</span>{" "}
+              <span className="font-mono text-sm">{r.elapsed >= 0 ? `${r.elapsed}ms` : "n/a"}</span>
+            </HStack>
          ),
-        },
-        {
-          type: "separator",
-          label: "Recent",
-        },
-        ...responseHistoryItems,
+          leftSlot: activeResponse?.id === r.id ? <Icon icon="check" /> : <Icon icon="empty" />,
+          onSelect: () => onPinnedResponseId(r.id),
+        })),
      ]}
    >
      <IconButton
@@ -1,17 +1,11 @@
 import type { WebsocketConnection } from "@yaakapp-internal/models";
 import { deleteModel, getModel } from "@yaakapp-internal/models";
-import { HStack, Icon, formatMillis } from "@yaakapp-internal/ui";
-import {
-  differenceInHours,
-  differenceInMinutes,
-  format,
-  isToday,
-  isYesterday,
-} from "date-fns";
+import { HStack, Icon } from "@yaakapp-internal/ui";
+import { formatDistanceToNowStrict } from "date-fns";
 import { deleteWebsocketConnections } from "../commands/deleteWebsocketConnections";
-import { Dropdown, type DropdownItem } from "./core/Dropdown";
+import { pluralizeCount } from "../lib/pluralize";
+import { Dropdown } from "./core/Dropdown";
 import { IconButton } from "./core/IconButton";
-import { pluralizeCount } from "@yaakapp-internal/lib/pluralize";

 interface Props {
  connections: WebsocketConnection[];
@@ -25,63 +19,6 @@ export function RecentWebsocketConnectionsDropdown({
  onPinnedConnectionId,
 }: Props) {
  const latestConnectionId = connections[0]?.id ?? "n/a";
-  const connectionHistoryItems: DropdownItem[] = [];
-  let lastHistoryGroup: string | null = null;
-  let hasRecentConnections = false;
-  let hasShownRecentEmptyState = false;
-  const now = new Date();
-
-  for (const c of connections) {
-    const createdAt = `${c.createdAt}Z`;
-    const createdAtDate = new Date(createdAt);
-    const minutesAgo = differenceInMinutes(now, createdAtDate);
-    const hoursAgo = differenceInHours(now, createdAtDate);
-    let historyGroup = format(createdAtDate, "MMM d, yyyy");
-    if (minutesAgo < 5) historyGroup = "Just now";
-    else if (minutesAgo < 15) historyGroup = "5 minutes ago";
-    else if (minutesAgo < 60) historyGroup = "15 minutes ago";
-    else if (hoursAgo < 3) historyGroup = "1 hour ago";
-    else if (hoursAgo < 6) historyGroup = "3 hours ago";
-    else if (isToday(createdAtDate)) historyGroup = "Today";
-    else if (isYesterday(createdAtDate)) historyGroup = "Yesterday";
-    else if (createdAtDate.getFullYear() === now.getFullYear()) historyGroup = format(createdAtDate, "MMM d");
-    const absoluteTime = format(createdAt, "MMM d, yyyy, h:mm:ss a O");
-
-    if (historyGroup === "Just now") {
-      hasRecentConnections = true;
-    } else if (!hasRecentConnections && !hasShownRecentEmptyState) {
-      connectionHistoryItems.push({
-        type: "content",
-        label: <span className="block px-4 py-1 text-sm text-text-subtle">No recent connections</span>,
-      });
-      hasShownRecentEmptyState = true;
-    }
-
-    if (historyGroup !== "Just now" && historyGroup !== lastHistoryGroup) {
-      connectionHistoryItems.push({
-        type: "separator",
-        label: <span title={absoluteTime}>{historyGroup}</span>,
-      });
-      lastHistoryGroup = historyGroup;
-    }
-
-    connectionHistoryItems.push({
-      label: (
-        <HStack space={2} className="text-sm" title={absoluteTime}>
-          <span className="font-mono">{formatMillis(c.elapsed)}</span>
-        </HStack>
-      ),
-      leftSlot: activeConnection?.id === c.id ? <Icon icon="check" /> : <Icon icon="empty" />,
-      onSelect: () => onPinnedConnectionId(c.id),
-    });
-  }
-
-  if (!hasRecentConnections && !hasShownRecentEmptyState) {
-    connectionHistoryItems.push({
-      type: "content",
-      label: <span className="block px-4 py-1 text-sm text-text-subtle">No recent connections</span>,
-    });
-  }

  return (
    <Dropdown
@@ -103,7 +40,16 @@ export function RecentWebsocketConnectionsDropdown({
          disabled: connections.length === 0,
        },
        { type: "separator", label: "History" },
-        ...connectionHistoryItems,
+        ...connections.map((c) => ({
+          label: (
+            <HStack space={2}>
+              {formatDistanceToNowStrict(`${c.createdAt}Z`)} ago &bull;{" "}
+              <span className="font-mono text-sm">{c.elapsed}ms</span>
+            </HStack>
+          ),
+          leftSlot: activeConnection?.id === c.id ? <Icon icon="check" /> : <Icon icon="empty" />,
+          onSelect: () => onPinnedConnectionId(c.id),
+        })),
      ]}
    >
      <IconButton
@@ -7,7 +7,6 @@ import { getRecentRequests } from "../hooks/useRecentRequests";
 import { useRecentWorkspaces } from "../hooks/useRecentWorkspaces";
 import { fireAndForget } from "../lib/fireAndForget";
 import { router } from "../lib/router";
-import { Onboarding } from "./Onboarding";

 export function RedirectToLatestWorkspace() {
  const workspaces = useAtomValue(workspacesAtom);
@@ -15,6 +14,10 @@ export function RedirectToLatestWorkspace() {

  useEffect(() => {
    if (workspaces.length === 0 || recentWorkspaces == null) {
+      console.log("No workspaces found to redirect to. Skipping.", {
+        workspaces,
+        recentWorkspaces,
+      });
      return;
    }

@@ -31,21 +34,11 @@ export function RedirectToLatestWorkspace() {
          request_id: requestId,
        };

-        // Whatever created the first workspace may have already navigated into it
-        const currentId = router.history.location.pathname.match(/^\/workspaces\/([^/]+)/)?.[1];
-        if (workspaces.some((w) => w.id === currentId)) return;
-
        console.log("Redirecting to workspace", params, search);
        await router.navigate({ to: "/workspaces/$workspaceId", params, search });
      })(),
    );
  }, [recentWorkspaces, workspaces, workspaces.length]);

-  // The global models are loaded before the router mounts, so an empty list is a real
-  // first launch (or the last workspace was just deleted), not a store still loading
-  if (workspaces.length === 0) {
-    return <Onboarding />;
-  }
-
  return null;
 }
@@ -0,0 +1,102 @@
+import type { HttpResponse } from "@yaakapp-internal/models";
+import { lazy, Suspense } from "react";
+import { useHttpRequestBody } from "../hooks/useHttpRequestBody";
+import { getMimeTypeFromContentType, languageFromContentType } from "../lib/contentType";
+import { LoadingIcon } from "@yaakapp-internal/ui";
+import { EmptyStateText } from "./EmptyStateText";
+import { AudioViewer } from "./responseViewers/AudioViewer";
+import { CsvViewer } from "./responseViewers/CsvViewer";
+import { ImageViewer } from "./responseViewers/ImageViewer";
+import { MultipartViewer } from "./responseViewers/MultipartViewer";
+import { SvgViewer } from "./responseViewers/SvgViewer";
+import { TextViewer } from "./responseViewers/TextViewer";
+import { VideoViewer } from "./responseViewers/VideoViewer";
+import { WebPageViewer } from "./responseViewers/WebPageViewer";
+
+const PdfViewer = lazy(() =>
+  import("./responseViewers/PdfViewer").then((m) => ({ default: m.PdfViewer })),
+);
+
+interface Props {
+  response: HttpResponse;
+}
+
+export function RequestBodyViewer({ response }: Props) {
+  return <RequestBodyViewerInner key={response.id} response={response} />;
+}
+
+function RequestBodyViewerInner({ response }: Props) {
+  const { data, isLoading, error } = useHttpRequestBody(response);
+
+  if (isLoading) {
+    return (
+      <EmptyStateText>
+        <LoadingIcon />
+      </EmptyStateText>
+    );
+  }
+
+  if (error) {
+    return <EmptyStateText>Error loading request body: {error.message}</EmptyStateText>;
+  }
+
+  if (data?.bodyText == null || data.bodyText.length === 0) {
+    return <EmptyStateText>No request body</EmptyStateText>;
+  }
+
+  const { bodyText, body } = data;
+
+  // Try to detect language from content-type header that was sent
+  const contentTypeHeader = response.requestHeaders.find(
+    (h) => h.name.toLowerCase() === "content-type",
+  );
+  const contentType = contentTypeHeader?.value ?? null;
+  const mimeType = contentType ? getMimeTypeFromContentType(contentType).essence : null;
+  const language = languageFromContentType(contentType, bodyText);
+
+  // Route to appropriate viewer based on content type
+  if (mimeType?.match(/^multipart/i)) {
+    const boundary = contentType?.split("boundary=")[1] ?? "unknown";
+    // Create a copy because parseMultipart may detach the buffer
+    const bodyCopy = new Uint8Array(body);
+    return (
+      <MultipartViewer data={bodyCopy} boundary={boundary} idPrefix={`request.${response.id}`} />
+    );
+  }
+
+  if (mimeType?.match(/^image\/svg/i)) {
+    return <SvgViewer text={bodyText} />;
+  }
+
+  if (mimeType?.match(/^image/i)) {
+    return <ImageViewer data={body.buffer} />;
+  }
+
+  if (mimeType?.match(/^audio/i)) {
+    return <AudioViewer data={body} />;
+  }
+
+  if (mimeType?.match(/^video/i)) {
+    return <VideoViewer data={body} />;
+  }
+
+  if (mimeType?.match(/csv|tab-separated/i)) {
+    return <CsvViewer text={bodyText} />;
+  }
+
+  if (mimeType?.match(/^text\/html/i)) {
+    return <WebPageViewer html={bodyText} />;
+  }
+
+  if (mimeType?.match(/pdf/i)) {
+    return (
+      <Suspense fallback={<LoadingIcon />}>
+        <PdfViewer data={body} />
+      </Suspense>
+    );
+  }
+
+  return (
+    <TextViewer text={bodyText} language={language} stateKey={`request.body.${response.id}`} />
+  );
+}
@@ -1,20 +1,38 @@
 import type { HttpRequest } from "@yaakapp-internal/models";
-import { patchModel, settingsAtom } from "@yaakapp-internal/models";
-import { RequestMethodDropdown as BaseRequestMethodDropdown } from "@yaakapp-internal/ui";
-import { useAtomValue } from "jotai";
-import { memo, useCallback } from "react";
+import { patchModel } from "@yaakapp-internal/models";
+import classNames from "classnames";
+import { memo, useCallback, useMemo } from "react";
+import { showPrompt } from "../lib/prompt";
+import { Button } from "./core/Button";
+import type { DropdownItem } from "./core/Dropdown";
+import { HttpMethodTag, HttpMethodTagRaw } from "./core/HttpMethodTag";
+import { Icon } from "@yaakapp-internal/ui";
+import type { RadioDropdownItem } from "./core/RadioDropdown";
+import { RadioDropdown } from "./core/RadioDropdown";

 type Props = {
  request: HttpRequest;
  className?: string;
 };

-/** The shared method menu, writing to the request and coloured by the user's setting */
+const radioItems: RadioDropdownItem<string>[] = [
+  "GET",
+  "PUT",
+  "POST",
+  "PATCH",
+  "DELETE",
+  "OPTIONS",
+  "QUERY",
+  "HEAD",
+].map((m) => ({
+  value: m,
+  label: <HttpMethodTagRaw method={m} />,
+}));
+
 export const RequestMethodDropdown = memo(function RequestMethodDropdown({
  request,
  className,
 }: Props) {
-  const settings = useAtomValue(settingsAtom);
  const handleChange = useCallback(
    async (method: string) => {
      await patchModel(request, { method });
@@ -22,12 +40,39 @@ export const RequestMethodDropdown = memo(function RequestMethodDropdown({
    [request],
  );

+  const itemsAfter = useMemo<DropdownItem[]>(
+    () => [
+      {
+        key: "custom",
+        label: "CUSTOM",
+        leftSlot: <Icon icon="sparkles" />,
+        onSelect: async () => {
+          const newMethod = await showPrompt({
+            id: "custom-method",
+            label: "Http Method",
+            title: "Custom Method",
+            confirmText: "Save",
+            description: "Enter a custom method name",
+            placeholder: "CUSTOM",
+          });
+          if (newMethod == null) return;
+          await handleChange(newMethod);
+        },
+      },
+    ],
+    [handleChange],
+  );
+
  return (
-    <BaseRequestMethodDropdown
-      method={request.method}
-      colored={settings.coloredMethods}
+    <RadioDropdown
+      value={request.method}
+      items={radioItems}
+      itemsAfter={itemsAfter}
      onChange={handleChange}
-      className={className}
-    />
+    >
+      <Button size="xs" className={classNames(className, "text-text-subtle hover:text")}>
+        <HttpMethodTag request={request} noAlias />
+      </Button>
+    </RadioDropdown>
  );
 });
@@ -1,17 +1,14 @@
+import type { HttpResponse } from "@yaakapp-internal/models";
 import classNames from "classnames";
 import { useMemo } from "react";
 import type { JSX } from "react/jsx-runtime";
-import { CountBadge } from "../CountBadge";
-import { DetailsBanner } from "../DetailsBanner";
-import { useEditorHost } from "../EditorHost";
-import { KeyValueRows } from "../KeyValueRow";
-import { KeyValueRow } from "./ResponseHeaders";
-import type { HttpResponseView } from "./types";
+import { useHttpResponseEvents } from "../hooks/useHttpResponseEvents";
+import { CountBadge } from "./core/CountBadge";
+import { DetailsBanner } from "./core/DetailsBanner";
+import { KeyValueRow, KeyValueRows } from "./core/KeyValueRow";

 interface Props {
-  response: HttpResponseView;
-  /** Only the cookies sent or only those received, for a pane that shows one side */
-  side?: "sent" | "received";
+  response: HttpResponse;
 }

 interface ParsedCookie {
@@ -83,41 +80,45 @@ function parseSetCookieHeader(setCookieHeader: string): ParsedCookie {
  return cookie;
 }

-/** The cookies a response's headers sent and received, the latest value of each name winning */
-export function parseCookieHeaders({ sent, received }: HttpResponseView["cookieHeaders"]) {
-  const sentMap = new Map<string, { name: string; value: string }>();
-  const receivedMap = new Map<string, ParsedCookie>();
+export function ResponseCookies({ response }: Props) {
+  const { data: events } = useHttpResponseEvents(response);

-  for (const header of sent) {
-    for (const cookie of parseCookieHeader(header)) {
-      sentMap.set(cookie.name, cookie);
+  const { sentCookies, receivedCookies } = useMemo(() => {
+    if (!events) return { sentCookies: [], receivedCookies: [] };
+
+    // Use Maps to deduplicate by cookie name (latest value wins)
+    const sentMap = new Map<string, { name: string; value: string }>();
+    const receivedMap = new Map<string, ParsedCookie>();
+
+    for (const event of events) {
+      const e = event.event;
+
+      // Cookie headers sent (header_up with name=cookie)
+      if (e.type === "header_up" && e.name.toLowerCase() === "cookie") {
+        const cookies = parseCookieHeader(e.value);
+        for (const cookie of cookies) {
+          sentMap.set(cookie.name, cookie);
+        }
+      }
+
+      // Set-Cookie headers received (header_down with name=set-cookie)
+      if (e.type === "header_down" && e.name.toLowerCase() === "set-cookie") {
+        const cookie = parseSetCookieHeader(e.value);
+        receivedMap.set(cookie.name, cookie);
+      }
    }
-  }
-  for (const header of received) {
-    const cookie = parseSetCookieHeader(header);
-    receivedMap.set(cookie.name, cookie);
-  }

-  return {
-    sentCookies: Array.from(sentMap.values()),
-    receivedCookies: Array.from(receivedMap.values()),
-  };
-}
-
-export function ResponseCookies({ response, side }: Props) {
-  const { useDetailsBannerStoredValue } = useEditorHost();
-  const { sentCookies, receivedCookies } = useMemo(
-    () => parseCookieHeaders(response.cookieHeaders),
-    [response.cookieHeaders],
-  );
+    return {
+      sentCookies: Array.from(sentMap.values()),
+      receivedCookies: Array.from(receivedMap.values()),
+    };
+  }, [events]);

  return (
    <div className="overflow-auto h-full pb-4 gap-y-3 flex flex-col pr-0.5">
-      {side !== "received" && (
      <DetailsBanner
        defaultOpen
-        useStoredValue={useDetailsBannerStoredValue}
-        storageKey={`${response.ownerId}.sent_cookies`}
+        storageKey={`${response.requestId}.sent_cookies`}
        summary={
          <h2 className="flex items-center">
            Sent Cookies <CountBadge showZero count={sentCookies.length} />
@@ -137,13 +138,10 @@ export function ResponseCookies({ response, side }: Props) {
          </KeyValueRows>
        )}
      </DetailsBanner>
-      )}

-      {side !== "sent" && (
      <DetailsBanner
        defaultOpen
-        useStoredValue={useDetailsBannerStoredValue}
-        storageKey={`${response.ownerId}.received_cookies`}
+        storageKey={`${response.requestId}.received_cookies`}
        summary={
          <h2 className="flex items-center">
            Received Cookies <CountBadge showZero count={receivedCookies.length} />
@@ -169,7 +167,7 @@ export function ResponseCookies({ response, side }: Props) {
                    {cookie.value}
                  </span>
                  {cookie.isDeleted && (
-                    <span className="text-xs font-sans text-danger bg-danger/10 px-1.5 py-0.5 rounded-sm">
+                    <span className="text-xs font-sans text-danger bg-danger/10 px-1.5 py-0.5 rounded">
                      Deleted
                    </span>
                  )}
@@ -218,7 +216,6 @@ export function ResponseCookies({ response, side }: Props) {
          </div>
        )}
      </DetailsBanner>
-      )}
    </div>
  );
 }