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

Merge branch 'main' into feature/manual-cookies
feat(cookies): Allow manually creating cookies
2026-08-16 16:42:01 +02:00 · 2026-05-14 07:57:35 -07:00 · 2026-05-08 09:50:24 +02:00 · 2026-05-07 19:56:49 +02:00
544 changed files with 6553 additions and 32013 deletions
@@ -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
@@ -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,
-};
@@ -30,4 +30,4 @@ jobs:
      - name: Run JS Tests
        run: vp test
      - name: Run Rust Tests
-        run: cargo test --all --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: 60
+    timeout-minutes: 40
    steps:
      - name: Checkout yaakapp/app
        uses: actions/checkout@v4
@@ -91,18 +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
+          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
@@ -130,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
@@ -182,30 +150,13 @@ jobs:
          AZURE_CLIENT_SECRET: ${{ matrix.os == 'windows' && secrets.AZURE_CLIENT_SECRET }}
          AZURE_TENANT_ID: ${{ matrix.os == 'windows' && secrets.AZURE_TENANT_ID }}
        with:
-          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 }}"
-
-      - 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" .
-          gh release upload "${{ github.ref_name }}" "$tarball" --clobber
+          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)
@@ -222,7 +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"}}}}'
+          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"
@@ -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
@@ -7,7 +7,6 @@ permissions:
  contents: write
 jobs:
  deploy:
-    if: github.repository == 'mountain-loop/yaak'
    runs-on: ubuntu-latest
    steps:
      - name: Checkout 🛎️
@@ -58,4 +58,3 @@ flatpak/node-sources.json

 # Claude Code local settings
 .claude/settings.local.json
-.claude/worktrees/
@@ -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

@@ -5,7 +5,6 @@ members = [
  # Common/foundation crates
  "crates/common/yaak-database",
  "crates/common/yaak-rpc",
-  "crates/common/yaak-rpc-schema",
  # Shared crates (no Tauri dependency)
  "crates/yaak-core",
  "crates/yaak-common",
@@ -20,7 +19,6 @@ members = [
  "crates/yaak-templates",
  "crates/yaak-tls",
  "crates/yaak-ws",
-  "crates/yaak-web",
  "crates/yaak-api",
  "crates/yaak-proxy",
  # Proxy-specific crates
@@ -33,7 +31,6 @@ members = [
  "crates-tauri/yaak-fonts",
  "crates-tauri/yaak-license",
  "crates-tauri/yaak-mac-window",
-  "crates-tauri/yaak-system-appearance",
  "crates-tauri/yaak-tauri-utils",
  "crates-tauri/yaak-window",
 ]
@@ -50,13 +47,9 @@ 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"
@@ -65,7 +58,6 @@ 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" }
@@ -92,13 +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-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:
@@ -20,7 +20,7 @@
  <!-- 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)
@@ -57,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
@@ -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`,
-    });
-  },
-});
@@ -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,10 +1,9 @@
-import { platform } from "@yaakapp-internal/platform";
 import type { SettingsTab } from "../components/Settings/Settings";
 import { activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
 import { createFastMutation } from "../hooks/useFastMutation";
 import { jotaiStore } from "../lib/jotai";
 import { router } from "../lib/router";
-import { rpc } from "../lib/rpc";
+import { invokeCmd } from "../lib/tauri";

 // Allow tab with optional subtab (e.g., "plugins:installed")
 type SettingsTabWithSubtab = SettingsTab | `${SettingsTab}:${string}` | null;
@@ -15,21 +14,13 @@ export const openSettings = createFastMutation<void, string, SettingsTabWithSubt
    const workspaceId = jotaiStore.get(activeWorkspaceIdAtom);
    if (workspaceId == null) return;

-    const to = "/workspaces/$workspaceId/settings" as const;
-    const params = { workspaceId };
-    const search = { tab: (tab ?? undefined) as SettingsTab | undefined };
+    const location = router.buildLocation({
+      to: "/workspaces/$workspaceId/settings",
+      params: { workspaceId },
+      search: { tab: (tab ?? undefined) as SettingsTab | undefined },
+    });

-    // Settings is its own window where the host has windows to give. Where it
-    // doesn't — a browser tab — the same route opens in place, which is the
-    // whole difference: it is already a route, not a separate app.
-    if (!platform.capabilities.multiWindow) {
-      await router.navigate({ to, params, search });
-      return;
-    }
-
-    const location = router.buildLocation({ to, params, search });
-
-    await rpc("cmd_new_child_window", {
+    await invokeCmd("cmd_new_child_window", {
      url: location.href,
      label: "settings",
      title: "Yaak Settings",
@@ -1,10 +1,19 @@
 import type { WorkspaceSettingsTab } from "../components/WorkspaceSettingsDialog";
 import { WorkspaceSettingsDialog } from "../components/WorkspaceSettingsDialog";
 import { activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
+import { showDialog } from "../lib/dialog";
 import { jotaiStore } from "../lib/jotai";

 export function openWorkspaceSettings(tab?: WorkspaceSettingsTab) {
  const workspaceId = jotaiStore.get(activeWorkspaceIdAtom);
  if (workspaceId == null) return;
-  WorkspaceSettingsDialog.show(workspaceId, tab);
+  showDialog({
+    id: "workspace-settings",
+    size: "md",
+    className: "h-[calc(100vh-5rem)] !max-h-[40rem]",
+    noPadding: true,
+    render: ({ hide }) => (
+      <WorkspaceSettingsDialog workspaceId={workspaceId} hide={hide} tab={tab} />
+    ),
+  });
 }
@@ -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,16 +1,15 @@
+import { open } from "@tauri-apps/plugin-dialog";
 import { gitClone } from "@yaakapp-internal/git";
 import { Banner, VStack } from "@yaakapp-internal/ui";
 import { useState } from "react";
 import { openWorkspaceFromSyncDir } from "../commands/openWorkspaceFromSyncDir";
 import { appInfo } from "../lib/appInfo";
-import { CommercialUseBanner } from "./CommercialUseBanner";
 import { showErrorToast } from "../lib/toast";
 import { Button } from "./core/Button";
 import { Checkbox } from "./core/Checkbox";
 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;
@@ -38,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,
@@ -90,8 +89,6 @@ export function CloneGitRepositoryDialog({ hide }: Props) {
        </Banner>
      )}

-      <CommercialUseBanner source="git-clone" title="Using Git for work?" />
-
      <PlainInput
        required
        label="Repository URL"
@@ -108,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}
@@ -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) {
@@ -15,7 +15,6 @@ import {
 import { createFolder } from "../commands/commands";
 import { createSubEnvironmentAndActivate } from "../commands/createEnvironment";
 import { openSettings } from "../commands/openSettings";
-import { openWorkspaceSettings } from "../commands/openWorkspaceSettings";
 import { switchWorkspace } from "../commands/switchWorkspace";
 import { useActiveCookieJar } from "../hooks/useActiveCookieJar";
 import { useActiveEnvironment } from "../hooks/useActiveEnvironment";
@@ -37,6 +36,7 @@ import { appInfo } from "../lib/appInfo";
 import { copyToClipboard } from "../lib/copy";
 import { createRequestAndNavigate } from "../lib/createRequestAndNavigate";
 import { deleteModelWithConfirm } from "../lib/deleteModelWithConfirm";
+import { showDialog } from "../lib/dialog";
 import { editEnvironment } from "../lib/editEnvironment";
 import { renameModelWithPrompt } from "../lib/renameModelWithPrompt";
 import {
@@ -99,12 +99,6 @@ export function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
        action: "settings.show",
        onSelect: () => openSettings.mutate(null),
      },
-      {
-        key: "workspace_settings.open",
-        label: "Open Workspace Settings",
-        action: "workspace_settings.show",
-        onSelect: () => openWorkspaceSettings(),
-      },
      {
        key: "app.create",
        label: "Create Workspace",
@@ -133,9 +127,13 @@ export function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
      {
        key: "cookies.show",
        label: "Show Cookies",
-        action: "cookies_editor.show",
        onSelect: async () => {
-          CookieDialog.show(activeCookieJar?.id ?? null);
+          showDialog({
+            id: "cookies",
+            title: "Manage Cookies",
+            size: "full",
+            render: () => <CookieDialog cookieJarId={activeCookieJar?.id ?? null} />,
+          });
        },
      },
      {
@@ -439,7 +437,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 +446,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 +489,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,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>
-      ))}
-    </>
-  );
-}
@@ -1,731 +1,190 @@
-import type { Cookie } from "@yaakapp-internal/models";
-import { cookieJarsAtom, patchModel } from "@yaakapp-internal/models";
-import { formatDate } from "date-fns/format";
+import type { Cookie, CookieDomain, CookieJar } from "@yaakapp-internal/models";
+import { cookieJarsAtom, patchModelById } from "@yaakapp-internal/models";
 import { useAtomValue } from "jotai";
-import {
-  type ComponentProps,
-  type CSSProperties,
-  type FormEvent,
-  type ReactNode,
-  type RefObject,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-import { showDialog } from "../lib/dialog";
-import { jotaiStore } from "../lib/jotai";
 import { cookieDomain } from "../lib/model_util";
-import {
-  Icon,
-  SplitLayout,
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeaderCell,
-  TableRow,
-  TruncatedWideTableCell,
-} from "@yaakapp-internal/ui";
+import { showPromptForm } from "../lib/prompt-form";
+import { Banner, InlineCode } from "@yaakapp-internal/ui";
 import { IconButton } from "./core/IconButton";
-import { Checkbox } from "./core/Checkbox";
-import classNames from "classnames";
-import { EventDetailHeader } from "./core/EventViewer";
-import { KeyValueRow, KeyValueRows } from "./core/KeyValueRow";
-import { EmptyStateText } from "./EmptyStateText";
-import { PlainInput } from "./core/PlainInput";
-import { Select } from "./core/Select";
-import { showAlert } from "../lib/alert";

 interface Props {
  cookieJarId: string | null;
 }

+async function showAddCookieForm(cookieJarId: string): Promise<void> {
+  const result = await showPromptForm({
+    id: "add-cookie",
+    title: "Add Cookie",
+    size: "md",
+    inputs: [
+      {
+        name: "cookie_pairs",
+        label: "Cookie Attributes",
+        type: "key_value",
+        description:
+          "Add key-value pairs for the cookie. These will be combined into the cookie string.",
+      },
+      {
+        name: "domain_value",
+        label: "Domain",
+        type: "text",
+        placeholder: "example.com",
+      },
+      {
+        name: "hostOnly",
+        label: "Host Only",
+        type: "checkbox",
+        defaultValue: "true",
+        description:
+          "If enabled, cookie is restricted to the exact host. Otherwise, it applies to the domain and its subdomains.",
+      },
+      {
+        name: "path",
+        label: "Path",
+        type: "text",
+        placeholder: "/",
+        defaultValue: "/",
+      },
+      {
+        name: "secure",
+        label: "Secure",
+        type: "checkbox",
+        defaultValue: "true",
+        description: "If enabled, cookie will only be sent over HTTPS connections.",
+      },
+    ],
+  });
+
+  if (result == null) return;
+
+  // Parse the form results
+  const cookie_pairs_raw = result.cookie_pairs;
+  const domain_value = (result.domain_value as string) ?? "";
+  const path = (result.path as string) ?? "/";
+  const hostOnly = (result.hostOnly as string) === "true";
+  const secure = (result.secure as string) === "true";
+
+  // Convert key-value pairs to raw_cookie string format: key1=value1;key2=value2
+  // Parse cookie_pairs - it comes as a JSON string from the key_value input
+  let parsedPairs: Array<{ name: string; value: string }> = [];
+  try {
+    // Handle null, undefined, or string value
+    const pairsStr =
+      typeof cookie_pairs_raw === "string"
+        ? cookie_pairs_raw
+        : cookie_pairs_raw != null
+          ? JSON.stringify(cookie_pairs_raw)
+          : "[]";
+    if (pairsStr && pairsStr !== "") {
+      parsedPairs = JSON.parse(pairsStr);
+    }
+  } catch {
+    parsedPairs = [];
+  }
+
+  const validPairs = parsedPairs.filter((p) => p?.name?.trim());
+  // Ensure at least one valid pair exists
+  if (validPairs.length === 0) {
+    console.log("No valid cookie pairs provided");
+    return;
+  }
+
+  const raw_cookie = validPairs.map((p) => `${p.name}=${p.value}`).join(";");
+
+  const domain: CookieDomain = hostOnly
+    ? { HostOnly: domain_value ?? "" }
+    : { Suffix: domain_value ?? "" };
+
+  // Build the new cookie with explicit tuple type for path
+  const newCookie: Cookie = {
+    raw_cookie,
+    domain,
+    expires: "SessionEnd",
+    path: [path, secure] as [string, boolean],
+  };
+
+  try {
+    await patchModelById<"cookie_jar", CookieJar>("cookie_jar", cookieJarId, (prev) => ({
+      ...prev,
+      cookies: [...prev.cookies, newCookie],
+    }));
+  } catch (error) {
+    console.error("Failed to add cookie:", error);
+    throw error;
+  }
+}
+
 export const CookieDialog = ({ cookieJarId }: Props) => {
  const cookieJars = useAtomValue(cookieJarsAtom);
  const cookieJar = cookieJars?.find((c) => c.id === cookieJarId);
-  const [filter, setFilter] = useState("");
-  const [filterUpdateKey, setFilterUpdateKey] = useState(0);
-  const [selectedCookieKey, setSelectedCookieKey] = useState<string | null>(null);
-  const [editingCookieKey, setEditingCookieKey] = useState<string | null>(null);
-  const [draftCookie, setDraftCookie] = useState<Cookie | null>(null);
-  const [draftExpiresInput, setDraftExpiresInput] = useState("");
-  const editorFormRef = useRef<HTMLFormElement>(null);
-  const filteredCookies = useMemo(() => {
-    return cookieJar?.cookies.filter((cookie) => cookieMatchesFilter(cookie, filter)) ?? [];
-  }, [cookieJar?.cookies, filter]);
-  const selectedCookie = useMemo(
-    () =>
-      selectedCookieKey == null
-        ? null
-        : (filteredCookies.find((cookie) => cookieKey(cookie) === selectedCookieKey) ?? null),
-    [filteredCookies, selectedCookieKey],
-  );
-  const detailCookie = draftCookie ?? selectedCookie;
-  const isCreatingCookie = editingCookieKey === NEW_COOKIE_KEY;
-  const isEditingCookie = draftCookie != null;
-
-  const handleAddCookie = () => {
-    setSelectedCookieKey(null);
-    setEditingCookieKey(NEW_COOKIE_KEY);
-    setDraftCookie(newCookieDraft());
-    setDraftExpiresInput("");
-  };
-
-  const handleEditCookie = () => {
-    if (selectedCookie == null) {
-      return;
-    }
-
-    setEditingCookieKey(cookieKey(selectedCookie));
-    setDraftCookie(selectedCookie);
-    setDraftExpiresInput(cookieExpiresInputValue(selectedCookie));
-  };
-
-  const handleCancelEdit = () => {
-    if (isCreatingCookie) {
-      setSelectedCookieKey(null);
-    }
-    setEditingCookieKey(null);
-    setDraftCookie(null);
-    setDraftExpiresInput("");
-  };
-
-  const handleCloseDetails = () => {
-    if (isEditingCookie) {
-      handleCancelEdit();
-      return;
-    }
-
-    setSelectedCookieKey(null);
-  };
-
-  const handleSaveCookie = (event: FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-
-    if (cookieJar == null || draftCookie == null) {
-      return;
-    }
-
-    let nextCookie = normalizeCookie(draftCookie);
-    if (nextCookie.expires !== "SessionEnd") {
-      const expires = cookieExpiresFromInput(draftExpiresInput);
-      if (expires == null) {
-        showAlert({
-          id: "invalid-cookie-expires",
-          title: "Invalid Cookie",
-          body: "Cookie expiration must be a valid date.",
-        });
-        return;
-      }
-
-      nextCookie = { ...nextCookie, expires };
-    }
-
-    const nextCookieKey = cookieKey(nextCookie);
-    const nextCookies = cookieJar.cookies.filter((cookie) => {
-      const key = cookieKey(cookie);
-      if (editingCookieKey != null && key === editingCookieKey) {
-        return false;
-      }
-      return key !== nextCookieKey;
-    });
-
-    void patchModel(cookieJar, { cookies: [...nextCookies, nextCookie] });
-    setSelectedCookieKey(nextCookieKey);
-    setEditingCookieKey(null);
-    setDraftCookie(null);
-    setDraftExpiresInput("");
-  };

  if (cookieJar == null) {
    return <div>No cookie jar selected</div>;
  }

-  return (
-    <div className="pb-2 grid grid-rows-[auto_minmax(0,1fr)] space-y-2">
-      <div className="grid grid-cols-[minmax(0,1fr)_auto] gap-2">
-        <PlainInput
-          name="cookie-filter"
-          label="Filter cookies"
-          hideLabel
-          placeholder="Filter cookies"
-          defaultValue={filter}
-          forceUpdateKey={filterUpdateKey}
-          onChange={setFilter}
-          rightSlot={
-            filter.length > 0 && (
-              <IconButton
-                className="bg-transparent! h-auto! min-h-full opacity-50 hover:opacity-100 -mr-1"
-                icon="x"
-                title="Clear filter"
-                onClick={() => {
-                  setFilter("");
-                  setFilterUpdateKey((key) => key + 1);
-                }}
-              />
-            )
-          }
-        />
-        <IconButton icon="plus" size="sm" title="Add cookie" onClick={handleAddCookie} />
-      </div>
-      {cookieJar.cookies.length === 0 && detailCookie == null ? (
-        <EmptyStateText>
-          Cookies will appear when a response includes a Set-Cookie header.
-        </EmptyStateText>
-      ) : filteredCookies.length === 0 && detailCookie == null ? (
-        <EmptyStateText>No cookies match the current filter.</EmptyStateText>
-      ) : (
-        <SplitLayout
-          layout="vertical"
-          storageKey="cookie-dialog-details"
-          defaultRatio={0.5}
-          className="-mx-2"
-          minHeightPx={10}
-          firstSlot={({ style }) =>
-            filteredCookies.length === 0 ? (
-              <div style={style}>
-                <EmptyStateText>No cookies match the current filter.</EmptyStateText>
-              </div>
-            ) : (
-              <Table scrollable style={style} className="pr-0.5">
-                <TableHead>
-                  <TableRow>
-                    <TableHeaderCell>Name</TableHeaderCell>
-                    <TableHeaderCell>Value</TableHeaderCell>
-                    <TableHeaderCell>Domain</TableHeaderCell>
-                    <TableHeaderCell>Path</TableHeaderCell>
-                    <TableHeaderCell>Expires</TableHeaderCell>
-                    <TableHeaderCell>Size</TableHeaderCell>
-                    <TableHeaderCell>HTTP Only</TableHeaderCell>
-                    <TableHeaderCell>Secure</TableHeaderCell>
-                    <TableHeaderCell>Same Site</TableHeaderCell>
-                    <TableHeaderCell>
-                      <IconButton
-                        icon="list_x"
-                        size="sm"
-                        className="text-text-subtle"
-                        title="Clear all cookies"
-                        onClick={() => {
-                          setSelectedCookieKey(null);
-                          setEditingCookieKey(null);
-                          setDraftCookie(null);
-                          setDraftExpiresInput("");
-                          void patchModel(cookieJar, { cookies: [] });
-                        }}
-                      />
-                    </TableHeaderCell>
-                  </TableRow>
-                </TableHead>
-                <TableBody className="[&_td]:select-auto [&_td]:cursor-auto">
-                  {filteredCookies.map((c: Cookie) => {
-                    const key = cookieKey(c);
-                    const isSelected = key === selectedCookieKey;
+  const onAddCookie = () => showAddCookieForm(cookieJar.id);

-                    return (
-                      <TableRow
-                        key={key}
-                        className={classNames(
-                          "group/tr cursor-default",
-                          isSelected && "[&_td]:bg-surface-highlight",
-                          !isSelected && "hover:[&_td]:bg-surface-hover",
-                        )}
-                        onClick={() => {
-                          setSelectedCookieKey(key);
-                          setEditingCookieKey(null);
-                          setDraftCookie(null);
-                          setDraftExpiresInput("");
-                        }}
-                      >
-                        <TableCell className={classNames("pl-2", isSelected && "rounded-l")}>
-                          {c.name}
-                        </TableCell>
-                        <TruncatedWideTableCell className="min-w-40">
-                          {c.value}
-                        </TruncatedWideTableCell>
-                        <TableCell>{cookieDomain(c)}</TableCell>
-                        <TableCell>{c.path}</TableCell>
-                        <TableCell>{cookieExpires(c)}</TableCell>
-                        <TableCell>{cookieSize(c)}</TableCell>
-                        <TableCell>
-                          <Icon
-                            icon={c.httpOnly ? "check" : "x"}
-                            className={classNames(!c.httpOnly && "opacity-10")}
-                          />
-                        </TableCell>
-                        <TableCell>
-                          <Icon
-                            icon={c.secure ? "check" : "x"}
-                            className={classNames(!c.secure && "opacity-10")}
-                          />
-                        </TableCell>
-                        <TableCell>{c.sameSite}</TableCell>
-                        <TableCell className="rounded-r pr-2">
-                          <IconButton
-                            icon="trash"
-                            size="xs"
-                            iconSize="sm"
-                            title="Delete"
-                            className="text-text-subtlest ml-auto group-hover/tr:text-text transition-colors"
-                            onClick={(event) => {
-                              event.stopPropagation();
-                              if (isSelected) {
-                                setSelectedCookieKey(null);
-                              }
-                              if (editingCookieKey === key) {
-                                setEditingCookieKey(null);
-                                setDraftCookie(null);
-                                setDraftExpiresInput("");
-                              }
-                              void patchModel(cookieJar, {
-                                cookies: cookieJar.cookies.filter(
-                                  (c2: Cookie) => cookieKey(c2) !== key,
-                                ),
-                              });
-                            }}
-                          />
-                        </TableCell>
-                      </TableRow>
-                    );
-                  })}
-                </TableBody>
-              </Table>
-            )
-          }
-          secondSlot={
-            detailCookie == null
-              ? null
-              : ({ style }) => (
-                  <CookieDetailsPane
-                    formRef={editorFormRef}
-                    isEditing={isEditingCookie}
-                    onSubmit={handleSaveCookie}
-                    style={style}
-                  >
-                    <EventDetailHeader
-                      title={isCreatingCookie ? "New Cookie" : detailCookie.name || "Cookie"}
-                      copyText={isEditingCookie ? undefined : detailCookie.value}
-                      actions={
-                        isEditingCookie
-                          ? [
-                              {
-                                key: "save",
-                                label: isCreatingCookie ? "Create" : "Save",
-                                onClick: () => editorFormRef.current?.requestSubmit(),
-                              },
-                              {
-                                key: "cancel",
-                                label: "Cancel",
-                                onClick: handleCancelEdit,
-                              },
-                            ]
-                          : [
-                              {
-                                key: "edit",
-                                label: "Edit",
-                                onClick: handleEditCookie,
-                              },
-                            ]
-                      }
-                      onClose={handleCloseDetails}
-                    />
-                    {isEditingCookie ? (
-                      <CookieEditor
-                        cookie={detailCookie}
-                        expiresInputValue={draftExpiresInput}
-                        onChange={setDraftCookie}
-                        onExpiresInputChange={setDraftExpiresInput}
-                      />
-                    ) : (
-                      <CookieDetails cookie={detailCookie} />
-                    )}
-                  </CookieDetailsPane>
-                )
-          }
-        />
-      )}
-    </div>
-  );
-};
-
-function CookieDetailsPane({
-  children,
-  formRef,
-  isEditing,
-  onSubmit,
-  style,
-}: {
-  children: ReactNode;
-  formRef: RefObject<HTMLFormElement | null>;
-  isEditing: boolean;
-  onSubmit: (event: FormEvent<HTMLFormElement>) => void;
-  style: CSSProperties;
-}) {
-  const className = "grid grid-rows-[auto_minmax(0,1fr)] bg-surface border-t border-border pt-2";
-
-  if (isEditing) {
-    return (
-      <form ref={formRef} style={style} className={className} onSubmit={onSubmit}>
-        {children}
-      </form>
+  let tableBody;
+  if (cookieJar.cookies.length === 0) {
+    tableBody = (
+      <tr>
+        <td colSpan={3}>
+          <Banner>
+            Cookies will appear when a response contains the <InlineCode>Set-Cookie</InlineCode>{" "}
+            header
+          </Banner>
+        </td>
+      </tr>
    );
-  }
-
-  return (
-    <div style={style} className={className}>
-      {children}
-    </div>
-  );
-}
-
-CookieDialog.show = (cookieJarId: string | null) => {
-  const cookieJar = jotaiStore.get(cookieJarsAtom)?.find((jar) => jar.id === cookieJarId);
-  if (cookieJar == null) {
-    showAlert({
-      id: "invalid-jar",
-      body: `Failed to find cookie jar for ID: ${cookieJarId}`,
-      title: "Invalid Cookie Jar",
-    });
-    return;
-  }
-
-  showDialog({
-    id: "cookies",
-    title: `${cookieJar.name} Cookies`,
-    size: "full",
-    render: () => <CookieDialog cookieJarId={cookieJarId} />,
-  });
-};
-
-function CookieDetails({ cookie }: { cookie: Cookie }) {
-  return (
-    <div className="overflow-y-auto">
-      <KeyValueRows selectable>
-        <CookieKeyValueRow label="Name">{cookie.name}</CookieKeyValueRow>
-        <CookieKeyValueRow label="Value" enableCopy copyText={cookie.value}>
-          <pre className="whitespace-pre-wrap break-all">{cookie.value}</pre>
-        </CookieKeyValueRow>
-        <CookieKeyValueRow label="Domain">{cookieDomain(cookie)}</CookieKeyValueRow>
-        <CookieKeyValueRow label="Path">{cookie.path}</CookieKeyValueRow>
-        <CookieKeyValueRow label="Expires">{cookieExpires(cookie)}</CookieKeyValueRow>
-        <CookieKeyValueRow label="Size">{cookieSize(cookie)}</CookieKeyValueRow>
-        <CookieKeyValueRow label="HTTP Only">{cookie.httpOnly ? "Yes" : "No"}</CookieKeyValueRow>
-        <CookieKeyValueRow label="Secure">{cookie.secure ? "Yes" : "No"}</CookieKeyValueRow>
-        {cookie.sameSite && (
-          <CookieKeyValueRow label="Same Site">{cookie.sameSite}</CookieKeyValueRow>
-        )}
-      </KeyValueRows>
-    </div>
-  );
-}
-
-function CookieEditor({
-  cookie,
-  expiresInputValue,
-  onChange,
-  onExpiresInputChange,
-}: {
-  cookie: Cookie;
-  expiresInputValue: string;
-  onChange: (cookie: Cookie) => void;
-  onExpiresInputChange: (value: string) => void;
-}) {
-  const sessionCookie = cookie.expires === "SessionEnd";
-
-  return (
-    <div className="overflow-y-auto">
-      <KeyValueRows>
-        <CookieKeyValueRow align="middle" label="Name">
-          <CookieTextInput
-            required
-            autoFocus
-            pattern={NON_EMPTY_INPUT_PATTERN}
-            value={cookie.name}
-            onChange={(name) => onChange({ ...cookie, name })}
-          />
-        </CookieKeyValueRow>
-        <CookieKeyValueRow label="Value">
-          <CookieTextarea
-            value={cookie.value}
-            onChange={(value) => onChange({ ...cookie, value })}
-          />
-        </CookieKeyValueRow>
-        <CookieKeyValueRow align="middle" label="Domain">
-          <CookieTextInput
-            required
-            pattern={NON_EMPTY_INPUT_PATTERN}
-            value={cookieDomainInputValue(cookie)}
-            placeholder="example.com"
-            onChange={(domain) => onChange(cookieWithDomain(cookie, domain))}
-          />
-        </CookieKeyValueRow>
-        <CookieKeyValueRow align="middle" label="Path">
-          <CookieTextInput
-            value={cookie.path}
-            placeholder="/"
-            onChange={(path) => onChange({ ...cookie, path })}
-          />
-        </CookieKeyValueRow>
-        <CookieKeyValueRow label="Expires">
-          <div className="grid gap-1">
-            <Checkbox
-              checked={sessionCookie}
-              title="Session cookie"
-              onChange={(checked) => {
-                if (checked) {
-                  onChange({ ...cookie, expires: "SessionEnd" });
-                  return;
-                }
-
-                const expiresInput =
-                  cookieExpiresFromInput(expiresInputValue) == null
-                    ? defaultCookieExpiresInputValue()
-                    : expiresInputValue;
-
-                onExpiresInputChange(expiresInput);
-                onChange({
-                  ...cookie,
-                  expires: cookieExpiresFromInput(expiresInput)!,
-                });
-              }}
-            />
-            <CookieTextInput
-              value={sessionCookie ? "" : expiresInputValue}
-              disabled={sessionCookie}
-              onChange={(value) => {
-                onExpiresInputChange(value);
-
-                const expires = cookieExpiresFromInput(value);
-                if (expires != null) {
-                  onChange({ ...cookie, expires });
-                }
-              }}
-            />
-          </div>
-        </CookieKeyValueRow>
-        <CookieKeyValueRow label="Size">{cookieSize(cookie)}</CookieKeyValueRow>
-        <CookieKeyValueRow align="middle" label="HTTP Only">
-          <Checkbox
-            hideLabel
-            title="HTTP Only"
-            checked={cookie.httpOnly}
-            onChange={(httpOnly) => onChange({ ...cookie, httpOnly })}
-          />
-        </CookieKeyValueRow>
-        <CookieKeyValueRow align="middle" label="Secure">
-          <Checkbox
-            hideLabel
-            title="Secure"
-            checked={cookie.secure}
-            onChange={(secure) => onChange({ ...cookie, secure })}
-          />
-        </CookieKeyValueRow>
-        <CookieKeyValueRow align="middle" label="Same Site">
-          <Select
-            hideLabel
-            name="cookie-same-site"
-            label="Same Site"
-            value={cookie.sameSite ?? ""}
+    // );
+  } else {
+    tableBody = cookieJar?.cookies.map((c: Cookie) => (
+      <tr key={JSON.stringify(c)}>
+        <td className="py-2 select-text cursor-text font-mono font-semibold max-w-0">
+          {cookieDomain(c)}
+        </td>
+        <td className="py-2 pl-4 select-text cursor-text font-mono text-text-subtle whitespace-nowrap overflow-x-auto max-w-[200px] hide-scrollbars">
+          {c.raw_cookie}
+        </td>
+        <td className="max-w-0 w-10">
+          <IconButton
+            icon="trash"
            size="xs"
-            className="w-full"
-            options={[
-              { label: "n/a", value: "" },
-              { label: "Lax", value: "Lax" },
-              { label: "Strict", value: "Strict" },
-              { label: "None", value: "None" },
-            ]}
-            onChange={(sameSite) =>
-              onChange({
-                ...cookie,
-                sameSite: sameSite === "" ? null : (sameSite as Cookie["sameSite"]),
-              })
+            iconSize="sm"
+            title="Delete"
+            className="ml-auto"
+            onClick={async () =>
+              await patchModelById<"cookie_jar", CookieJar>("cookie_jar", cookieJar.id, (prev) => ({
+                ...prev,
+                cookies: prev.cookies.filter((c2: Cookie) => c2 !== c),
+              }))
            }
          />
-        </CookieKeyValueRow>
-      </KeyValueRows>
+        </td>
+      </tr>
+    ));
+  }
+
+  return (
+    <div className="pb-2">
+      <table className="w-full text-sm mb-auto min-w-full max-w-full divide-y divide-surface-highlight">
+        <thead>
+          <tr>
+            <th className="py-2 text-left">Domain</th>
+            <th className="py-2 text-left pl-4">Cookie</th>
+            <th className="py-2 pl-4 w-10">
+              <IconButton
+                icon="plus"
+                size="xs"
+                iconSize="sm"
+                title="Add Cookie"
+                className="ml-auto"
+                onClick={onAddCookie}
+              />
+            </th>
+          </tr>
+        </thead>
+        <tbody className="divide-y divide-surface-highlight">{tableBody}</tbody>
+      </table>
    </div>
  );
-}
-
-function CookieKeyValueRow({ labelClassName, ...props }: ComponentProps<typeof KeyValueRow>) {
-  return <KeyValueRow labelClassName={classNames("w-28", labelClassName)} {...props} />;
-}
-
-function CookieTextInput({
-  autoFocus,
-  disabled,
-  onChange,
-  pattern,
-  placeholder,
-  required,
-  value,
-}: {
-  autoFocus?: boolean;
-  disabled?: boolean;
-  onChange: (value: string) => void;
-  pattern?: string;
-  placeholder?: string;
-  required?: boolean;
-  value: string;
-}) {
-  return (
-    <input
-      autoFocus={autoFocus}
-      autoCapitalize="off"
-      autoCorrect="off"
-      className={cookieInputClassName}
-      disabled={disabled}
-      onChange={(event) => onChange(event.target.value)}
-      pattern={pattern}
-      placeholder={placeholder}
-      required={required}
-      type="text"
-      value={value}
-    />
-  );
-}
-
-function CookieTextarea({ onChange, value }: { onChange: (value: string) => void; value: string }) {
-  return (
-    <textarea
-      autoCapitalize="off"
-      autoCorrect="off"
-      className={classNames(cookieInputClassName, "min-h-20 resize-y")}
-      onChange={(event) => onChange(event.target.value)}
-      value={value}
-    />
-  );
-}
-
-const NEW_COOKIE_KEY = "__new-cookie__";
-const NON_EMPTY_INPUT_PATTERN = ".*\\S.*";
-const cookieInputClassName = classNames(
-  "x-theme-input w-full min-w-0 min-h-sm rounded-md bg-transparent",
-  "border border-border-subtle outline-hidden",
-  "px-2 text-xs font-mono cursor-text placeholder:text-placeholder",
-  "focus:border-border-focus invalid:border-danger",
-  "disabled:opacity-disabled disabled:border-dotted",
-);
-
-function cookieSize(cookie: Cookie) {
-  const encoder = new TextEncoder();
-  return encoder.encode(cookie.name).length + encoder.encode(cookie.value).length;
-}
-
-function newCookieDraft(): Cookie {
-  return {
-    name: "",
-    value: "",
-    domain: "NotPresent",
-    expires: "SessionEnd",
-    path: "/",
-    secure: false,
-    httpOnly: false,
-    sameSite: null,
-  };
-}
-
-function normalizeCookie(cookie: Cookie): Cookie {
-  return {
-    ...cookie,
-    domain: normalizeCookieDomain(cookie.domain),
-    name: cookie.name.trim(),
-    path: cookie.path.trim() || "/",
-  };
-}
-
-function normalizeCookieDomain(domain: Cookie["domain"]): Cookie["domain"] {
-  if (domain === "NotPresent" || domain === "Empty") {
-    return domain;
-  }
-
-  if ("Suffix" in domain) {
-    return { Suffix: domain.Suffix.trim() };
-  }
-
-  return { HostOnly: domain.HostOnly.trim() };
-}
-
-function cookieDomainInputValue(cookie: Cookie) {
-  const domain = cookieDomain(cookie);
-  return domain === "n/a" ? "" : domain;
-}
-
-function cookieWithDomain(cookie: Cookie, domain: string): Cookie {
-  const trimmedDomain = domain.trim();
-  if (trimmedDomain.length === 0) {
-    return { ...cookie, domain: "NotPresent" };
-  }
-
-  if (cookie.domain !== "NotPresent" && cookie.domain !== "Empty" && "Suffix" in cookie.domain) {
-    return { ...cookie, domain: { Suffix: trimmedDomain } };
-  }
-
-  return { ...cookie, domain: { HostOnly: trimmedDomain } };
-}
-
-function cookieExpires(cookie: Cookie) {
-  if (cookie.expires === "SessionEnd") {
-    return "Session";
-  }
-
-  const expiresSeconds = Number(cookie.expires.AtUtc);
-  if (!Number.isFinite(expiresSeconds)) {
-    return cookie.expires.AtUtc;
-  }
-
-  const date = new Date(expiresSeconds * 1000);
-  return formatDate(date, "MMM d, yyyy, h:mm:ss a");
-}
-
-function cookieExpiresInputValue(cookie: Cookie) {
-  if (cookie.expires === "SessionEnd") {
-    return "";
-  }
-
-  const expiresSeconds = Number(cookie.expires.AtUtc);
-  if (!Number.isFinite(expiresSeconds)) {
-    return "";
-  }
-
-  return new Date(expiresSeconds * 1000).toISOString();
-}
-
-function defaultCookieExpiresInputValue() {
-  return new Date(Date.now() + 24 * 60 * 60 * 1000).toISOString();
-}
-
-function cookieExpiresFromInput(value: string): Cookie["expires"] | null {
-  const time = new Date(value).getTime();
-  if (!Number.isFinite(time)) {
-    return null;
-  }
-
-  return { AtUtc: `${Math.floor(time / 1000)}` };
-}
-
-function cookieMatchesFilter(cookie: Cookie, filter: string) {
-  const query = filter.trim().toLowerCase();
-  if (query.length === 0) {
-    return true;
-  }
-
-  return [cookie.name, cookie.value, cookieDomain(cookie)].some((value) =>
-    value.toLowerCase().includes(query),
-  );
-}
-
-function cookieKey(cookie: Cookie) {
-  return [cookie.name, cookieDomainKey(cookie.domain), cookie.path].join("|");
-}
-
-function cookieDomainKey(domain: Cookie["domain"]) {
-  if (typeof domain !== "string" && "HostOnly" in domain) {
-    return `HostOnly:${domain.HostOnly}`;
-  }
-
-  if (typeof domain !== "string" && "Suffix" in domain) {
-    return `Suffix:${domain.Suffix}`;
-  }
-
-  return domain;
-}
+};
@@ -4,6 +4,7 @@ import { memo, useMemo } from "react";
 import { useActiveCookieJar } from "../hooks/useActiveCookieJar";
 import { useCreateCookieJar } from "../hooks/useCreateCookieJar";
 import { deleteModelWithConfirm } from "../lib/deleteModelWithConfirm";
+import { showDialog } from "../lib/dialog";
 import { showPrompt } from "../lib/prompt";
 import { setWorkspaceSearchParams } from "../lib/setWorkspaceSearchParams";
 import { CookieDialog } from "./CookieDialog";
@@ -35,7 +36,12 @@ export const CookieDropdown = memo(function CookieDropdown() {
              leftSlot: <Icon icon="cookie" />,
              onSelect: () => {
                if (activeCookieJar == null) return;
-                CookieDialog.show(activeCookieJar.id);
+                showDialog({
+                  id: "cookies",
+                  title: "Manage Cookies",
+                  size: "full",
+                  render: () => <CookieDialog cookieJarId={activeCookieJar.id} />,
+                });
              },
            },
            {
@@ -5,7 +5,7 @@ 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";
@@ -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({
@@ -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>
@@ -204,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
@@ -300,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,
@@ -359,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}
      >
@@ -372,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}
@@ -392,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}
@@ -4,12 +4,11 @@ import type { ReactNode } from "react";
 interface Props {
  children: ReactNode;
  className?: string;
-  wrapperClassName?: string;
 }

-export function EmptyStateText({ children, className, wrapperClassName }: Props) {
+export function EmptyStateText({ children, className }: Props) {
  return (
-    <div className={classNames("w-full h-full pb-2", wrapperClassName)}>
+    <div className="w-full h-full pb-2">
      <div
        className={classNames(
          className,
@@ -62,7 +62,7 @@ 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.
@@ -57,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}
@@ -1,3 +1,4 @@
+import { save } from "@tauri-apps/plugin-dialog";
 import type { Workspace } from "@yaakapp-internal/models";
 import { workspacesAtom } from "@yaakapp-internal/models";
 import { HStack, VStack } from "@yaakapp-internal/ui";
@@ -6,13 +7,11 @@ import { useCallback, useMemo, useState } from "react";
 import slugify from "slugify";
 import { activeWorkspaceAtom } from "../hooks/useActiveWorkspace";
 import { pluralizeCount } from "../lib/pluralize";
-import { rpc } from "../lib/rpc";
-import { CommercialUseBanner } from "./CommercialUseBanner";
+import { invokeCmd } from "../lib/tauri";
 import { Button } from "./core/Button";
 import { Checkbox } from "./core/Checkbox";
 import { DetailsBanner } from "./core/DetailsBanner";
 import { Link } from "./core/Link";
-import { platform } from "@yaakapp-internal/platform";

 interface Props {
  onHide: () => void;
@@ -65,7 +64,7 @@ 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 exportPath = await platform.dialog.save({
+    const exportPath = await save({
      title: "Export Data",
      defaultPath: `yaak.${slug}.json`,
    });
@@ -73,7 +72,7 @@ function ExportDataDialogContent({
      return;
    }

-    await rpc("cmd_export_data", {
+    await invokeCmd("cmd_export_data", {
      workspaceIds: ids,
      exportPath,
      includePrivateEnvironments: includePrivateEnvironments,
@@ -86,10 +85,8 @@ function ExportDataDialogContent({
  const numSelected = Object.values(selectedWorkspaces).filter(Boolean).length;
  const noneSelected = numSelected === 0;
  return (
-    <div className="h-full w-full grid grid-rows-[minmax(0,1fr)_auto] overflow-hidden rounded-b-lg">
+    <div className="w-full grid grid-rows-[minmax(0,1fr)_auto]">
      <VStack space={3} className="overflow-auto px-5 pb-6">
-        <CommercialUseBanner source="data-export" title="Exporting work data?" />
-
        <table className="w-full mb-auto min-w-full max-w-full divide-y divide-surface-highlight">
          <thead>
            <tr>
@@ -140,9 +137,9 @@ function ExportDataDialogContent({
          />
        </DetailsBanner>
      </VStack>
-      <footer className="px-5 grid grid-cols-[1fr_auto] items-center bg-surface py-3 border-t border-border-subtle">
+      <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-subtlest">
+          <Link href="https://yaak.app/button/new" noUnderline className="text-text-subtle">
            Create Run Button
          </Link>
        </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>
-  );
-}
@@ -163,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 ? (
@@ -190,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" />}
@@ -21,7 +21,6 @@ import { EnvironmentEditor } from "./EnvironmentEditor";
 import { HeadersEditor } from "./HeadersEditor";
 import { HttpAuthenticationEditor } from "./HttpAuthenticationEditor";
 import { MarkdownEditor } from "./MarkdownEditor";
-import { countOverriddenSettings, ModelSettingsEditor } from "./ModelSettingsEditor";

 interface Props {
  folderId: string | null;
@@ -30,7 +29,6 @@ interface Props {

 const TAB_AUTH = "auth";
 const TAB_HEADERS = "headers";
-const TAB_SETTINGS = "settings";
 const TAB_VARIABLES = "variables";
 const TAB_GENERAL = "general";

@@ -38,7 +36,6 @@ export type FolderSettingsTab =
  | typeof TAB_AUTH
  | typeof TAB_HEADERS
  | typeof TAB_GENERAL
-  | typeof TAB_SETTINGS
  | typeof TAB_VARIABLES;

 export function FolderSettingsDialog({ folderId, tab }: Props) {
@@ -54,7 +51,6 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
    (e) => e.parentModel === "folder" && e.parentId === folderId,
  );
  const numVars = (folderEnvironment?.variables ?? []).filter((v) => v.name).length;
-  const numSettingsOverrides = folder == null ? 0 : countOverriddenSettings(folder);

  const tabs = useMemo<TabItem[]>(() => {
    if (folder == null) return [];
@@ -64,11 +60,6 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
        value: TAB_GENERAL,
        label: "General",
      },
-      {
-        value: TAB_SETTINGS,
-        label: "Settings",
-        rightSlot: <CountBadge count={numSettingsOverrides} />,
-      },
      ...headersTab,
      ...authTab,
      {
@@ -77,19 +68,19 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
        rightSlot: numVars > 0 ? <CountBadge count={numVars} /> : null,
      },
    ];
-  }, [authTab, folder, headersTab, numSettingsOverrides, numVars]);
+  }, [authTab, folder, headersTab, numVars]);

  if (folder == null) return null;

  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}
@@ -97,7 +88,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}
@@ -149,7 +140,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"
@@ -168,9 +159,6 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
            stateKey={`headers.${folder.id}`}
          />
        </TabContent>
-        <TabContent value={TAB_SETTINGS} className="overflow-y-auto h-full px-4">
-          <ModelSettingsEditor model={folder} />
-        </TabContent>
        <TabContent value={TAB_VARIABLES} className="overflow-y-auto h-full px-4">
          {folderEnvironment == null ? (
            <EmptyStateText>
@@ -126,7 +126,7 @@ export function GrpcEditor({

  const actions = useMemo(
    () => [
-      <div key="reflection" className={classNames(services == null && "opacity-100!")}>
+      <div key="reflection" className={classNames(services == null && "!opacity-100")}>
        <Button
          size="xs"
          color={
@@ -1,3 +1,4 @@
+import { open } from "@tauri-apps/plugin-dialog";
 import type { GrpcRequest } from "@yaakapp-internal/models";
 import { Banner, HStack, Icon, InlineCode, VStack } from "@yaakapp-internal/ui";
 import { useActiveRequest } from "../hooks/useActiveRequest";
@@ -7,7 +8,6 @@ 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";

 interface Props {
  onDone: () => void;
@@ -45,7 +45,7 @@ function GrpcProtoSelectionDialogWithRequest({ request }: Props & { request: Grp
          color="primary"
          variant="border"
          onClick={async () => {
-            const selected = await platform.dialog.open({
+            const selected = await open({
              title: "Select Proto Files",
              multiple: true,
              filters: [{ name: "Proto Files", extensions: ["proto"] }],
@@ -63,7 +63,7 @@ function GrpcProtoSelectionDialogWithRequest({ request }: Props & { request: Grp
          variant="border"
          color="primary"
          onClick={async () => {
-            const selected = await platform.dialog.open({
+            const selected = await open({
              title: "Select Proto Directory",
              directory: true,
            });
@@ -1,9 +1,4 @@
-import {
-  type GrpcRequest,
-  type HttpRequestHeader,
-  patchModel,
-  patchModelDebounced,
-} from "@yaakapp-internal/models";
+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";
@@ -25,7 +20,6 @@ import { GrpcEditor } from "./GrpcEditor";
 import { HeadersEditor } from "./HeadersEditor";
 import { HttpAuthenticationEditor } from "./HttpAuthenticationEditor";
 import { MarkdownEditor } from "./MarkdownEditor";
-import { countOverriddenSettings, ModelSettingsEditor } from "./ModelSettingsEditor";
 import { UrlBar } from "./UrlBar";

 interface Props {
@@ -53,7 +47,6 @@ interface Props {
 const TAB_MESSAGE = "message";
 const TAB_METADATA = "metadata";
 const TAB_AUTH = "auth";
-const TAB_SETTINGS = "settings";
 const TAB_DESCRIPTION = "description";

 export function GrpcRequestPane({
@@ -73,20 +66,17 @@ export function GrpcRequestPane({
  const authTab = useAuthTab(TAB_AUTH, activeRequest);
  const metadataTab = useHeadersTab(TAB_METADATA, activeRequest, "Metadata");
  const inheritedHeaders = useInheritedHeaders(activeRequest);
-  const numSettingsOverrides = countOverriddenSettings(activeRequest);
  const forceUpdateKey = useRequestUpdateKey(activeRequest.id ?? null);

  const urlContainerEl = useRef<HTMLDivElement>(null);
  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],
  );
@@ -138,27 +128,22 @@ export function GrpcRequestPane({
      { value: TAB_MESSAGE, label: "Message" },
      ...metadataTab,
      ...authTab,
-      {
-        value: TAB_SETTINGS,
-        label: "Settings",
-        rightSlot: <CountBadge count={numSettingsOverrides} />,
-      },
      {
        value: TAB_DESCRIPTION,
        label: "Info",
        rightSlot: activeRequest.description && <CountBadge count={true} />,
      },
    ],
-    [activeRequest.description, authTab, metadataTab, numSettingsOverrides],
+    [activeRequest.description, authTab, metadataTab],
  );

  const handleMetadataChange = useCallback(
-    (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],
  );

@@ -169,7 +154,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
@@ -208,7 +193,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",
              )}
            >
@@ -266,7 +251,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}
      >
@@ -293,9 +278,6 @@ export function GrpcRequestPane({
            onChange={handleMetadataChange}
          />
        </TabContent>
-        <TabContent value={TAB_SETTINGS}>
-          <ModelSettingsEditor model={activeRequest} />
-        </TabContent>
        <TabContent value={TAB_DESCRIPTION}>
          <div className="grid grid-rows-[auto_minmax(0,1fr)] h-full">
            <PlainInput
@@ -303,10 +285,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,17 +1,14 @@
 import type { HttpRequestHeader } from "@yaakapp-internal/models";
+import type { GenericCompletionOption } from "@yaakapp-internal/plugins";
 import { HStack } from "@yaakapp-internal/ui";
-import { acceptLanguages } from "../lib/data/acceptLanguages";
-import { cacheControlDirectives } from "../lib/data/cacheControl";
 import { charsets } from "../lib/data/charsets";
 import { connections } from "../lib/data/connections";
 import { encodings } from "../lib/data/encodings";
-import type { HeaderValuePreset } from "../lib/data/headerValuePresets";
 import { headerNames } from "../lib/data/headerNames";
 import { mimeTypes } from "../lib/data/mimetypes";
-import { userAgents } from "../lib/data/userAgents";
 import { CountBadge } from "./core/CountBadge";
 import { DetailsBanner } from "./core/DetailsBanner";
-import type { GenericCompletion, GenericCompletionConfig } from "./core/Editor/genericCompletion";
+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";
@@ -108,21 +105,12 @@ export function HeadersEditor({

 const MIN_MATCH = 3;

-const headerOptionsMap: Record<string, HeaderValuePreset[]> = {
+const headerOptionsMap: Record<string, string[]> = {
  "content-type": mimeTypes,
  accept: ["*/*", ...mimeTypes],
  "accept-encoding": encodings,
-  "content-encoding": encodings,
  connection: connections,
  "accept-charset": charsets,
-  "accept-language": acceptLanguages,
-  "cache-control": cacheControlDirectives,
-  "user-agent": userAgents,
-  pragma: ["no-cache"],
-  te: ["trailers", "compress", "deflate", "gzip"],
-  dnt: ["1", "0"],
-  "upgrade-insecure-requests": ["1"],
-  "x-requested-with": ["XMLHttpRequest"],
 };

 const valueType = (pair: Pair): InputProps["type"] => {
@@ -144,22 +132,12 @@ const valueType = (pair: Pair): InputProps["type"] => {

 const valueAutocomplete = (headerName: string): GenericCompletionConfig | undefined => {
  const name = headerName.toLowerCase().trim();
-  const options: GenericCompletion[] =
-    headerOptionsMap[name]?.map((o) =>
-      typeof o === "string"
-        ? {
-            label: o,
-            type: "constant",
-            boost: 1, // Put above other completions
-          }
-        : {
-            // Show the short label but insert the full value (e.g. User-Agent)
-            label: o.label,
-            apply: o.value,
-            type: "constant",
-            boost: 1,
-          },
-    ) ?? [];
+  const options: GenericCompletionOption[] =
+    headerOptionsMap[name]?.map((o) => ({
+      label: o,
+      type: "constant",
+      boost: 1, // Put above other completions
+    })) ?? [];
  return { minMatch: MIN_MATCH, options };
 };

@@ -10,17 +10,14 @@ import { HStack, Icon, InlineCode } from "@yaakapp-internal/ui";
 import { useCallback } from "react";
 import { openFolderSettings } from "../commands/openFolderSettings";
 import { openWorkspaceSettings } from "../commands/openWorkspaceSettings";
-import { useAuthDropdownOptions } from "../hooks/useAuthTab";
 import { useHttpAuthenticationConfig } from "../hooks/useHttpAuthenticationConfig";
 import { useInheritedAuthentication } from "../hooks/useInheritedAuthentication";
 import { useRenderTemplate } from "../hooks/useRenderTemplate";
 import { resolvedModelName } from "../lib/resolvedModelName";
-import { Button } from "./core/Button";
 import { Dropdown, type DropdownItem } from "./core/Dropdown";
 import { IconButton } from "./core/IconButton";
 import { Input, type InputProps } from "./core/Input";
 import { Link } from "./core/Link";
-import { RadioDropdown } from "./core/RadioDropdown";
 import { SegmentedControl } from "./core/SegmentedControl";
 import { DynamicForm } from "./DynamicForm";
 import { EmptyStateText } from "./EmptyStateText";
@@ -38,8 +35,7 @@ export function HttpAuthenticationEditor({ model }: Props) {
  );

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

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

-function AuthenticationTypeDropdown({ model }: Props) {
-  const options = useAuthDropdownOptions(model);
-
-  if (options == null) return null;
-
-  return (
-    <RadioDropdown
-      items={options.items}
-      itemsAfter={options.itemsAfter}
-      itemsBefore={options.itemsBefore}
-      value={options.value}
-      onChange={options.onChange}
-    >
-      <Button
-        color="secondary"
-        variant="border"
-        size="sm"
-        rightSlot={
-          <Icon icon="chevron_down" size="sm" className="text-text-subtle" />
-        }
-      >
-        Select Auth
-      </Button>
-    </RadioDropdown>
-  );
-}
-
 function AuthenticationDisabledInput({
  value,
  onChange,
@@ -243,11 +198,7 @@ function AuthenticationDisabledInput({
      rightSlot={
        <div className="px-1 flex items-center">
          <div className="rounded-full bg-surface-highlight text-xs px-1.5 py-0.5 text-text-subtle whitespace-nowrap">
-            {rendered.isPending
-              ? "loading"
-              : rendered.data
-                ? "enabled"
-                : "disabled"}
+            {rendered.isPending ? "loading" : rendered.data ? "enabled" : "disabled"}
          </div>
        </div>
      }
@@ -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,24 +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 classNames from "classnames";
 import { atom, useAtomValue } from "jotai";
 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 { deepEqualAtom } from "../lib/atoms";
 import { languageFromContentType } from "../lib/contentType";
 import { generateId } from "../lib/generateId";
-import { derivePathPlaceholderPairs, renamePathPlaceholder } from "../lib/pathPlaceholders";
-import { convertRequestBody } from "../lib/requestBodyConversion";
 import {
  BODY_TYPE_BINARY,
  BODY_TYPE_FORM_MULTIPART,
@@ -37,9 +37,9 @@ 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, TabContent, Tabs } from "./core/Tabs/Tabs";
@@ -51,7 +51,6 @@ import { HttpAuthenticationEditor } from "./HttpAuthenticationEditor";
 import { JsonBodyEditor } from "./JsonBodyEditor";
 import { MarkdownEditor } from "./MarkdownEditor";
 import { RequestMethodDropdown } from "./RequestMethodDropdown";
-import { countOverriddenSettings, ModelSettingsEditor } from "./ModelSettingsEditor";
 import { UrlBar } from "./UrlBar";
 import { UrlParametersEditor } from "./UrlParameterEditor";

@@ -70,16 +69,18 @@ const TAB_BODY = "body";
 const TAB_PARAMS = "params";
 const TAB_HEADERS = "headers";
 const TAB_AUTH = "auth";
-const TAB_SETTINGS = "settings";
 const TAB_DESCRIPTION = "description";
 const TABS_STORAGE_KEY = "http_request_tabs";

-// 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;
@@ -91,7 +92,6 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
  const authTab = useAuthTab(TAB_AUTH, activeRequest);
  const headersTab = useHeadersTab(TAB_HEADERS, activeRequest);
  const inheritedHeaders = useInheritedHeaders(activeRequest);
-  const numSettingsOverrides = countOverriddenSettings(activeRequest);

  // Listen for event to focus the params tab (e.g., when clicking a :param in the URL)
  useRequestEditorEvent(
@@ -127,33 +127,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 (
@@ -204,14 +193,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;
@@ -252,11 +234,6 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
      },
      ...headersTab,
      ...authTab,
-      {
-        value: TAB_SETTINGS,
-        label: "Settings",
-        rightSlot: <CountBadge count={numSettingsOverrides} />,
-      },
      {
        value: TAB_DESCRIPTION,
        label: "Info",
@@ -269,7 +246,6 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
      handleContentTypeChange,
      headersTab,
      numParams,
-      numSettingsOverrides,
      urlParameterPairs.length,
    ],
  );
@@ -278,28 +254,38 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
  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) {
@@ -321,7 +307,7 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
        }
      }
    },
-    [activeRequest, activeRequestId, forceParamsRefresh, forceUrlRefresh],
+    [activeRequest, activeRequestId, forceParamsRefresh, forceUrlRefresh, importCurl],
  );
  const handleSend = useCallback(
    () => sendRequest(activeRequest.id ?? null),
@@ -329,7 +315,7 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
  );

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

@@ -352,7 +338,7 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
            onUrlChange={handleUrlChange}
            leftSlot={
              <div className="py-0.5">
-                <RequestMethodDropdown request={activeRequest} className="ml-0.5 h-full!" />
+                <RequestMethodDropdown request={activeRequest} className="ml-0.5 !h-full" />
              </div>
            }
            forceUpdateKey={updateKey}
@@ -375,7 +361,7 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
                forceUpdateKey={`${forceUpdateHeaderEditorKey}::${forceUpdateKey}`}
                headers={activeRequest.headers}
                stateKey={`headers.${activeRequest.id}`}
-                onChange={(headers) => patchModelDebounced(activeRequest, { headers })}
+                onChange={(headers) => patchModel(activeRequest, { headers })}
              />
            </TabContent>
            <TabContent value={TAB_PARAMS}>
@@ -383,12 +369,9 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
                stateKey={`params.${activeRequest.id}`}
                forceUpdateKey={forceUpdateKey + urlParametersKey}
                pairs={urlParameterPairs}
-                onChange={(urlParameters) => patchModelDebounced(activeRequest, { urlParameters })}
+                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 ? (
@@ -435,7 +418,7 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
                    requestId={activeRequest.id}
                    contentType={contentType}
                    body={activeRequest.body}
-                    onChange={(body) => patchModelDebounced(activeRequest, { body })}
+                    onChange={(body) => patchModel(activeRequest, { body })}
                    onChangeContentType={handleContentTypeChange}
                  />
                ) : typeof activeRequest.bodyType === "string" ? (
@@ -462,7 +445,7 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
                  hideLabel
                  forceUpdateKey={updateKey}
                  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) => patchModel(activeRequest, { name })}
@@ -4,13 +4,10 @@ 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 { useHttpResponseEvents } from "../hooks/useHttpResponseEvents";
 import { usePinnedHttpResponse } from "../hooks/usePinnedHttpResponse";
 import { useResponseBodyBytes, useResponseBodyText } from "../hooks/useResponseBodyText";
-import { useResponseBodyUrl } from "../hooks/useResponseBodyUrl";
 import { useResponseViewMode } from "../hooks/useResponseViewMode";
-import { useSaveResponse } from "../hooks/useSaveResponse";
 import { useTimelineViewMode } from "../hooks/useTimelineViewMode";
 import { getMimeTypeFromContentType } from "../lib/contentType";
 import { getContentTypeFromHeaders, getCookieCounts } from "../lib/model_util";
@@ -81,8 +78,6 @@ 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 tabs = useMemo<TabItem[]>(
    () => [
@@ -98,22 +93,6 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
              ? []
              : [{ label: "Response (Raw)", shortLabel: "Raw", value: "raw" }]),
          ],
-          itemsAfter: [
-            {
-              label: "Save to File",
-              onSelect: saveResponse.mutate,
-              leftSlot: <Icon icon="save" />,
-              hidden: activeResponse == null || !!activeResponse.error,
-              disabled: activeResponse?.state !== "closed" && (activeResponse?.status ?? 0) >= 100,
-            },
-            {
-              label: "Copy Body",
-              onSelect: copyResponse.mutate,
-              leftSlot: <Icon icon="copy" />,
-              hidden: activeResponse == null || !!activeResponse.error,
-              disabled: activeResponse?.state !== "closed" && (activeResponse?.status ?? 0) >= 100,
-            },
-          ],
        },
      },
      {
@@ -156,18 +135,12 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
    ],
    [
      activeResponse?.headers,
-      activeResponse,
-      activeResponse?.error,
      activeResponse?.requestContentLength,
      activeResponse?.requestHeaders.length,
-      activeResponse?.state,
-      activeResponse?.status,
      cookieCounts.sent,
      cookieCounts.received,
-      copyResponse.mutate,
      mimeType,
      responseEvents.data?.length,
-      saveResponse.mutate,
      setViewMode,
      viewMode,
      timelineViewMode,
@@ -194,7 +167,7 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
        <div className="h-full w-full grid grid-rows-[auto_minmax(0,1fr)] grid-cols-1">
          <HStack
            className={classNames(
-              "text-text-subtle w-full shrink-0",
+              "text-text-subtle w-full flex-shrink-0",
              // Remove a bit of space because the tabs have lots too
              "-mb-1.5",
            )}
@@ -207,7 +180,7 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
                  "whitespace-nowrap w-full pl-3 overflow-x-auto font-mono text-sm hide-scrollbars",
                )}
              >
-                <HStack space={2} className="w-full shrink-0">
+                <HStack space={2} className="w-full flex-shrink-0">
                  {activeResponse.state !== "closed" && <LoadingIcon size="sm" />}
                  <HttpStatusTag showReason response={activeResponse} />
                  <span>&bull;</span>
@@ -221,7 +194,7 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
                {shouldShowRedirectDropWarning ? (
                  <Tooltip
                    tabIndex={0}
-                    className="my-auto pl-3 shrink-0 max-w-full justify-self-end overflow-hidden"
+                    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">
@@ -250,7 +223,7 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
                    <span className="inline-flex min-w-0">
                      <PillButton
                        color="warning"
-                        className="font-sans text-sm shrink! max-w-full"
+                        className="font-sans text-sm !flex-shrink max-w-full"
                        innerClassName="flex items-center"
                        leftSlot={<Icon icon="alert_triangle" size="xs" color="warning" />}
                      >
@@ -263,7 +236,7 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
                ) : (
                  <span />
                )}
-                <div className="justify-self-end shrink-0">
+                <div className="justify-self-end flex-shrink-0">
                  <RecentHttpResponsesDropdown
                    responses={responses}
                    activeResponse={activeResponse}
@@ -276,7 +249,7 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {

          <div className="overflow-hidden flex flex-col min-h-0">
            {activeResponse?.error && (
-              <Banner color="danger" className="mx-3 mt-1 shrink-0">
+              <Banner color="danger" className="mx-3 mt-1 flex-shrink-0">
                {activeResponse.error}
              </Banner>
            )}
@@ -410,13 +383,14 @@ function EnsureCompleteResponse({
  Component,
 }: {
  response: HttpResponse;
-  Component: ComponentType<{ bodyUrl: string }>;
+  Component: ComponentType<{ bodyPath: string }>;
 }) {
-  // Wait until the response has been fully-downloaded before asking for it
-  const complete = response.state === "closed";
-  const bodyUrl = useResponseBodyUrl(complete ? response : null);
+  if (response.bodyPath === null) {
+    return <div>Empty response body</div>;
+  }

-  if (!complete || bodyUrl.isPending) {
+  // Wait until the response has been fully-downloaded
+  if (response.state !== "closed") {
    return (
      <EmptyStateText>
        <LoadingIcon />
@@ -424,15 +398,7 @@ function EnsureCompleteResponse({
    );
  }

-  if (bodyUrl.error) {
-    return <Banner color="danger">{String(bodyUrl.error)}</Banner>;
-  }
-
-  if (bodyUrl.data == null) {
-    return <div>Empty response body</div>;
-  }
-
-  return <Component bodyUrl={bodyUrl.data} />;
+  return <Component bodyPath={response.bodyPath} />;
 }

 function HttpSvgViewer({ response }: { response: HttpResponse }) {
@@ -1,15 +1,10 @@
 import type {
-  AnyModel,
  HttpResponse,
  HttpResponseEvent,
  HttpResponseEventData,
 } from "@yaakapp-internal/models";
-import { foldersAtom, workspacesAtom } from "@yaakapp-internal/models";
-import { useAtomValue } from "jotai";
 import { type ReactNode, useMemo, useState } from "react";
 import { useHttpResponseEvents } from "../hooks/useHttpResponseEvents";
-import { useAllRequests } from "../hooks/useAllRequests";
-import { resolvedModelName } from "../lib/resolvedModelName";
 import { Editor } from "./core/Editor/LazyEditor";
 import { type EventDetailAction, EventDetailHeader, EventViewer } from "./core/EventViewer";
 import { EventViewerRow } from "./core/EventViewerRow";
@@ -100,7 +95,6 @@ function EventDetails({
 }) {
  const { label } = getEventDisplay(event.event);
  const e = event.event;
-  const settingSourceModels = useSettingSourceModels();

  const actions: EventDetailAction[] = [
    {
@@ -217,9 +211,6 @@ function EventDetails({
        <KeyValueRows>
          <KeyValueRow label="Setting">{e.name}</KeyValueRow>
          <KeyValueRow label="Value">{e.value}</KeyValueRow>
-          {e.source_model != null ? (
-            <KeyValueRow label="Source">{formatSettingSource(e, settingSourceModels)}</KeyValueRow>
-          ) : null}
        </KeyValueRows>
      );
    }
@@ -324,44 +315,6 @@ function formatEventText(event: HttpResponseEventData, includePrefix: boolean):
  return includePrefix ? `${prefix} ${text}` : text;
 }

-function useSettingSourceModels() {
-  const requests = useAllRequests();
-  const folders = useAtomValue(foldersAtom);
-  const workspaces = useAtomValue(workspacesAtom);
-
-  return useMemo<AnyModel[]>(
-    () => [...requests, ...folders, ...workspaces],
-    [requests, folders, workspaces],
-  );
-}
-
-function formatSettingSource(
-  event: Extract<HttpResponseEventData, { type: "setting" }>,
-  models: AnyModel[],
-): string {
-  const sourceModel = event.source_model;
-  if (sourceModel == null || sourceModel === "default") {
-    return "Default";
-  }
-
-  const model =
-    event.source_id == null
-      ? null
-      : (models.find((m) => m.model === sourceModel && m.id === event.source_id) ?? null);
-  const name = model == null ? event.source_name : resolvedModelName(model);
-  const label = sourceModel.replaceAll("_", " ");
-  return name == null || name.length === 0 ? label : `${name} (${label})`;
-}
-
-function formatSettingSourceModel(event: Extract<HttpResponseEventData, { type: "setting" }>) {
-  const sourceModel = event.source_model;
-  if (sourceModel == null || sourceModel === "default" || sourceModel === "workspace") {
-    return null;
-  }
-
-  return sourceModel;
-}
-
 type EventDisplay = {
  icon: IconProps["icon"];
  color: IconProps["color"];
@@ -372,12 +325,11 @@ type EventDisplay = {
 function getEventDisplay(event: HttpResponseEventData): EventDisplay {
  switch (event.type) {
    case "setting":
-      const sourceModel = formatSettingSourceModel(event);
      return {
        icon: "settings",
        color: "secondary",
        label: "Setting",
-        summary: `${event.name} = ${event.value}${sourceModel == null ? "" : ` (${sourceModel})`}`,
+        summary: `${event.name} = ${event.value}`,
      };
    case "info":
      return {
@@ -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,138 +1,53 @@
-import { platform } from "@yaakapp-internal/platform";
-import { Icon, VStack } from "@yaakapp-internal/ui";
-import classNames from "classnames";
-import { useEffect, useRef, useState } from "react";
+import { VStack } from "@yaakapp-internal/ui";
+import { useState } from "react";
 import { useLocalStorage } from "react-use";
-import { CommercialUseBanner } from "./CommercialUseBanner";
 import { Button } from "./core/Button";
-import { PlainInput } from "./core/PlainInput";
+import { SelectFile } from "./SelectFile";

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

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

  return (
-    <VStack ref={ref} space={4} className="pb-4">
-      <CommercialUseBanner source="data-import" title="Importing work data?" />
-
-      <button
-        type="button"
-        onClick={handleSelectFile}
-        className={classNames(
-          "w-full rounded-lg border border-dashed px-4 py-6",
-          "flex flex-col items-center gap-1 text-center",
-          isHovering ? "border-notice bg-surface-highlight" : "border-border hover:border-text",
-        )}
-      >
-        <Icon icon="folder_input" className="text-text-subtlest w-8! h-8! mb-2" />
-        {/* Fixed height so the region doesn't resize between the empty and selected states */}
-        <div className="h-6 w-full flex items-center justify-center">
-          {filePath == null ? (
-            <div className="text-text">
-              <strong className="font-semibold">Choose a file</strong> or drag it here
-            </div>
-          ) : (
-            <div className="text-text font-mono text-xs max-w-full truncate" title={filePath}>
-              {fileName(filePath)}
-            </div>
-          )}
-        </div>
-        <div className="text-xs text-text-subtlest">
-          Supports OpenAPI, Swagger, Postman, Insomnia, and curl
-        </div>
-      </button>
-
+    <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}>
-        <PlainInput
-          label="Or enter a file path or URL"
-          size="sm"
-          placeholder="https://example.com/openapi.json"
-          defaultValue={source ?? ""}
-          forceUpdateKey={String(forceUpdateKey)}
-          onChange={setSource}
+        <SelectFile
+          filePath={filePath ?? null}
+          onChange={({ filePath }) => setFilePath(filePath)}
        />
-        <Button
-          color="primary"
-          disabled={trimmedSource === "" || isLoading}
-          isLoading={isLoading}
-          size="sm"
-          onClick={handleImport}
-        >
-          {isLoading ? "Importing" : "Import"}
-        </Button>
+        {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>
    </VStack>
  );
@@ -73,14 +73,14 @@ export function JsonBodyEditor({ forceUpdateKey, heightMode, request }: Props) {
  const actions = useMemo<EditorProps["actions"]>(
    () => [
      showBanner && (
-        <Banner color="notice" className="opacity-100! h-sm py-0! px-2! flex items-center text-xs">
+        <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!">
+      <div key="settings" className="!opacity-100 !shadow">
        <Dropdown
          onOpen={handleDropdownOpen}
          items={
@@ -1,274 +0,0 @@
-import { formatSize } from "@yaakapp-internal/lib/formatSize";
-import { Banner, Button, HStack, LoadingIcon } 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";
-import { AudioViewer } from "./responseViewers/AudioViewer";
-import { ImageViewer } from "./responseViewers/ImageViewer";
-import { SvgViewer } from "./responseViewers/SvgViewer";
-import { VideoViewer } from "./responseViewers/VideoViewer";
-
-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);
    },
  });

@@ -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>
    );
@@ -1,634 +0,0 @@
-import type {
-  Folder,
-  GrpcRequest,
-  HttpRequest,
-  InheritedBoolSetting,
-  InheritedIntSetting,
-  WebsocketRequest,
-  Workspace,
-} from "@yaakapp-internal/models";
-import { patchModel } from "@yaakapp-internal/models";
-import { useModelAncestors } from "../hooks/useModelAncestors";
-import {
-  modelSupportsSetting,
-  type RequestSettingDefinition,
-  SETTING_FOLLOW_REDIRECTS,
-  SETTING_REQUEST_MESSAGE_SIZE,
-  SETTING_REQUEST_TIMEOUT,
-  SETTING_SEND_COOKIES,
-  SETTING_STORE_COOKIES,
-  SETTING_VALIDATE_CERTIFICATES,
-} from "../lib/requestSettings";
-import { Checkbox } from "./core/Checkbox";
-import { PlainInput } from "./core/PlainInput";
-import {
-  SettingOverrideRow,
-  SettingRow,
-  SettingRowBoolean,
-  SettingsList,
-  SettingsSection,
-} from "./core/SettingRow";
-
-const BYTES_PER_MB = 1024 * 1024;
-const MAX_REQUEST_MESSAGE_SIZE_BYTES = 2_147_483_647;
-const MAX_MESSAGE_SIZE_MB = MAX_REQUEST_MESSAGE_SIZE_BYTES / BYTES_PER_MB;
-
-interface Props {
-  showSectionTitles?: boolean;
-  model: ModelWithSettings;
-}
-
-type ModelWithSettings =
-  | Workspace
-  | Folder
-  | HttpRequest
-  | WebsocketRequest
-  | GrpcRequest;
-type 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 CookieSettingsPatch = {
-  settingSendCookies?: ModelWithCookieSettings["settingSendCookies"];
-  settingStoreCookies?: ModelWithCookieSettings["settingStoreCookies"];
-};
-type HttpSettingsPatch = {
-  settingFollowRedirects?: ModelWithHttpSettings["settingFollowRedirects"];
-  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">
-      {supportsTlsSettings && (
-        <SettingsSection title={showSectionTitles ? "Requests" : null}>
-          {supportsHttpSettings && (
-            <IntegerSettingRow
-              settingDefinition={SETTING_REQUEST_TIMEOUT}
-              setting={model.settingRequestTimeout}
-              inheritedValue={resolveInheritedValue(
-                ancestors,
-                SETTING_REQUEST_TIMEOUT.modelKey,
-                model.settingRequestTimeout,
-              )}
-              onChange={(settingRequestTimeout) =>
-                patchHttpSettings(model, {
-                  settingRequestTimeout,
-                })
-              }
-            />
-          )}
-          {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}
-            inheritedValue={resolveInheritedValue(
-              ancestors,
-              SETTING_VALIDATE_CERTIFICATES.modelKey,
-              model.settingValidateCertificates,
-            )}
-            onChange={(settingValidateCertificates) =>
-              patchTlsSettings(model, {
-                settingValidateCertificates,
-              })
-            }
-          />
-          {supportsHttpSettings && (
-            <BooleanSettingRow
-              settingDefinition={SETTING_FOLLOW_REDIRECTS}
-              setting={model.settingFollowRedirects}
-              inheritedValue={resolveInheritedValue(
-                ancestors,
-                SETTING_FOLLOW_REDIRECTS.modelKey,
-                model.settingFollowRedirects,
-              )}
-              onChange={(settingFollowRedirects) =>
-                patchHttpSettings(model, {
-                  settingFollowRedirects,
-                })
-              }
-            />
-          )}
-        </SettingsSection>
-      )}
-      {supportsCookieSettings && (
-        <SettingsSection
-          title={supportsTlsSettings || showSectionTitles ? "Cookies" : null}
-        >
-          <BooleanSettingRow
-            settingDefinition={SETTING_SEND_COOKIES}
-            setting={model.settingSendCookies}
-            inheritedValue={resolveInheritedValue(
-              ancestors,
-              SETTING_SEND_COOKIES.modelKey,
-              model.settingSendCookies,
-            )}
-            onChange={(settingSendCookies) =>
-              patchCookieSettings(model, {
-                settingSendCookies,
-              })
-            }
-          />
-          <BooleanSettingRow
-            settingDefinition={SETTING_STORE_COOKIES}
-            setting={model.settingStoreCookies}
-            inheritedValue={resolveInheritedValue(
-              ancestors,
-              SETTING_STORE_COOKIES.modelKey,
-              model.settingStoreCookies,
-            )}
-            onChange={(settingStoreCookies) =>
-              patchCookieSettings(model, {
-                settingStoreCookies,
-              })
-            }
-          />
-        </SettingsSection>
-      )}
-    </SettingsList>
-  );
-}
-
-export function countOverriddenSettings(model: ModelWithSettings) {
-  const settings: (BooleanSetting | IntegerSetting)[] = [];
-
-  if (modelSupportsCookieSettings(model)) {
-    settings.push(model.settingSendCookies, model.settingStoreCookies);
-  }
-
-  settings.push(model.settingValidateCertificates);
-
-  if (modelSupportsHttpSettings(model)) {
-    settings.push(model.settingFollowRedirects, model.settingRequestTimeout);
-  }
-
-  if (modelSupportsMessageSizeSettings(model)) {
-    settings.push(model.settingRequestMessageSize);
-  }
-
-  return settings.filter(
-    (setting) => isInheritedSetting(setting) && setting.enabled === true,
-  ).length;
-}
-
-function patchCookieSettings(
-  model: ModelWithCookieSettings,
-  patch: Partial<CookieSettingsPatch>,
-) {
-  switch (model.model) {
-    case "workspace":
-      return patchModel(model, patch as Partial<Workspace>);
-    case "folder":
-      return patchModel(model, patch as Partial<Folder>);
-    case "http_request":
-      return patchModel(model, patch as Partial<HttpRequest>);
-    case "websocket_request":
-      return patchModel(model, patch as Partial<WebsocketRequest>);
-  }
-}
-
-function patchHttpSettings(
-  model: ModelWithHttpSettings,
-  patch: Partial<HttpSettingsPatch>,
-) {
-  switch (model.model) {
-    case "workspace":
-      return patchModel(model, patch as Partial<Workspace>);
-    case "folder":
-      return patchModel(model, patch as Partial<Folder>);
-    case "http_request":
-      return patchModel(model, patch as Partial<HttpRequest>);
-  }
-}
-
-function 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>);
-  }
-}
-
-function modelSupportsHttpSettings(
-  model: ModelWithSettings,
-): model is ModelWithHttpSettings {
-  return modelSupportsSetting(model, SETTING_REQUEST_TIMEOUT);
-}
-
-function modelSupportsCookieSettings(
-  model: ModelWithSettings,
-): model is ModelWithCookieSettings {
-  return modelSupportsSetting(model, SETTING_SEND_COOKIES);
-}
-
-function modelSupportsTlsSettings(
-  model: ModelWithSettings,
-): model is ModelWithTlsSettings {
-  return modelSupportsSetting(model, SETTING_VALIDATE_CERTIFICATES);
-}
-
-function modelSupportsMessageSizeSettings(
-  model: ModelWithSettings,
-): model is ModelWithMessageSizeSettings {
-  return modelSupportsSetting(model, SETTING_REQUEST_MESSAGE_SIZE);
-}
-
-function BooleanSettingRow({
-  inheritedValue,
-  setting,
-  settingDefinition,
-  onChange,
-}: {
-  inheritedValue: boolean;
-  setting: BooleanSetting;
-  settingDefinition: RequestSettingDefinition;
-  onChange: (setting: BooleanSetting) => void;
-}) {
-  const inherited = isInheritedSetting(setting);
-  const overridden = inherited ? setting.enabled === true : false;
-  const value = inherited
-    ? overridden
-      ? setting.value
-      : inheritedValue
-    : setting;
-
-  if (!inherited) {
-    return (
-      <SettingRowBoolean
-        checked={value}
-        title={settingDefinition.title}
-        description={settingDefinition.description}
-        onChange={(value) => onChange(value)}
-      />
-    );
-  }
-
-  return (
-    <SettingOverrideRow
-      title={settingDefinition.title}
-      description={settingDefinition.description}
-      overridden={overridden}
-      onResetOverride={() => onChange({ ...setting, enabled: false })}
-    >
-      <Checkbox
-        hideLabel
-        size="md"
-        title={settingDefinition.title}
-        checked={value}
-        onChange={(value) => onChange({ ...setting, enabled: true, value })}
-      />
-    </SettingOverrideRow>
-  );
-}
-
-function IntegerSettingRow({
-  inheritedValue,
-  setting,
-  settingDefinition,
-  onChange,
-}: {
-  inheritedValue: number;
-  setting: IntegerSetting;
-  settingDefinition: RequestSettingDefinition<"settingRequestTimeout">;
-  onChange: (setting: IntegerSetting) => void;
-}) {
-  const inherited = isInheritedSetting(setting);
-  const overridden = inherited ? setting.enabled === true : false;
-  const value = inherited
-    ? overridden
-      ? setting.value
-      : inheritedValue
-    : setting;
-
-  if (!inherited) {
-    return (
-      <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
-        name={settingDefinition.modelKey}
-        label={settingDefinition.title}
-        unit="ms"
-        value={`${value}`}
-        placeholder={`${settingDefinition.defaultValue}`}
-        validate={isValidInteger}
-        onChange={(value) =>
-          onChange({
-            ...setting,
-            enabled: true,
-            value: parseInteger(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>
-    );
-  }
-
-  return (
-    <SettingOverrideRow
-      title={settingDefinition.title}
-      description={settingDefinition.description}
-      overridden={overridden}
-      onResetOverride={() => onChange({ ...setting, enabled: false })}
-    >
-      <MessageSizeInput
-        name={settingDefinition.modelKey}
-        label={settingDefinition.title}
-        value={displayValue}
-        placeholder={placeholder}
-        onChange={(value) =>
-          onChange({
-            ...setting,
-            enabled: true,
-            value: parseMegabytes(value),
-          })
-        }
-      />
-    </SettingOverrideRow>
-  );
-}
-
-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 } {
-  return typeof setting === "object" && setting != null && "value" in setting;
-}
-
-function resolveInheritedValue(
-  ancestors: (Folder | Workspace)[],
-  key: "settingRequestTimeout" | "settingRequestMessageSize",
-  fallback: IntegerSetting,
-): number;
-function resolveInheritedValue(
-  ancestors: (Folder | Workspace)[],
-  key: BooleanWorkspaceSettingKey,
-  fallback: BooleanSetting,
-): boolean;
-function resolveInheritedValue(
-  ancestors: (Folder | Workspace)[],
-  key: keyof WorkspaceSettings,
-  fallback: BooleanSetting | IntegerSetting,
-) {
-  for (const ancestor of ancestors) {
-    const setting = ancestor[key] as BooleanSetting | IntegerSetting;
-    if (isInheritedSetting(setting)) {
-      if (setting.enabled === true) {
-        return setting.value;
-      }
-      continue;
-    }
-    return setting;
-  }
-
-  return isInheritedSetting(fallback) ? fallback.value : fallback;
-}
-
-type WorkspaceSettings = Pick<
-  Workspace,
-  | "settingFollowRedirects"
-  | "settingRequestMessageSize"
-  | "settingRequestTimeout"
-  | "settingSendCookies"
-  | "settingStoreCookies"
-  | "settingValidateCertificates"
->;
-
-type BooleanWorkspaceSettingKey = Exclude<
-  keyof WorkspaceSettings,
-  "settingRequestTimeout" | "settingRequestMessageSize"
->;
-
-function formatMegabytes(bytes: number) {
-  const megabytes = bytes / BYTES_PER_MB;
-  return Number.isInteger(megabytes)
-    ? `${megabytes}`
-    : megabytes.toFixed(3).replace(/\.?0+$/, "");
-}
-
-function parseMegabytes(value: string) {
-  const megabytes = Number(value);
-  return Number.isFinite(megabytes) ? Math.round(megabytes * BYTES_PER_MB) : 0;
-}
-
-function parseInteger(value: string) {
-  const parsed = Number(value);
-  return Number.isFinite(parsed) ? Math.trunc(parsed) : 0;
-}
-
-function isValidInteger(value: string) {
-  const parsed = Number(value);
-  return value === "" || (Number.isInteger(parsed) && parsed >= 0);
-}
-
-function isValidMegabytes(value: string) {
-  if (value === "") return true;
-  const megabytes = Number(value);
-  return (
-    Number.isFinite(megabytes) &&
-    megabytes >= 0 &&
-    megabytes <= MAX_MESSAGE_SIZE_MB
-  );
-}
@@ -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,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,10 @@
 import type { GrpcConnection } from "@yaakapp-internal/models";
 import { deleteModel } from "@yaakapp-internal/models";
 import { HStack, Icon } from "@yaakapp-internal/ui";
-import {
-  differenceInHours,
-  differenceInMinutes,
-  format,
-  isToday,
-  isYesterday,
-} from "date-fns";
+import { formatDistanceToNowStrict } from "date-fns";
 import { useDeleteGrpcConnections } from "../hooks/useDeleteGrpcConnections";
 import { pluralizeCount } from "../lib/pluralize";
-import { Dropdown, type DropdownItem } from "./core/Dropdown";
-import { formatMillis } from "./core/HttpResponseDurationTag";
+import { Dropdown } from "./core/Dropdown";
 import { IconButton } from "./core/IconButton";

 interface Props {
@@ -27,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
@@ -100,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,21 +1,13 @@
 import type { HttpResponse } from "@yaakapp-internal/models";
 import { deleteModel } from "@yaakapp-internal/models";
 import { HStack, Icon } from "@yaakapp-internal/ui";
-import {
-  differenceInHours,
-  differenceInMinutes,
-  format,
-  isToday,
-  isYesterday,
-} from "date-fns";
+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 { formatMillis } from "./core/HttpResponseDurationTag";
+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";
-import { SizeTag } from "./core/SizeTag";

 interface Props {
  responses: HttpResponse[];
@@ -30,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),
@@ -126,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,10 @@
 import type { WebsocketConnection } from "@yaakapp-internal/models";
 import { deleteModel, getModel } from "@yaakapp-internal/models";
 import { HStack, Icon } from "@yaakapp-internal/ui";
-import {
-  differenceInHours,
-  differenceInMinutes,
-  format,
-  isToday,
-  isYesterday,
-} from "date-fns";
+import { formatDistanceToNowStrict } from "date-fns";
 import { deleteWebsocketConnections } from "../commands/deleteWebsocketConnections";
 import { pluralizeCount } from "../lib/pluralize";
-import { Dropdown, type DropdownItem } from "./core/Dropdown";
-import { formatMillis } from "./core/HttpResponseDurationTag";
+import { Dropdown } from "./core/Dropdown";
 import { IconButton } from "./core/IconButton";

 interface Props {
@@ -26,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
@@ -104,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
@@ -167,7 +167,7 @@ export function ResponseCookies({ response }: 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>
                  )}
@@ -1,11 +1,10 @@
+import { openUrl } from "@tauri-apps/plugin-opener";
 import type { HttpResponse } from "@yaakapp-internal/models";
-import { format, formatDistanceToNowStrict } from "date-fns";
 import { useMemo } from "react";
 import { CountBadge } from "./core/CountBadge";
 import { DetailsBanner } from "./core/DetailsBanner";
 import { IconButton } from "./core/IconButton";
 import { KeyValueRow, KeyValueRows } from "./core/KeyValueRow";
-import { platform } from "@yaakapp-internal/platform";

 interface Props {
  response: HttpResponse;
@@ -30,22 +29,14 @@ export function ResponseHeaders({ response }: Props) {
    <div className="overflow-auto h-full pb-4 gap-y-3 flex flex-col pr-0.5">
      <DetailsBanner storageKey={`${response.requestId}.general`} summary={<h2>Info</h2>}>
        <KeyValueRows>
-          <KeyValueRow labelColor="secondary" label="Sent">
-            <time
-              dateTime={new Date(`${response.createdAt}Z`).toISOString()}
-              title={formatDistanceToNowStrict(`${response.createdAt}Z`, { addSuffix: true })}
-            >
-              {format(`${response.createdAt}Z`, "MMM d, yyyy, h:mm:ss a O")}
-            </time>
-          </KeyValueRow>
          <KeyValueRow labelColor="secondary" label="Request URL">
            <div className="flex items-center gap-1">
              <span className="select-text cursor-text">{response.url}</span>
              <IconButton
                iconSize="sm"
-                className="inline-block w-auto h-auto! opacity-50 hover:opacity-100"
+                className="inline-block w-auto !h-auto opacity-50 hover:opacity-100"
                icon="external_link"
-                onClick={() => platform.openUrl(response.url)}
+                onClick={() => openUrl(response.url)}
                title="Open in browser"
              />
            </div>
@@ -1,7 +1,7 @@
+import { openUrl } from "@tauri-apps/plugin-opener";
 import type { HttpResponse } from "@yaakapp-internal/models";
 import { IconButton } from "./core/IconButton";
 import { KeyValueRow, KeyValueRows } from "./core/KeyValueRow";
-import { platform } from "@yaakapp-internal/platform";

 interface Props {
  response: HttpResponse;
@@ -24,9 +24,9 @@ export function ResponseInfo({ response }: Props) {
              URL
              <IconButton
                iconSize="sm"
-                className="inline-block w-auto ml-1 h-auto! opacity-50 hover:opacity-100"
+                className="inline-block w-auto ml-1 !h-auto opacity-50 hover:opacity-100"
                icon="external_link"
-                onClick={() => platform.openUrl(response.url)}
+                onClick={() => openUrl(response.url)}
                title="Open in browser"
              />
            </div>
@@ -10,7 +10,7 @@ export default function RouteError({ error }: { error: unknown }) {
    typeof error === "object" && error != null && "stack" in error ? String(error.stack) : null;
  return (
    <div className="flex items-center justify-center h-full">
-      <VStack space={5} className="w-200 h-auto!">
+      <VStack space={5} className="w-[50rem] !h-auto">
        <Heading>Route Error 🔥</Heading>
        <FormattedError>
          {message}
@@ -1,4 +1,5 @@
-import { platform } from "@yaakapp-internal/platform";
+import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import { open } from "@tauri-apps/plugin-dialog";
 import { HStack } from "@yaakapp-internal/ui";
 import classNames from "classnames";
 import mime from "mime";
@@ -18,7 +19,6 @@ type Props = Omit<ButtonProps, "type"> & {
  inline?: boolean;
  noun?: string;
  help?: ReactNode;
-  hideLabel?: boolean;
  label?: ReactNode;
 };

@@ -36,11 +36,10 @@ export function SelectFile({
  size = "sm",
  label,
  help,
-  hideLabel,
  ...props
 }: Props) {
  const handleClick = async () => {
-    const filePath = await platform.dialog.open({
+    const filePath = await open({
      title: directory ? "Select Folder" : "Select File",
      multiple: false,
      directory,
@@ -63,21 +62,32 @@ export function SelectFile({
  // NOTE: This doesn't work for Windows since native drag-n-drop can't work at the same tmie
  //  as browser drag-n-drop.
  useEffect(() => {
-    return platform.window.onDragDrop((event) => {
-      if (event.type === "over") {
-        const p = event.position;
-        const r = ref.current?.getBoundingClientRect();
-        if (r == null) return;
-        const isOver = p.x >= r.left && p.x <= r.right && p.y >= r.top && p.y <= r.bottom;
-        setIsHovering(isOver);
-      } else if (event.type === "drop" && isHovering) {
-        const p = event.paths[0];
-        if (p) onChange({ filePath: p, contentType: null });
-        setIsHovering(false);
-      } else {
-        setIsHovering(false);
-      }
-    });
+    let unlisten: (() => void) | undefined;
+    const setup = async () => {
+      const webview = getCurrentWebviewWindow();
+      unlisten = await webview.onDragDropEvent((event) => {
+        if (event.payload.type === "over") {
+          const p = event.payload.position;
+          const r = ref.current?.getBoundingClientRect();
+          if (r == null) return;
+          const isOver = p.x >= r.left && p.x <= r.right && p.y >= r.top && p.y <= r.bottom;
+          console.log("IS OVER", isOver);
+          setIsHovering(isOver);
+        } else if (event.payload.type === "drop" && isHovering) {
+          console.log("User dropped", event.payload.paths);
+          const p = event.payload.paths[0];
+          if (p) onChange({ filePath: p, contentType: null });
+          setIsHovering(false);
+        } else {
+          console.log("File drop cancelled");
+          setIsHovering(false);
+        }
+      });
+    };
+    setup().catch(console.error);
+    return () => {
+      if (unlisten) unlisten();
+    };
  }, [isHovering, onChange]);

  const filePathWithNameOverride = nameOverride ? `${filePath} (${nameOverride})` : filePath;
@@ -85,7 +95,7 @@ export function SelectFile({
  return (
    <div ref={ref} className="w-full">
      {label && (
-        <Label htmlFor={null} help={help} visuallyHidden={hideLabel}>
+        <Label htmlFor={null} help={help}>
          {label}
        </Label>
      )}
@@ -96,7 +106,7 @@ export function SelectFile({
            "rtl mr-1.5",
            inline && "w-full",
            filePath && inline && "font-mono text-xs",
-            isHovering && "border-notice!",
+            isHovering && "!border-notice",
          )}
          color={isHovering ? "primary" : "secondary"}
          onClick={handleClick}
@@ -1,5 +1,6 @@
 import { useSearch } from "@tanstack/react-router";
-import { platform } from "@yaakapp-internal/platform";
+import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import { type } from "@tauri-apps/plugin-os";
 import { useLicense } from "@yaakapp-internal/license";
 import { pluginsAtom, settingsAtom } from "@yaakapp-internal/models";
 import { HeaderSize, HStack, Icon } from "@yaakapp-internal/ui";
@@ -59,7 +60,7 @@ export default function Settings({ hide }: Props) {
      hide();
    } else {
      // It's being shown in a window, so close the window
-      await platform.window.close();
+      await getCurrentWebviewWindow().close();
    }
  });

@@ -74,7 +75,7 @@ export default function Settings({ hide }: Props) {
          onlyXWindowControl
          size="md"
          className="x-theme-appHeader bg-surface text-text-subtle flex items-center justify-center border-b border-border-subtle text-sm font-semibold"
-          osType={platform.osType()}
+          osType={type()}
          hideWindowControls={settings.hideWindowControls}
          useNativeTitlebar={settings.useNativeTitlebar}
          interfaceScale={settings.interfaceScale}
@@ -84,7 +85,7 @@ export default function Settings({ hide }: Props) {
            justifyContent="center"
            className="w-full h-full grid grid-cols-[1fr_auto] pointer-events-none"
          >
-            <div className={classNames(platform.osType() === "macos" ? "text-center" : "pl-2")}>Settings</div>
+            <div className={classNames(type() === "macos" ? "text-center" : "pl-2")}>Settings</div>
          </HStack>
        </HeaderSize>
      )}
@@ -92,7 +93,7 @@ export default function Settings({ hide }: Props) {
        layout="horizontal"
        defaultValue={mainTab || tabFromQuery}
        addBorders
-        tabListClassName="min-w-40 bg-surface x-theme-sidebar border-r border-border pl-3"
+        tabListClassName="min-w-[10rem] bg-surface x-theme-sidebar border-r border-border pl-3"
        label="Settings"
        tabs={tabs.map(
          (value): TabItem => ({
@@ -130,28 +131,28 @@ export default function Settings({ hide }: Props) {
          }),
        )}
      >
-        <TabContent value={TAB_GENERAL} className="overflow-y-auto h-full px-6 py-4!">
+        <TabContent value={TAB_GENERAL} className="overflow-y-auto h-full px-6 !py-4">
          <SettingsGeneral />
        </TabContent>
-        <TabContent value={TAB_INTERFACE} className="overflow-y-auto h-full px-6 py-4!">
+        <TabContent value={TAB_INTERFACE} className="overflow-y-auto h-full px-6 !py-4">
          <SettingsInterface />
        </TabContent>
-        <TabContent value={TAB_THEME} className="overflow-y-auto h-full px-6 py-4!">
+        <TabContent value={TAB_THEME} className="overflow-y-auto h-full px-6 !py-4">
          <SettingsTheme />
        </TabContent>
-        <TabContent value={TAB_SHORTCUTS} className="overflow-y-auto h-full px-6 py-4!">
+        <TabContent value={TAB_SHORTCUTS} className="overflow-y-auto h-full px-6 !py-4">
          <SettingsHotkeys />
        </TabContent>
        <TabContent value={TAB_PLUGINS} className="h-full grid grid-rows-1">
          <SettingsPlugins defaultSubtab={mainTab === TAB_PLUGINS ? subtab : undefined} />
        </TabContent>
-        <TabContent value={TAB_PROXY} className="overflow-y-auto h-full px-6 py-4!">
+        <TabContent value={TAB_PROXY} className="overflow-y-auto h-full px-6 !py-4">
          <SettingsProxy />
        </TabContent>
-        <TabContent value={TAB_CERTIFICATES} className="overflow-y-auto h-full px-6 py-4!">
+        <TabContent value={TAB_CERTIFICATES} className="overflow-y-auto h-full px-6 !py-4">
          <SettingsCertificates />
        </TabContent>
-        <TabContent value={TAB_LICENSE} className="overflow-y-auto h-full px-6 py-4!">
+        <TabContent value={TAB_LICENSE} className="overflow-y-auto h-full px-6 !py-4">
          <SettingsLicense />
        </TabContent>
      </Tabs>
@@ -4,7 +4,6 @@ import { Heading, HStack, InlineCode, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
 import { useRef } from "react";
 import { showConfirmDelete } from "../../lib/confirm";
-import { CommercialUseBanner } from "../CommercialUseBanner";
 import { Button } from "../core/Button";
 import { Checkbox } from "../core/Checkbox";
 import { DetailsBanner } from "../core/DetailsBanner";
@@ -233,8 +232,6 @@ export function SettingsCertificates() {
        </HStack>
      </div>

-      <CommercialUseBanner source="client-certificates" title="Using certificates for work?" />
-
      {certificates.length > 0 && (
        <VStack space={3}>
          {certificates.map((cert, index) => (
@@ -1,180 +1,175 @@
+import { revealItemInDir } from "@tauri-apps/plugin-opener";
 import { patchModel, settingsAtom } from "@yaakapp-internal/models";
 import { Heading, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
+import { activeWorkspaceAtom } from "../../hooks/useActiveWorkspace";
 import { useCheckForUpdates } from "../../hooks/useCheckForUpdates";
 import { appInfo } from "../../lib/appInfo";
 import { revealInFinderText } from "../../lib/reveal";
 import { CargoFeature } from "../CargoFeature";
-import { CommercialUseBanner } from "../CommercialUseBanner";
-import { DismissibleBanner } from "../core/DismissibleBanner";
+import { Checkbox } from "../core/Checkbox";
 import { IconButton } from "../core/IconButton";
-import { platform } from "@yaakapp-internal/platform";
-import {
-  ModelSettingRowBoolean,
-  ModelSettingSelectControl,
-  SettingValue,
-  SettingRow,
-  SettingRowBoolean,
-  SettingRowSelect,
-  SettingsList,
-  SettingsSection,
-} from "../core/SettingRow";
-
-const WORKSPACE_SETTINGS_MOVED_AT = "2026-06-30";
+import { KeyValueRow, KeyValueRows } from "../core/KeyValueRow";
+import { PlainInput } from "../core/PlainInput";
+import { Select } from "../core/Select";
+import { Separator } from "../core/Separator";

 export function SettingsGeneral() {
+  const workspace = useAtomValue(activeWorkspaceAtom);
  const settings = useAtomValue(settingsAtom);
  const checkForUpdates = useCheckForUpdates();

-  if (settings == null) {
+  if (settings == null || workspace == null) {
    return null;
  }

-  const showWorkspaceSettingsMovedBanner =
-    settings.createdAt.slice(0, 10) < WORKSPACE_SETTINGS_MOVED_AT;
-
  return (
    <VStack space={1.5} className="mb-4">
-      <div>
+      <div className="mb-4">
        <Heading>General</Heading>
-        <p className="text-text-subtle">
-          Configure general settings for update behavior and more.
-        </p>
+        <p className="text-text-subtle">Configure general settings for update behavior and more.</p>
      </div>
-      <div className="mt-3 mb-5">
-        <CommercialUseBanner source="settings-general" title="Using Yaak for work?" />
-      </div>
-      <SettingsList className="space-y-8">
-        <CargoFeature feature="updater">
-          <SettingsSection title="Updates">
-            <SettingRow
-              title="Update Channel"
-              description="Choose whether Yaak should use stable releases or beta releases."
-            >
-              <div className="grid grid-cols-[12rem_auto] gap-1">
-                <ModelSettingSelectControl
-                  model={settings}
-                  modelKey="updateChannel"
-                  label="Update Channel"
-                  selectClassName="w-full!"
-                  options={[
-                    { label: "Stable", value: "stable" },
-                    { label: "Beta", value: "beta" },
-                  ]}
-                />
-                <IconButton
-                  variant="border"
-                  size="sm"
-                  title="Check for updates"
-                  icon="refresh"
-                  spin={checkForUpdates.isPending}
-                  onClick={() => checkForUpdates.mutateAsync()}
-                />
-              </div>
-            </SettingRow>
+      <CargoFeature feature="updater">
+        <div className="grid grid-cols-[minmax(0,1fr)_auto] gap-1">
+          <Select
+            name="updateChannel"
+            label="Update Channel"
+            labelPosition="left"
+            labelClassName="w-[14rem]"
+            size="sm"
+            value={settings.updateChannel}
+            onChange={(updateChannel) => patchModel(settings, { updateChannel })}
+            options={[
+              { label: "Stable", value: "stable" },
+              { label: "Beta (more frequent)", value: "beta" },
+            ]}
+          />
+          <IconButton
+            variant="border"
+            size="sm"
+            title="Check for updates"
+            icon="refresh"
+            spin={checkForUpdates.isPending}
+            onClick={() => checkForUpdates.mutateAsync()}
+          />
+        </div>

-            <SettingRowSelect
-              title="Update Behavior"
-              description="Choose whether updates are installed automatically or manually."
-              name="autoupdate"
-              value={settings.autoupdate ? "auto" : "manual"}
-              onChange={(v) =>
-                patchModel(settings, { autoupdate: v === "auto" })
-              }
-              options={[
-                { label: "Automatic", value: "auto" },
-                { label: "Manual", value: "manual" },
-              ]}
-            />
+        <Select
+          name="autoupdate"
+          value={settings.autoupdate ? "auto" : "manual"}
+          label="Update Behavior"
+          labelPosition="left"
+          size="sm"
+          labelClassName="w-[14rem]"
+          onChange={(v) => patchModel(settings, { autoupdate: v === "auto" })}
+          options={[
+            { label: "Automatic", value: "auto" },
+            { label: "Manual", value: "manual" },
+          ]}
+        />
+        <Checkbox
+          className="pl-2 mt-1 ml-[14rem]"
+          checked={settings.autoDownloadUpdates}
+          disabled={!settings.autoupdate}
+          help="Automatically download Yaak updates (!50MB) in the background, so they will be immediately ready to install."
+          title="Automatically download updates"
+          onChange={(autoDownloadUpdates) => patchModel(settings, { autoDownloadUpdates })}
+        />

-            <ModelSettingRowBoolean
-              model={settings}
-              modelKey="autoDownloadUpdates"
-              title="Automatically download updates"
-              description="Download Yaak updates in the background so they are ready to install."
-              disabled={!settings.autoupdate}
-            />
+        <Checkbox
+          className="pl-2 mt-1 ml-[14rem]"
+          checked={settings.checkNotifications}
+          title="Check for notifications"
+          help="Periodically ping Yaak servers to check for relevant notifications."
+          onChange={(checkNotifications) => patchModel(settings, { checkNotifications })}
+        />
+        <Checkbox
+          disabled
+          className="pl-2 mt-1 ml-[14rem]"
+          checked={false}
+          title="Send anonymous usage statistics"
+          help="Yaak is local-first and does not collect analytics or usage data 🔐"
+          onChange={(checkNotifications) => patchModel(settings, { checkNotifications })}
+        />
+      </CargoFeature>

-            <ModelSettingRowBoolean
-              model={settings}
-              modelKey="checkNotifications"
-              title="Check for notifications"
-              description="Periodically ping Yaak servers to check for relevant notifications."
-            />
+      <Separator className="my-4" />

-            <SettingRowBoolean
-              title="Send anonymous usage statistics"
-              description="Yaak is local-first and does not collect analytics or usage data."
-              disabled
-              checked={false}
-              onChange={() => {}}
-            />
-          </SettingsSection>
-        </CargoFeature>
+      <Heading level={2}>
+        Workspace{" "}
+        <div className="inline-block ml-1 bg-surface-highlight px-2 py-0.5 rounded text text-shrink">
+          {workspace.name}
+        </div>
+      </Heading>
+      <VStack className="mt-1 w-full" space={3}>
+        <PlainInput
+          required
+          size="sm"
+          name="requestTimeout"
+          label="Request Timeout (ms)"
+          labelClassName="w-[14rem]"
+          placeholder="0"
+          labelPosition="left"
+          defaultValue={`${workspace.settingRequestTimeout}`}
+          validate={(value) => Number.parseInt(value, 10) >= 0}
+          onChange={(v) =>
+            patchModel(workspace, { settingRequestTimeout: Number.parseInt(v, 10) || 0 })
+          }
+          type="number"
+        />

-        <CargoFeature feature="license">
-          <SettingsSection title="Feedback">
-            <SettingRowBoolean
-              title="Prompt for feedback"
-              description="Show rare one-time prompts asking how new features are working."
-              checked={settings.promptFeedback}
-              onChange={(promptFeedback) => patchModel(settings, { promptFeedback })}
-            />
-          </SettingsSection>
-        </CargoFeature>
+        <Checkbox
+          checked={workspace.settingValidateCertificates}
+          help="When disabled, skip validation of server certificates, useful when interacting with self-signed certs."
+          title="Validate TLS certificates"
+          onChange={(settingValidateCertificates) =>
+            patchModel(workspace, { settingValidateCertificates })
+          }
+        />

-        {showWorkspaceSettingsMovedBanner && (
-          <DismissibleBanner
-            id="workspace-settings-moved-2026-06-30"
-            color="info"
-            className="w-full p-4 max-w-xl mr-auto"
-          >
-            <p>
-              Workspace specific settings have moved to{" "}
-              <b>Workspace Settings</b>, accessible from the workspace switcher
-              menu.
-            </p>
-          </DismissibleBanner>
-        )}
+        <Checkbox
+          checked={workspace.settingFollowRedirects}
+          title="Follow redirects"
+          onChange={(settingFollowRedirects) =>
+            patchModel(workspace, {
+              settingFollowRedirects,
+            })
+          }
+        />
+      </VStack>

-        <SettingsSection title="App Info">
-          <SettingRow title="Version" description="Current Yaak version.">
-            <SettingValue value={appInfo.version} />
-          </SettingRow>
-          <SettingRow
-            title="Data Directory"
-            description="Where Yaak stores application data."
-            controlClassName="min-w-0 max-w-[min(42rem,55vw)] gap-2"
-          >
-            <SettingValue
-              value={appInfo.appDataDir}
-              actions={[
-                {
-                  title: revealInFinderText,
-                  icon: "folder_open",
-                  onClick: () => platform.revealItemInDir(appInfo.appDataDir),
-                },
-              ]}
+      <Separator className="my-4" />
+
+      <Heading level={2}>App Info</Heading>
+      <KeyValueRows>
+        <KeyValueRow label="Version">{appInfo.version}</KeyValueRow>
+        <KeyValueRow
+          label="Data Directory"
+          rightSlot={
+            <IconButton
+              title={revealInFinderText}
+              icon="folder_open"
+              size="2xs"
+              onClick={() => revealItemInDir(appInfo.appDataDir)}
            />
-          </SettingRow>
-          <SettingRow
-            title="Logs Directory"
-            description="Where Yaak writes application logs."
-            controlClassName="min-w-0 max-w-[min(42rem,55vw)] gap-2"
-          >
-            <SettingValue
-              value={appInfo.appLogDir}
-              actions={[
-                {
-                  title: revealInFinderText,
-                  icon: "folder_open",
-                  onClick: () => platform.revealItemInDir(appInfo.appLogDir),
-                },
-              ]}
+          }
+        >
+          {appInfo.appDataDir}
+        </KeyValueRow>
+        <KeyValueRow
+          label="Logs Directory"
+          rightSlot={
+            <IconButton
+              title={revealInFinderText}
+              icon="folder_open"
+              size="2xs"
+              onClick={() => revealItemInDir(appInfo.appLogDir)}
            />
-          </SettingRow>
-        </SettingsSection>
-      </SettingsList>
+          }
+        >
+          {appInfo.appLogDir}
+        </KeyValueRow>
+      </KeyValueRows>
    </VStack>
  );
 }
@@ -341,7 +341,7 @@ function RecordHotkeyDialog({ label, onSave, onCancel }: RecordHotkeyDialogProps
          }}
          className={classNames(
            "flex items-center justify-center",
-            "px-4 py-2 rounded-lg bg-surface-highlight border outline-hidden cursor-default w-full",
+            "px-4 py-2 rounded-lg bg-surface-highlight border outline-none cursor-default w-full",
            "border-border-subtle focus:border-border-focus",
          )}
        >
@@ -1,29 +1,19 @@
-import { platform } from "@yaakapp-internal/platform";
+import { type } from "@tauri-apps/plugin-os";
 import { useFonts } from "@yaakapp-internal/fonts";
 import { useLicense } from "@yaakapp-internal/license";
 import type { EditorKeymap, Settings } from "@yaakapp-internal/models";
 import { patchModel, settingsAtom } from "@yaakapp-internal/models";
-import { clamp, Heading, VStack } from "@yaakapp-internal/ui";
+import { clamp, Heading, HStack, Icon, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
 import { useState } from "react";
 import { activeWorkspaceAtom } from "../../hooks/useActiveWorkspace";
 import { showConfirm } from "../../lib/confirm";
-import { pricingUrl } from "../../lib/pricingUrl";
-import { rpc } from "../../lib/rpc";
+import { invokeCmd } from "../../lib/tauri";
 import { CargoFeature } from "../CargoFeature";
 import { Button } from "../core/Button";
 import { Checkbox } from "../core/Checkbox";
 import { Link } from "../core/Link";
-import {
-  ModelSettingRowBoolean,
-  ModelSettingRowSelect,
-  SettingRow,
-  SettingRowBoolean,
-  SettingRowSelect,
-  SettingSelectControl,
-  SettingsList,
-  SettingsSection,
-} from "../core/SettingRow";
+import { Select } from "../core/Select";

 const NULL_FONT_VALUE = "__NULL_FONT__";

@@ -48,181 +38,163 @@ export function SettingsInterface() {
  }

  return (
-    <VStack space={1.5} className="mb-4">
+    <VStack space={3} className="mb-4">
      <div className="mb-3">
        <Heading>Interface</Heading>
        <p className="text-text-subtle">Tweak settings related to the user interface.</p>
      </div>
-      <SettingsList className="space-y-8">
-        <SettingsSection title="Workspaces">
-          <SettingRowSelect
-            title="Open workspace behavior"
-            description="Choose what happens when opening another workspace."
-            name="switchWorkspaceBehavior"
-            value={
-              settings.openWorkspaceNewWindow === true
-                ? "new"
-                : settings.openWorkspaceNewWindow === false
-                  ? "current"
-                  : "ask"
-            }
-            onChange={async (v) => {
-              if (v === "current") await patchModel(settings, { openWorkspaceNewWindow: false });
-              else if (v === "new") await patchModel(settings, { openWorkspaceNewWindow: true });
-              else await patchModel(settings, { openWorkspaceNewWindow: null });
-            }}
+      <Select
+        name="switchWorkspaceBehavior"
+        label="Open workspace behavior"
+        size="sm"
+        help="When opening a workspace, should it open in the current window or a new window?"
+        value={
+          settings.openWorkspaceNewWindow === true
+            ? "new"
+            : settings.openWorkspaceNewWindow === false
+              ? "current"
+              : "ask"
+        }
+        onChange={async (v) => {
+          if (v === "current") await patchModel(settings, { openWorkspaceNewWindow: false });
+          else if (v === "new") await patchModel(settings, { openWorkspaceNewWindow: true });
+          else await patchModel(settings, { openWorkspaceNewWindow: null });
+        }}
+        options={[
+          { label: "Always ask", value: "ask" },
+          { label: "Open in current window", value: "current" },
+          { label: "Open in new window", value: "new" },
+        ]}
+      />
+      <HStack space={2} alignItems="end">
+        {fonts.data && (
+          <Select
+            size="sm"
+            name="uiFont"
+            label="Interface font"
+            value={settings.interfaceFont ?? NULL_FONT_VALUE}
            options={[
-              { label: "Always ask", value: "ask" },
-              { label: "Open in current window", value: "current" },
-              { label: "Open in new window", value: "new" },
+              { label: "System default", value: NULL_FONT_VALUE },
+              ...(fonts.data.uiFonts.map((f) => ({
+                label: f,
+                value: f,
+              })) ?? []),
+              // Some people like monospace fonts for the UI
+              ...(fonts.data.editorFonts.map((f) => ({
+                label: f,
+                value: f,
+              })) ?? []),
            ]}
+            onChange={async (v) => {
+              const interfaceFont = v === NULL_FONT_VALUE ? null : v;
+              await patchModel(settings, { interfaceFont });
+            }}
          />
-        </SettingsSection>
-
-        <SettingsSection title="Fonts">
-          <SettingRow
-            title="Interface font"
-            description="Font used for Yaak interface controls."
-            controlClassName="gap-1"
-          >
-            {fonts.data && (
-              <SettingSelectControl
-                name="uiFont"
-                label="Interface font"
-                selectClassName="w-72!"
-                value={settings.interfaceFont ?? NULL_FONT_VALUE}
-                defaultValue={NULL_FONT_VALUE}
-                options={[
-                  { label: "System default", value: NULL_FONT_VALUE },
-                  ...fonts.data.uiFonts.map((f) => ({ label: f, value: f })),
-                  ...fonts.data.editorFonts.map((f) => ({ label: f, value: f })),
-                ]}
-                onChange={async (v) => {
-                  const interfaceFont = v === NULL_FONT_VALUE ? null : v;
-                  await patchModel(settings, { interfaceFont });
-                }}
-              />
-            )}
-            <SettingSelectControl
-              name="interfaceFontSize"
-              label="Interface Font Size"
-              selectClassName="w-20!"
-              value={`${settings.interfaceFontSize}`}
-              defaultValue="14"
-              options={fontSizeOptions}
-              onChange={(v) => patchModel(settings, { interfaceFontSize: Number.parseInt(v, 10) })}
-            />
-          </SettingRow>
-
-          <SettingRow
-            title="Editor font"
-            description="Font used in request and response editors."
-            controlClassName="gap-1"
-          >
-            {fonts.data && (
-              <SettingSelectControl
-                name="editorFont"
-                label="Editor font"
-                selectClassName="w-72!"
-                value={settings.editorFont ?? NULL_FONT_VALUE}
-                defaultValue={NULL_FONT_VALUE}
-                options={[
-                  { label: "System default", value: NULL_FONT_VALUE },
-                  ...fonts.data.editorFonts.map((f) => ({ label: f, value: f })),
-                ]}
-                onChange={async (v) => {
-                  const editorFont = v === NULL_FONT_VALUE ? null : v;
-                  await patchModel(settings, { editorFont });
-                }}
-              />
-            )}
-            <SettingSelectControl
-              name="editorFontSize"
-              label="Editor Font Size"
-              selectClassName="w-20!"
-              value={`${settings.editorFontSize}`}
-              defaultValue="12"
-              options={fontSizeOptions}
-              onChange={(v) =>
-                patchModel(settings, {
-                  editorFontSize: clamp(Number.parseInt(v, 10) || 14, 8, 30),
-                })
-              }
-            />
-          </SettingRow>
-        </SettingsSection>
-
-        <SettingsSection title="Editor">
-          <ModelSettingRowSelect
-            model={settings}
-            modelKey="editorKeymap"
-            title="Editor keymap"
-            description="Keyboard shortcut preset used by text editors."
-            options={keymaps}
+        )}
+        <Select
+          hideLabel
+          size="sm"
+          name="interfaceFontSize"
+          label="Interface Font Size"
+          defaultValue="14"
+          value={`${settings.interfaceFontSize}`}
+          options={fontSizeOptions}
+          onChange={(v) => patchModel(settings, { interfaceFontSize: Number.parseInt(v, 10) })}
+        />
+      </HStack>
+      <HStack space={2} alignItems="end">
+        {fonts.data && (
+          <Select
+            size="sm"
+            name="editorFont"
+            label="Editor font"
+            value={settings.editorFont ?? NULL_FONT_VALUE}
+            options={[
+              { label: "System default", value: NULL_FONT_VALUE },
+              ...(fonts.data.editorFonts.map((f) => ({
+                label: f,
+                value: f,
+              })) ?? []),
+            ]}
+            onChange={async (v) => {
+              const editorFont = v === NULL_FONT_VALUE ? null : v;
+              await patchModel(settings, { editorFont });
+            }}
          />
-          <ModelSettingRowBoolean
-            model={settings}
-            modelKey="editorSoftWrap"
-            title="Wrap editor lines"
-            description="Wrap long lines in request and response editors."
-          />
-          <ModelSettingRowBoolean
-            model={settings}
-            modelKey="coloredMethods"
-            title="Colorize request methods"
-            description="Use method-specific colors for HTTP request methods."
-          />
-        </SettingsSection>
+        )}
+        <Select
+          hideLabel
+          size="sm"
+          name="editorFontSize"
+          label="Editor Font Size"
+          defaultValue="12"
+          value={`${settings.editorFontSize}`}
+          options={fontSizeOptions}
+          onChange={(v) =>
+            patchModel(settings, { editorFontSize: clamp(Number.parseInt(v, 10) || 14, 8, 30) })
+          }
+        />
+      </HStack>
+      <Select
+        leftSlot={<Icon icon="keyboard" color="secondary" />}
+        size="sm"
+        name="editorKeymap"
+        label="Editor keymap"
+        value={`${settings.editorKeymap}`}
+        options={keymaps}
+        onChange={(v) => patchModel(settings, { editorKeymap: v })}
+      />
+      <Checkbox
+        checked={settings.editorSoftWrap}
+        title="Wrap editor lines"
+        onChange={(editorSoftWrap) => patchModel(settings, { editorSoftWrap })}
+      />
+      <Checkbox
+        checked={settings.coloredMethods}
+        title="Colorize request methods"
+        onChange={(coloredMethods) => patchModel(settings, { coloredMethods })}
+      />
+      <CargoFeature feature="license">
+        <LicenseSettings settings={settings} />
+      </CargoFeature>

-        <SettingsSection title="Window">
-          <NativeTitlebarSetting settings={settings} />
-          {platform.osType() !== "macos" && (
-            <ModelSettingRowBoolean
-              model={settings}
-              modelKey="hideWindowControls"
-              title="Hide window controls"
-              description="Hide the close, maximize, and minimize controls on Windows or Linux."
-            />
-          )}
-        </SettingsSection>
+      <NativeTitlebarSetting settings={settings} />

-        <CargoFeature feature="license">
-          <LicenseSettings settings={settings} />
-        </CargoFeature>
-      </SettingsList>
+      {type() !== "macos" && (
+        <Checkbox
+          checked={settings.hideWindowControls}
+          title="Hide window controls"
+          help="Hide the close/maximize/minimize controls on Windows or Linux"
+          onChange={(hideWindowControls) => patchModel(settings, { hideWindowControls })}
+        />
+      )}
    </VStack>
  );
 }

 function NativeTitlebarSetting({ settings }: { settings: Settings }) {
  const [nativeTitlebar, setNativeTitlebar] = useState(settings.useNativeTitlebar);
-
  return (
-    <SettingRow
-      title="Native title bar"
-      description="Use the operating system's standard title bar and window controls."
-      controlClassName="gap-2"
-    >
+    <div className="flex gap-1 overflow-hidden h-2xs">
      <Checkbox
-        hideLabel
-        size="md"
        checked={nativeTitlebar}
        title="Native title bar"
+        help="Use the operating system's standard title bar and window controls"
        onChange={setNativeTitlebar}
      />
      {settings.useNativeTitlebar !== nativeTitlebar && (
        <Button
          color="primary"
-          size="xs"
+          size="2xs"
          onClick={async () => {
            await patchModel(settings, { useNativeTitlebar: nativeTitlebar });
-            await rpc("cmd_restart");
+            await invokeCmd("cmd_restart");
          }}
        >
          Apply and Restart
        </Button>
      )}
-    </SettingRow>
+    </div>
  );
 }

@@ -233,42 +205,37 @@ function LicenseSettings({ settings }: { settings: Settings }) {
  }

  return (
-    <SettingsSection title="License">
-      <SettingRowBoolean
-        checked={settings.hideLicenseBadge}
-        title="Hide personal use badge"
-        description="Hide the personal-use badge from the interface."
-        onChange={async (hideLicenseBadge) => {
-          if (hideLicenseBadge) {
-            const confirmed = await showConfirm({
-              id: "hide-license-badge",
-              title: "Confirm Personal Use",
-              confirmText: "Confirm",
-              description: (
-                <VStack space={3}>
-                  <p>Hey there 👋🏼</p>
-                  <p>
-                    Yaak is free for personal projects and learning.{" "}
-                    <strong>If you’re using Yaak at work, a license is required.</strong>
-                  </p>
-                  <p>
-                    Licenses help keep Yaak independent and sustainable.{" "}
-                    <Link href={pricingUrl("app.license.badge-hide-confirm")}>
-                      Purchase a License →
-                    </Link>
-                  </p>
-                </VStack>
-              ),
-              requireTyping: "Personal Use",
-              color: "info",
-            });
-            if (!confirmed) {
-              return;
-            }
+    <Checkbox
+      checked={settings.hideLicenseBadge}
+      title="Hide personal use badge"
+      onChange={async (hideLicenseBadge) => {
+        if (hideLicenseBadge) {
+          const confirmed = await showConfirm({
+            id: "hide-license-badge",
+            title: "Confirm Personal Use",
+            confirmText: "Confirm",
+            description: (
+              <VStack space={3}>
+                <p>Hey there 👋🏼</p>
+                <p>
+                  Yaak is free for personal projects and learning.{" "}
+                  <strong>If you’re using Yaak at work, a license is required.</strong>
+                </p>
+                <p>
+                  Licenses help keep Yaak independent and sustainable.{" "}
+                  <Link href="https://yaak.app/pricing?s=badge">Purchase a License →</Link>
+                </p>
+              </VStack>
+            ),
+            requireTyping: "Personal Use",
+            color: "info",
+          });
+          if (!confirmed) {
+            return; // Cancel
          }
-          await patchModel(settings, { hideLicenseBadge });
-        }}
-      />
-    </SettingsSection>
+        }
+        await patchModel(settings, { hideLicenseBadge });
+      }}
+    />
  );
 }
@@ -1,3 +1,4 @@
+import { openUrl } from "@tauri-apps/plugin-opener";
 import { useLicense } from "@yaakapp-internal/license";
 import { Banner, HStack, Icon, VStack } from "@yaakapp-internal/ui";
 import { differenceInDays } from "date-fns";
@@ -5,13 +6,11 @@ import { formatDate } from "date-fns/format";
 import { useState } from "react";
 import { useToggle } from "../../hooks/useToggle";
 import { pluralizeCount } from "../../lib/pluralize";
-import { pricingUrl } from "../../lib/pricingUrl";
 import { CargoFeature } from "../CargoFeature";
 import { Button } from "../core/Button";
 import { Link } from "../core/Link";
 import { PlainInput } from "../core/PlainInput";
 import { Separator } from "../core/Separator";
-import { platform } from "@yaakapp-internal/platform";

 export function SettingsLicense() {
  return (
@@ -49,7 +48,7 @@ function SettingsLicenseCmp() {
              <span className="opacity-50">Personal use is always free, forever.</span>
              <Separator className="my-2" />
              <div className="flex flex-wrap items-center gap-x-2 text-sm text-notice">
-                <Link noUnderline href={pricingUrl(`app.license.learn.${check.data.status}`)}>
+                <Link noUnderline href={`https://yaak.app/pricing?s=learn&t=${check.data.status}`}>
                  Learn More
                </Link>
              </div>
@@ -69,7 +68,7 @@ function SettingsLicenseCmp() {
              </span>
              <Separator className="my-2" />
              <div className="flex flex-wrap items-center gap-x-2 text-sm text-notice">
-                <Link noUnderline href={pricingUrl(`app.license.learn.${check.data.status}`)}>
+                <Link noUnderline href={`https://yaak.app/pricing?s=learn&t=${check.data.status}`}>
                  Learn More
                </Link>
              </div>
@@ -135,7 +134,7 @@ function SettingsLicenseCmp() {
          <Button
            color="secondary"
            size="sm"
-            onClick={() => platform.openUrl("https://yaak.app/dashboard?intent=app.license.support")}
+            onClick={() => openUrl("https://yaak.app/dashboard?s=support&ref=app.yaak.desktop")}
            rightSlot={<Icon icon="external_link" />}
          >
            Direct Support
@@ -151,7 +150,9 @@ function SettingsLicenseCmp() {
            color="primary"
            rightSlot={<Icon icon="external_link" />}
            onClick={() =>
-              platform.openUrl(pricingUrl(`app.license.purchase.${check.data?.status ?? "unknown"}`))
+              openUrl(
+                `https://yaak.app/pricing?s=purchase&ref=app.yaak.desktop&t=${check.data?.status ?? ""}`,
+              )
            }
          >
            Purchase License
@@ -1,4 +1,5 @@
 import { useMutation, useQuery } from "@tanstack/react-query";
+import { openUrl } from "@tauri-apps/plugin-opener";
 import type { Plugin } from "@yaakapp-internal/models";
 import { patchModel, pluginsAtom } from "@yaakapp-internal/models";
 import type { PluginVersion } from "@yaakapp-internal/plugins";
@@ -38,7 +39,6 @@ import { PlainInput } from "../core/PlainInput";
 import { TabContent, Tabs } from "../core/Tabs/Tabs";
 import { EmptyStateText } from "../EmptyStateText";
 import { SelectFile } from "../SelectFile";
-import { platform } from "@yaakapp-internal/platform";

 interface SettingsPluginsProps {
  defaultSubtab?: string;
@@ -113,7 +113,7 @@ export function SettingsPlugins({ defaultSubtab }: SettingsPluginsProps) {
                  icon="help"
                  title="View documentation"
                  onClick={() =>
-                    platform.openUrl("https://yaak.app/docs/plugin-development/plugins-quick-start")
+                    openUrl("https://yaak.app/docs/plugin-development/plugins-quick-start")
                  }
                />
              </HStack>
@@ -211,7 +211,7 @@ function PluginTableRow({
  return (
    <TableRow>
      {showCheckbox && (
-        <TableCell className="py-0!">
+        <TableCell className="!py-0">
          <Checkbox
            hideLabel
            title={plugin?.enabled ? "Disable plugin" : "Enable plugin"}
@@ -249,7 +249,7 @@ function PluginTableRow({
          )}
        </HStack>
      </TableCell>
-      <TableCell className="py-0!">
+      <TableCell className="!py-0">
        <HStack justifyContent="end" space={1.5}>
          {plugin != null && latestVersion != null ? (
            <Button
@@ -1,29 +1,13 @@
 import { patchModel, settingsAtom } from "@yaakapp-internal/models";
-import type { ProxySetting } from "@yaakapp-internal/models";
-import { Heading, InlineCode, VStack } from "@yaakapp-internal/ui";
+import { Heading, HStack, InlineCode, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
-import { CommercialUseBanner } from "../CommercialUseBanner";
-import {
-  SettingRowBoolean,
-  SettingRowSelect,
-  SettingRowText,
-  SettingsList,
-  SettingsSection,
-} from "../core/SettingRow";
+import { Checkbox } from "../core/Checkbox";
+import { PlainInput } from "../core/PlainInput";
+import { Select } from "../core/Select";
+import { Separator } from "../core/Separator";

 export function SettingsProxy() {
  const settings = useAtomValue(settingsAtom);
-  const proxy = enabledProxyOrDefault(settings.proxy);
-
-  const patchProxy = async (patch: Partial<EnabledProxySetting>) => {
-    await patchModel(settings, {
-      proxy: {
-        ...proxy,
-        ...patch,
-        auth: Object.hasOwn(patch, "auth") ? (patch.auth ?? null) : proxy.auth,
-      },
-    });
-  };

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

 const Editor = lazy(() => import("../core/Editor/Editor").then((m) => ({ default: m.Editor })));

@@ -72,7 +67,7 @@ export function SettingsTheme() {
    }));

  return (
-    <VStack space={1.5} className="mb-4">
+    <VStack space={3} className="mb-4">
      <div className="mb-3">
        <Heading>Theme</Heading>
        <p className="text-text-subtle">
@@ -82,92 +77,96 @@ export function SettingsTheme() {
          </Link>
        </p>
      </div>
-      <SettingsList className="space-y-8">
-        <SettingsSection title="Theme">
-          <ModelSettingRowSelect
-            model={settings}
-            modelKey="appearance"
-            title="Appearance"
-            description="Choose whether Yaak follows your system appearance or uses a fixed mode."
-            options={[
-              { label: "Automatic", value: "system" },
-              { label: "Light", value: "light" },
-              { label: "Dark", value: "dark" },
-            ]}
+      <Select
+        name="appearance"
+        label="Appearance"
+        labelPosition="top"
+        size="sm"
+        value={settings.appearance}
+        onChange={(appearance) => patchModel(settings, { appearance })}
+        options={[
+          { label: "Automatic", value: "system" },
+          { label: "Light", value: "light" },
+          { label: "Dark", value: "dark" },
+        ]}
+      />
+      <HStack space={2}>
+        {(settings.appearance === "system" || settings.appearance === "light") && (
+          <Select
+            hideLabel
+            leftSlot={<Icon icon="sun" color="secondary" />}
+            name="lightTheme"
+            label="Light Theme"
+            size="sm"
+            className="flex-1"
+            value={activeTheme.data.light.id}
+            options={lightThemes}
+            onChange={(themeLight) => patchModel(settings, { themeLight })}
          />
-          {(settings.appearance === "system" || settings.appearance === "light") && (
-            <SettingRowSelect
-              name="lightTheme"
-              title="Light theme"
-              description="Theme used when Yaak is in light mode."
-              value={activeTheme.data.light.id}
-              options={lightThemes}
-              onChange={(themeLight) => patchModel(settings, { themeLight })}
-            />
-          )}
-          {(settings.appearance === "system" || settings.appearance === "dark") && (
-            <SettingRowSelect
-              name="darkTheme"
-              title="Dark theme"
-              description="Theme used when Yaak is in dark mode."
-              value={activeTheme.data.dark.id}
-              options={darkThemes}
-              onChange={(themeDark) => patchModel(settings, { themeDark })}
-            />
-          )}
-        </SettingsSection>
+        )}
+        {(settings.appearance === "system" || settings.appearance === "dark") && (
+          <Select
+            hideLabel
+            name="darkTheme"
+            className="flex-1"
+            label="Dark Theme"
+            leftSlot={<Icon icon="moon" color="secondary" />}
+            size="sm"
+            value={activeTheme.data.dark.id}
+            options={darkThemes}
+            onChange={(themeDark) => patchModel(settings, { themeDark })}
+          />
+        )}
+      </HStack>

-        <SettingsSection title="Preview">
-          <VStack
-            space={3}
-            className="mt-4 w-full bg-surface p-3 border border-dashed border-border-subtle rounded-sm overflow-x-auto"
-          >
-            <HStack className="text" space={1.5}>
-              <Icon icon={appearance === "dark" ? "moon" : "sun"} />
-              <strong>{activeTheme.data.active.label}</strong>
-              <em>(preview)</em>
-            </HStack>
-            <HStack space={1.5} className="w-full">
-              {buttonColors.map((c, i) => (
-                <IconButton
-                  key={c}
-                  color={c}
-                  size="2xs"
-                  iconSize="xs"
-                  icon={icons[i % icons.length] ?? "info"}
-                  iconClassName="text"
-                  title={`${c}`}
-                />
-              ))}
-              {buttonColors.map((c, i) => (
-                <IconButton
-                  key={c}
-                  color={c}
-                  variant="border"
-                  size="2xs"
-                  iconSize="xs"
-                  icon={icons[i % icons.length] ?? "info"}
-                  iconClassName="text"
-                  title={`${c}`}
-                />
-              ))}
-            </HStack>
-            <Suspense>
-              <Editor
-                defaultValue={[
-                  "let foo = { // Demo code editor",
-                  '  foo: ("bar" || "baz" ?? \'qux\'),',
-                  "  baz: [1, 10.2, null, false, true],",
-                  "};",
-                ].join("\n")}
-                heightMode="auto"
-                language="javascript"
-                stateKey={null}
-              />
-            </Suspense>
-          </VStack>
-        </SettingsSection>
-      </SettingsList>
+      <VStack
+        space={3}
+        className="mt-3 w-full bg-surface p-3 border border-dashed border-border-subtle rounded overflow-x-auto"
+      >
+        <HStack className="text" space={1.5}>
+          <Icon icon={appearance === "dark" ? "moon" : "sun"} />
+          <strong>{activeTheme.data.active.label}</strong>
+          <em>(preview)</em>
+        </HStack>
+        <HStack space={1.5} className="w-full">
+          {buttonColors.map((c, i) => (
+            <IconButton
+              key={c}
+              color={c}
+              size="2xs"
+              iconSize="xs"
+              icon={icons[i % icons.length] ?? "info"}
+              iconClassName="text"
+              title={`${c}`}
+            />
+          ))}
+          {buttonColors.map((c, i) => (
+            <IconButton
+              key={c}
+              color={c}
+              variant="border"
+              size="2xs"
+              iconSize="xs"
+              icon={icons[i % icons.length] ?? "info"}
+              iconClassName="text"
+              title={`${c}`}
+            />
+          ))}
+        </HStack>
+        <Suspense>
+          <Editor
+            defaultValue={[
+              "let foo = { // Demo code editor",
+              '  foo: ("bar" || "baz" ?? \'qux\'),',
+              "  baz: [1, 10.2, null, false, true],",
+              "};",
+            ].join("\n")}
+            heightMode="auto"
+            language="javascript"
+            stateKey={null}
+          />
+        </Suspense>
+      </VStack>
    </VStack>
  );
 }
@@ -1,3 +1,4 @@
+import { openUrl } from "@tauri-apps/plugin-opener";
 import { useLicense } from "@yaakapp-internal/license";
 import { useRef } from "react";
 import { openSettings } from "../commands/openSettings";
@@ -6,13 +7,11 @@ import { useExportData } from "../hooks/useExportData";
 import { appInfo } from "../lib/appInfo";
 import { showDialog } from "../lib/dialog";
 import { importData } from "../lib/importData";
-import { pricingUrl } from "../lib/pricingUrl";
 import type { DropdownRef } from "./core/Dropdown";
 import { Dropdown } from "./core/Dropdown";
 import { Icon } from "@yaakapp-internal/ui";
 import { IconButton } from "./core/IconButton";
 import { KeyboardShortcutsDialog } from "./KeyboardShortcutsDialog";
-import { platform } from "@yaakapp-internal/platform";

 export function SettingsDropdown() {
  const exportData = useExportData();
@@ -62,7 +61,7 @@ export function SettingsDropdown() {
        {
          label: "Create Run Button",
          leftSlot: <Icon icon="rocket" />,
-          onSelect: () => platform.openUrl("https://yaak.app/button/new"),
+          onSelect: () => openUrl("https://yaak.app/button/new"),
        },
        { type: "separator", label: `Yaak v${appInfo.version}` },
        {
@@ -77,27 +76,26 @@ export function SettingsDropdown() {
          hidden: check.data == null || check.data.status === "active",
          leftSlot: <Icon icon="circle_dollar_sign" />,
          rightSlot: <Icon icon="external_link" color="success" className="opacity-60" />,
-          onSelect: () =>
-            platform.openUrl(pricingUrl(`app.menu.purchase.${check.data?.status ?? "unknown"}`)),
+          onSelect: () => openUrl("https://yaak.app/pricing"),
        },
        {
          label: "Install CLI",
          hidden: appInfo.cliVersion != null,
          leftSlot: <Icon icon="square_terminal" />,
          rightSlot: <Icon icon="external_link" color="secondary" />,
-          onSelect: () => platform.openUrl("https://yaak.app/docs/cli"),
+          onSelect: () => openUrl("https://yaak.app/docs/cli"),
        },
        {
          label: "Feedback",
          leftSlot: <Icon icon="chat" />,
          rightSlot: <Icon icon="external_link" color="secondary" />,
-          onSelect: () => platform.openUrl("https://yaak.app/feedback"),
+          onSelect: () => openUrl("https://yaak.app/feedback"),
        },
        {
          label: "Changelog",
          leftSlot: <Icon icon="cake" />,
          rightSlot: <Icon icon="external_link" color="secondary" />,
-          onSelect: () => platform.openUrl(`https://yaak.app/changelog/${appInfo.version}`),
+          onSelect: () => openUrl(`https://yaak.app/changelog/${appInfo.version}`),
        },
      ]}
    >
@@ -43,8 +43,7 @@ import { getFolderActions } from "../hooks/useFolderActions";
 import { getGrpcRequestActions } from "../hooks/useGrpcRequestActions";
 import { useHotKey } from "../hooks/useHotKey";
 import { getHttpRequestActions } from "../hooks/useHttpRequestActions";
-import { platform } from "@yaakapp-internal/platform";
-import { usePlatformEvent } from "../hooks/usePlatformEvent";
+import { useListenToTauriEvent } from "../hooks/useListenToTauriEvent";
 import { getModelAncestors } from "../hooks/useModelAncestors";
 import { sendAnyHttpRequest } from "../hooks/useSendAnyHttpRequest";
 import { useSidebarHidden } from "../hooks/useSidebarHidden";
@@ -65,9 +64,7 @@ import type { ContextMenuProps, DropdownItem } from "./core/Dropdown";
 import { ContextMenu, Dropdown } from "./core/Dropdown";
 import type { FieldDef } from "./core/Editor/filter/extension";
 import { filter } from "./core/Editor/filter/extension";
-import type { Ast } from "./core/Editor/filter/query";
 import { evaluate, parseQuery } from "./core/Editor/filter/query";
-import { formatFieldFilter } from "./core/Editor/filter/format";
 import { HttpMethodTag } from "./core/HttpMethodTag";
 import { HttpStatusTag } from "./core/HttpStatusTag";
 import {
@@ -82,7 +79,6 @@ import type { TreeNode, TreeHandle, TreeProps, TreeItemProps } from "@yaakapp-in
 import { IconButton } from "./core/IconButton";
 import type { InputHandle } from "./core/Input";
 import { Input } from "./core/Input";
-import { EmptyStateText } from "./EmptyStateText";
 import { atomWithKVStorage } from "../lib/atoms/atomWithKVStorage";
 import { GitDropdown } from "./git/GitDropdown";
 import { gitCallbacks } from "./git/callbacks";
@@ -112,8 +108,7 @@ function Sidebar({ className }: { className?: string }) {
  const activeWorkspaceId = useAtomValue(activeWorkspaceAtom)?.id;
  const treeId = `tree.${activeWorkspaceId ?? "unknown"}`;
  const filterText = useAtomValue(sidebarFilterAtom);
-  const [tree, allFields, emptyFilterSuggestions] = useAtomValue(sidebarTreeAtom) ?? [];
-
+  const [tree, allFields] = useAtomValue(sidebarTreeAtom) ?? [];
  const wrapperRef = useRef<HTMLElement>(null);
  const treeRef = useRef<TreeHandle>(null);
  const filterRef = useRef<InputHandle>(null);
@@ -132,17 +127,11 @@ function Sidebar({ className }: { className?: string }) {
    if (!didFocus) filterRef.current?.focus();
  }, []);

-  // Focus new sidebar models created by the user in this window. Writes from other
-  // sources (import, sync, CLI) can carry thousands of models and shouldn't move
-  // the selection.
-  usePlatformEvent<ModelPayload[]>("model_writes", (payloads) => {
-    for (const payload of payloads) {
-      if (payload.updateSource.type !== "window") continue;
-      if (payload.updateSource.label !== platform.window.label) continue;
-      if (!isSidebarLeafModel(payload.model)) continue;
-      if (!(payload.change.type === "upsert" && payload.change.created)) continue;
-      treeRef.current?.selectItem(payload.model.id, true);
-    }
+  // Focus any new sidebar models when created
+  useListenToTauriEvent<ModelPayload>("model_write", ({ payload }) => {
+    if (!isSidebarLeafModel(payload.model)) return;
+    if (!(payload.change.type === "upsert" && payload.change.created)) return;
+    treeRef.current?.selectItem(payload.model.id, true);
  });

  useEffect(() => {
@@ -238,7 +227,7 @@ function Sidebar({ className }: { className?: string }) {
  );

  const clearFilterText = useCallback(() => {
-    setSidebarFilterText("");
+    jotaiStore.set(sidebarFilterAtom, { text: "", key: `${Math.random()}` });
    requestAnimationFrame(() => {
      filterRef.current?.focus();
    });
@@ -263,13 +252,6 @@ function Sidebar({ className }: { className?: string }) {
    [],
  );

-  const applyFilterExample = useCallback((text: string) => {
-    setSidebarFilterText(text);
-    requestAnimationFrame(() => {
-      filterRef.current?.focus();
-    });
-  }, []);
-
  const treeHasFocus = useCallback(() => treeRef.current?.hasFocus() ?? false, []);

  const getSelectedTreeModels = useCallback(
@@ -596,7 +578,7 @@ function Sidebar({ className }: { className?: string }) {
              rightSlot={
                filterText.text && (
                  <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={clearFilterText}
@@ -672,43 +654,8 @@ function Sidebar({ className }: { className?: string }) {
        )}
      </div>
      {allHidden ? (
-        <div className="p-3 text-sm text-center">
-          {(emptyFilterSuggestions?.length ?? 0) > 0 ? (
-            <EmptyStateText
-              wrapperClassName="h-auto! mb-auto"
-              className="h-auto! py-3 px-3 text-text-subtle! text-sm leading-relaxed text-center"
-            >
-              <div>
-                No results, but found matches for{" "}
-                {emptyFilterSuggestions?.map((suggestion, i) => (
-                  <span key={suggestion.field}>
-                    {i > 0 && " or "}
-                    <button
-                      type="button"
-                      className="max-w-full rounded-sm align-middle focus-visible:outline-solid focus-visible:outline-2 focus-visible:outline-info"
-                      onClick={() => applyFilterExample(suggestion.filterText)}
-                    >
-                      <InlineCode className="inline-block max-w-36 truncate align-middle whitespace-nowrap transition-colors hover:border-border hover:bg-surface-active hover:text-text">
-                        {suggestion.filterText}
-                      </InlineCode>
-                    </button>
-                  </span>
-                ))}
-              </div>
-            </EmptyStateText>
-          ) : (
-            <EmptyStateText
-              wrapperClassName="h-auto! mb-auto"
-              className="h-auto! py-3 px-3 text-text-subtle! text-sm leading-relaxed text-center"
-            >
-              <div>
-                No results for{" "}
-                <InlineCode className="inline-block max-w-36 truncate align-middle">
-                  {filterText.text}
-                </InlineCode>
-              </div>
-            </EmptyStateText>
-          )}
+        <div className="italic text-text-subtle p-3 text-sm text-center">
+          No results for <InlineCode>{filterText.text}</InlineCode>
        </div>
      ) : (
        <Tree
@@ -732,11 +679,7 @@ function Sidebar({ className }: { className?: string }) {
  );
 }

-// Memoized so route navigations (which re-render the workspace layout) don't
-// re-render the sidebar subtree. In large workspaces a sidebar re-render is
-// very expensive: it re-renders DndContext, whose context churn re-renders
-// every visible TreeItem regardless of their memo comparators.
-export default memo(Sidebar);
+export default Sidebar;

 function getGitContextMenuItems({
  items,
@@ -843,48 +786,7 @@ const sidebarFilterAtom = atom<{ text: string; key: string }>({
  key: "",
 });

-type SidebarFilterSuggestion = {
-  field: string;
-  filterText: string;
-};
-
-function setSidebarFilterText(text: string) {
-  jotaiStore.set(sidebarFilterAtom, { text, key: `${Math.random()}` });
-}
-
-function getSidebarSuggestionValue(ast: Ast | null) {
-  if (ast == null) return null;
-
-  if (ast.type === "Term" || ast.type === "Phrase") {
-    const value = ast.value.trim();
-    return value.length > 0 ? value : null;
-  }
-
-  if (ast.type === "Field") {
-    const value = ast.value.trim();
-    return value.length > 0 ? value : null;
-  }
-
-  return null;
-}
-
-function sidebarFieldMatchesValue(fieldValue: string, filterValue: string) {
-  return fieldValue.toLowerCase().includes(filterValue.toLowerCase());
-}
-
-const sidebarSuggestionFieldOrder = [
-  "url",
-  "folder",
-  "method",
-  "type",
-  "grpc_service",
-  "grpc_method",
-  "name",
-];
-
-const sidebarTreeAtom = atom<
-  [TreeNode<SidebarModel>, FieldDef[], SidebarFilterSuggestion[]] | null
->((get) => {
+const sidebarTreeAtom = atom<[TreeNode<SidebarModel>, FieldDef[]] | null>((get) => {
  const allModels = get(memoAllPotentialChildrenAtom);
  const activeWorkspace = get(activeWorkspaceAtom);
  const filter = get(sidebarFilterAtom);
@@ -905,11 +807,9 @@ const sidebarTreeAtom = atom<
  }

  const queryAst = parseQuery(filter.text);
-  const suggestionValue = getSidebarSuggestionValue(queryAst);

  // returns true if this node OR any child matches the filter
  const allFields: Record<string, Set<string>> = {};
-  const suggestionFields = new Set<string>();
  const build = (node: TreeNode<SidebarModel>, depth: number): boolean => {
    const childItems = childrenMap[node.item.id] ?? [];
    let matchesSelf = true;
@@ -921,13 +821,6 @@ const sidebarTreeAtom = atom<
      if (!value) continue;
      allFields[field] = allFields[field] ?? new Set();
      allFields[field].add(value);
-      if (
-        isLeafNode &&
-        suggestionValue != null &&
-        sidebarFieldMatchesValue(value, suggestionValue)
-      ) {
-        suggestionFields.add(field);
-      }
    }

    if (queryAst != null) {
@@ -981,18 +874,7 @@ const sidebarTreeAtom = atom<
      values: Array.from(values).filter((v) => v.length < 20),
    });
  }
-  const suggestions = Array.from(suggestionFields)
-    .sort((a, b) => {
-      const aIndex = sidebarSuggestionFieldOrder.indexOf(a);
-      const bIndex = sidebarSuggestionFieldOrder.indexOf(b);
-      if (aIndex === -1 && bIndex === -1) return a.localeCompare(b);
-      return (aIndex === -1 ? Infinity : aIndex) - (bIndex === -1 ? Infinity : bIndex);
-    })
-    .map((field) => ({
-      field,
-      filterText: formatFieldFilter(field, suggestionValue ?? ""),
-    }));
-  return [root, fields, suggestions] as const;
+  return [root, fields] as const;
 });

 const sidebarGitStatusByModelIdAtom = atom<Record<string, GitStatus>>((get) => {
@@ -1,82 +1,23 @@
+import { readDir } from "@tauri-apps/plugin-fs";
 import { Banner, VStack } from "@yaakapp-internal/ui";
 import { useState } from "react";
 import { openWorkspaceFromSyncDir } from "../commands/openWorkspaceFromSyncDir";
 import { Button } from "./core/Button";
 import { Checkbox } from "./core/Checkbox";
-import { SettingRowBoolean, SettingRowDirectory } from "./core/SettingRow";
 import { SelectFile } from "./SelectFile";
-import { platform } from "@yaakapp-internal/platform";

 export interface SyncToFilesystemSettingProps {
-  layout?: "form" | "settings";
  onChange: (args: { filePath: string | null; initGit?: boolean }) => void;
  onCreateNewWorkspace: () => void;
  value: { filePath: string | null; initGit?: boolean };
 }

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

      {value.filePath && typeof value.initGit === "boolean" && (
@@ -208,10 +208,10 @@ function InitializedTemplateFunctionDialog({
                )}
              />
            </HStack>
-            <div className="relative w-full max-h-40">
+            <div className="relative w-full max-h-[10rem]">
              <InlineCode
                className={classNames(
-                  "block whitespace-pre-wrap select-text! cursor-text max-h-40 overflow-auto hide-scrollbars border-text-subtlest!",
+                  "block whitespace-pre-wrap !select-text cursor-text max-h-[10rem] overflow-auto hide-scrollbars !border-text-subtlest",
                  tooLarge && "italic text-danger",
                )}
              >
@@ -246,7 +246,7 @@ function InitializedTemplateFunctionDialog({
        ) : (
          <span />
        )}
-        <div className="flex justify-stretch w-full grow gap-2 *:flex-1">
+        <div className="flex justify-stretch w-full flex-grow gap-2 [&>*]:flex-1">
          {templateFunction.data.name === "secure" && (
            <Button variant="border" color="secondary" onClick={setupOrConfigureEncryption}>
              Reveal Encryption Key
@@ -271,7 +271,7 @@ TemplateFunctionDialog.show = (
  showDialog({
    id: `template-function-${Math.random()}`, // Allow multiple at once
    size: "md",
-    className: "h-240",
+    className: "h-[60rem]",
    noPadding: true,
    title: <InlineCode>{fn.name}(…)</InlineCode>,
    description: fn.description,
@@ -94,7 +94,7 @@ export const UrlBar = memo(function UrlBar({
                  iconSize="md"
                  title="Send Request"
                  type="submit"
-                  className="w-8 mr-0.5 h-full!"
+                  className="w-8 mr-0.5 !h-full"
                  iconColor="secondary"
                  icon={isLoading ? "x" : submitIcon}
                  hotkeyAction="request.send"
@@ -1,14 +1,15 @@
+import type { HttpRequest } from "@yaakapp-internal/models";
 import { VStack } from "@yaakapp-internal/ui";
 import { useCallback, useRef } from "react";
 import { useRequestEditor, useRequestEditorEvent } from "../hooks/useRequestEditor";
-import type { EditablePair, PairEditorHandle, PairEditorProps } from "./core/PairEditor";
+import type { PairEditorHandle, PairEditorProps } from "./core/PairEditor";
 import { PairOrBulkEditor } from "./core/PairOrBulkEditor";

 type Props = {
  forceUpdateKey: string;
-  pairs: EditablePair[];
+  pairs: HttpRequest["headers"];
  stateKey: PairEditorProps["stateKey"];
-  onChange: PairEditorProps["onChange"];
+  onChange: (headers: HttpRequest["urlParameters"]) => void;
 };

 export function UrlParametersEditor({ pairs, forceUpdateKey, onChange, stateKey }: Props) {
@@ -1,10 +1,5 @@
 import type { WebsocketRequest } from "@yaakapp-internal/models";
-import {
-  flushAllModelWrites,
-  getModel,
-  patchModel,
-  patchModelDebounced,
-} from "@yaakapp-internal/models";
+import { patchModel } from "@yaakapp-internal/models";
 import type { GenericCompletionOption } from "@yaakapp-internal/plugins";
 import { closeWebsocket, connectWebsocket, sendWebsocket } from "@yaakapp-internal/ws";
 import classNames from "classnames";
@@ -13,7 +8,8 @@ import type { CSSProperties } from "react";
 import { useCallback, useMemo, useRef } from "react";
 import { getActiveCookieJar } from "../hooks/useActiveCookieJar";
 import { getActiveEnvironment } from "../hooks/useActiveEnvironment";
-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";
@@ -22,22 +18,22 @@ import { usePinnedHttpResponse } from "../hooks/usePinnedHttpResponse";
 import { activeWebsocketConnectionAtom } from "../hooks/usePinnedWebsocketConnection";
 import { useRequestEditor, useRequestEditorEvent } from "../hooks/useRequestEditor";
 import { useRequestUpdateKey } from "../hooks/useRequestUpdateKey";
+import { deepEqualAtom } from "../lib/atoms";
 import { languageFromContentType } from "../lib/contentType";
-import { derivePathPlaceholderPairs, renamePathPlaceholder } from "../lib/pathPlaceholders";
+import { generateId } from "../lib/generateId";
 import { prepareImportQuerystring } from "../lib/prepareImportQuerystring";
 import { resolvedModelName } from "../lib/resolvedModelName";
 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 { IconButton } from "./core/IconButton";
+import type { Pair } from "./core/PairEditor";
 import { PlainInput } from "./core/PlainInput";
 import type { TabItem, TabsRef } from "./core/Tabs/Tabs";
 import { setActiveTab, TabContent, Tabs } from "./core/Tabs/Tabs";
 import { HeadersEditor } from "./HeadersEditor";
 import { HttpAuthenticationEditor } from "./HttpAuthenticationEditor";
 import { MarkdownEditor } from "./MarkdownEditor";
-import { countOverriddenSettings, ModelSettingsEditor } from "./ModelSettingsEditor";
 import { UrlBar } from "./UrlBar";
 import { UrlParametersEditor } from "./UrlParameterEditor";

@@ -52,16 +48,18 @@ const TAB_MESSAGE = "message";
 const TAB_PARAMS = "params";
 const TAB_HEADERS = "headers";
 const TAB_AUTH = "auth";
-const TAB_SETTINGS = "settings";
 const TAB_DESCRIPTION = "description";
 const TABS_STORAGE_KEY = "websocket_request_tabs";

-// 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 WebsocketRequestPane({ style, fullHeight, className, activeRequest }: Props) {
  const activeRequestId = activeRequest.id;
@@ -71,7 +69,6 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
  const authTab = useAuthTab(TAB_AUTH, activeRequest);
  const headersTab = useHeadersTab(TAB_HEADERS, activeRequest);
  const inheritedHeaders = useInheritedHeaders(activeRequest);
-  const numSettingsOverrides = countOverriddenSettings(activeRequest);

  // Listen for event to focus the params tab (e.g., when clicking a :param in the URL)
  useRequestEditorEvent(
@@ -82,33 +79,22 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
    [],
  );

-  // 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("websocket_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]);

  const tabs = useMemo<TabItem[]>(() => {
    return [
@@ -123,31 +109,34 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
      },
      ...headersTab,
      ...authTab,
-      {
-        value: TAB_SETTINGS,
-        label: "Settings",
-        rightSlot: <CountBadge count={numSettingsOverrides} />,
-      },
      {
        value: TAB_DESCRIPTION,
        label: "Info",
      },
    ];
-  }, [authTab, headersTab, numSettingsOverrides, urlParameterPairs.length]);
+  }, [authTab, headersTab, urlParameterPairs.length]);

  const { activeResponse } = usePinnedHttpResponse(activeRequestId);
  const { mutate: cancelResponse } = useCancelHttpResponse(activeResponse?.id ?? null);
  const connection = useAtomValue(activeWebsocketConnectionAtom);

-  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 handleConnect = useCallback(async () => {
-    await flushAllModelWrites(); // The backend reads the request from the DB
    await connectWebsocket({
      requestId: activeRequest.id,
      environmentId: getActiveEnvironment()?.id ?? null,
@@ -157,7 +146,6 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque

  const handleSend = useCallback(async () => {
    if (connection == null) return;
-    await flushAllModelWrites(); // The backend reads the message from the DB
    await sendWebsocket({
      connectionId: connection?.id,
      environmentId: getActiveEnvironment()?.id ?? null,
@@ -170,7 +158,7 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
  }, [connection]);

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

@@ -222,7 +210,7 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
                    title="Close connection"
                    icon="x"
                    iconColor="secondary"
-                    className="w-8 mr-0.5 h-full!"
+                    className="w-8 mr-0.5 !h-full"
                    onClick={handleCancel}
                  />
                )
@@ -241,7 +229,7 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
            ref={tabsRef}
            label="Request"
            tabs={tabs}
-            tabListClassName="mt-1 mb-1.5!"
+            tabListClassName="mt-1 !mb-1.5"
            storageKey={TABS_STORAGE_KEY}
            activeTabKey={activeRequestId}
          >
@@ -254,7 +242,7 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
                forceUpdateKey={forceUpdateKey}
                headers={activeRequest.headers}
                stateKey={`headers.${activeRequest.id}`}
-                onChange={(headers) => patchModelDebounced(activeRequest, { headers })}
+                onChange={(headers) => patchModel(activeRequest, { headers })}
              />
            </TabContent>
            <TabContent value={TAB_PARAMS}>
@@ -262,7 +250,7 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
                stateKey={`params.${activeRequest.id}`}
                forceUpdateKey={forceUpdateKey + urlParametersKey}
                pairs={urlParameterPairs}
-                onChange={(urlParameters) => patchModelDebounced(activeRequest, { urlParameters })}
+                onChange={(urlParameters) => patchModel(activeRequest, { urlParameters })}
              />
            </TabContent>
            <TabContent value={TAB_MESSAGE}>
@@ -274,13 +262,10 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
                heightMode={fullHeight ? "full" : "auto"}
                defaultValue={activeRequest.message}
                language={messageLanguage}
-                onChange={(message) => patchModelDebounced(activeRequest, { message })}
+                onChange={(message) => patchModel(activeRequest, { message })}
                stateKey={`json.${activeRequest.id}`}
              />
            </TabContent>
-            <TabContent value={TAB_SETTINGS}>
-              <ModelSettingsEditor model={activeRequest} />
-            </TabContent>
            <TabContent value={TAB_DESCRIPTION}>
              <div className="grid grid-rows-[auto_minmax(0,1fr)] h-full">
                <PlainInput
@@ -288,10 +273,10 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
                  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"
@@ -299,7 +284,7 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
                  defaultValue={activeRequest.description}
                  stateKey={`description.${activeRequest.id}`}
                  forceUpdateKey={forceUpdateKey}
-                  onChange={(description) => patchModelDebounced(activeRequest, { description })}
+                  onChange={(description) => patchModel(activeRequest, { description })}
                />
              </div>
            </TabContent>
@@ -105,18 +105,10 @@ function WebsocketEventRow({
    : "";

  const iconColor =
-    messageType === "error"
-      ? "warning"
-      : messageType === "close" || messageType === "open"
-        ? "secondary"
-        : isServer
-          ? "info"
-          : "primary";
+    messageType === "close" || messageType === "open" ? "secondary" : isServer ? "info" : "primary";

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

  const actions: EventDetailAction[] =
    message !== ""
@@ -1,4 +1,4 @@
-import { platform } from "@yaakapp-internal/platform";
+import { type } from "@tauri-apps/plugin-os";
 import { settingsAtom, workspacesAtom } from "@yaakapp-internal/models";
 import { Banner, HeaderSize, HStack, SidebarLayout } from "@yaakapp-internal/ui";
 import classNames from "classnames";
@@ -6,7 +6,6 @@ import { useAtomValue } from "jotai";
 import * as m from "motion/react-m";
 import { useMemo, useState } from "react";
 import {
-  getActiveCookieJar,
  useEnsureActiveCookieJar,
  useSubscribeActiveCookieJarId,
 } from "../hooks/useActiveCookieJar";
@@ -34,7 +33,6 @@ import { jotaiStore } from "../lib/jotai";
 import { CreateDropdown } from "./CreateDropdown";
 import { Button } from "./core/Button";
 import { HotkeyList } from "./core/HotkeyList";
-import { CookieDialog } from "./CookieDialog";
 import { FeedbackLink } from "./core/Link";
 import { ErrorBoundary } from "./ErrorBoundary";
 import { FolderLayout } from "./FolderLayout";
@@ -53,7 +51,7 @@ export function Workspace() {

  const workspaces = useAtomValue(workspacesAtom);
  const settings = useAtomValue(settingsAtom);
-  const osType = platform.osType();
+  const osType = type();
  const [width, setWidth] = useSidebarWidth();
  const [sidebarHidden, setSidebarHidden] = useSidebarHidden();
  const [floatingSidebarHidden, setFloatingSidebarHidden] = useFloatingSidebarHidden();
@@ -85,7 +83,7 @@ export function Workspace() {
        <div style={environmentBgStyle} className="absolute inset-0 opacity-[0.07]" />
        <div
          style={environmentBgStyle}
-          className="absolute left-0 right-0 -bottom-px h-px opacity-20"
+          className="absolute left-0 right-0 -bottom-[1px] h-[1px] opacity-20"
        />
      </div>
      <WorkspaceHeader className="pointer-events-none" floatingSidebar={floating} />
@@ -162,7 +160,7 @@ function WorkspaceBody() {
        // Delay the entering because the workspaces might load after a slight delay
        transition={{ delay: 0.5 }}
      >
-        <Banner color="warning" className="max-w-120">
+        <Banner color="warning" className="max-w-[30rem]">
          The active workspace was not found. Select a workspace from the header menu or report this
          bug to <FeedbackLink />
        </Banner>
@@ -220,8 +218,4 @@ function useGlobalWorkspaceHooks() {
  useHotKey("model.duplicate", () =>
    duplicateRequestOrFolderAndNavigate(jotaiStore.get(activeRequestAtom)),
  );
-
-  useHotKey("cookies_editor.show", () => CookieDialog.show(getActiveCookieJar()?.id ?? null), {
-    enable: () => getActiveCookieJar() != null,
-  });
 }
@@ -1,3 +1,5 @@
+import { open } from "@tauri-apps/plugin-dialog";
+import { revealItemInDir } from "@tauri-apps/plugin-opener";
 import { getModel, settingsAtom, workspacesAtom } from "@yaakapp-internal/models";
 import classNames from "classnames";
 import { useAtomValue } from "jotai";
@@ -14,7 +16,6 @@ import { useCreateWorkspace } from "../hooks/useCreateWorkspace";
 import { useDeleteSendHistory } from "../hooks/useDeleteSendHistory";
 import { useWorkspaceActions } from "../hooks/useWorkspaceActions";
 import { showDialog } from "../lib/dialog";
-import { importData } from "../lib/importData";
 import { jotaiStore } from "../lib/jotai";
 import { revealInFinderText } from "../lib/reveal";
 import { CloneGitRepositoryDialog } from "./CloneGitRepositoryDialog";
@@ -25,7 +26,6 @@ import { Icon } from "@yaakapp-internal/ui";
 import type { RadioDropdownItem } from "./core/RadioDropdown";
 import { RadioDropdown } from "./core/RadioDropdown";
 import { SwitchWorkspaceDialog } from "./SwitchWorkspaceDialog";
-import { platform } from "@yaakapp-internal/platform";

 type Props = Pick<ButtonProps, "className" | "justify" | "forDropdown" | "leftSlot">;

@@ -75,7 +75,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
            label: "Open Folder",
            leftSlot: <Icon icon="folder_open" />,
            onSelect: async () => {
-              const dir = await platform.dialog.open({
+              const dir = await open({
                title: "Select Workspace Directory",
                directory: true,
                multiple: false,
@@ -90,11 +90,6 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
            leftSlot: <Icon icon="hard_drive_download" />,
            onSelect: openCloneGitRepositoryDialog,
          },
-          {
-            label: "Import Data",
-            leftSlot: <Icon icon="folder_input" />,
-            onSelect: () => importData.mutate(),
-          },
        ],
      },
    ];
@@ -119,7 +114,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
        leftSlot: <Icon icon="folder_symlink" />,
        onSelect: async () => {
          if (workspaceMeta?.settingSyncDir == null) return;
-          await platform.revealItemInDir(workspaceMeta.settingSyncDir);
+          await revealItemInDir(workspaceMeta.settingSyncDir);
        },
      },
      {
@@ -181,7 +176,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
        size="sm"
        className={classNames(
          className,
-          "text px-2! truncate",
+          "text !px-2 truncate",
          workspace === null && "italic opacity-disabled",
        )}
        {...buttonProps}
@@ -20,24 +20,16 @@ import { IconButton } from "./core/IconButton";
 import { IconTooltip } from "./core/IconTooltip";
 import { Label } from "./core/Label";
 import { PlainInput } from "./core/PlainInput";
-import { SettingRow } from "./core/SettingRow";
 import { EncryptionHelp } from "./EncryptionHelp";

 interface Props {
-  layout?: "form" | "settings";
  size?: ButtonProps["size"];
  expanded?: boolean;
  onDone?: () => void;
  onEnabledEncryption?: () => void;
 }

-export function WorkspaceEncryptionSetting({
-  layout = "form",
-  size,
-  expanded,
-  onDone,
-  onEnabledEncryption,
-}: Props) {
+export function WorkspaceEncryptionSetting({ size, expanded, onDone, onEnabledEncryption }: Props) {
  const [justEnabledEncryption, setJustEnabledEncryption] = useState<boolean>(false);
  const [error, setError] = useState<string | null>(null);

@@ -74,7 +66,7 @@ export function WorkspaceEncryptionSetting({
    key.error != null ||
    (workspace.encryptionKeyChallenge && workspaceMeta.encryptionKey == null)
  ) {
-    const enterKey = (
+    return (
      <EnterWorkspaceKey
        workspaceMeta={workspaceMeta}
        error={key.error}
@@ -87,8 +79,6 @@ export function WorkspaceEncryptionSetting({
        }}
      />
    );
-
-    return enterKey;
  }

  // Show the key if it exists
@@ -100,8 +90,7 @@ export function WorkspaceEncryptionSetting({
        encryptionKey={key.key}
      />
    );
-
-    const content = (
+    return (
      <VStack space={2} className="w-full">
        {justEnabledEncryption && (
          <Banner color="success" className="flex flex-col gap-2">
@@ -122,43 +111,9 @@ export function WorkspaceEncryptionSetting({
        )}
      </VStack>
    );
-
-    return content;
  }

  // Show button to enable encryption
-  if (layout === "settings") {
-    return (
-      <>
-        {error && (
-          <Banner color="danger" className="mb-3">
-            {error}
-          </Banner>
-        )}
-        <SettingRow
-          title="Workspace encryption"
-          description="Encrypt workspace secrets and sensitive values at rest."
-        >
-          <Button
-            color="secondary"
-            size={size}
-            onClick={async () => {
-              setError(null);
-              try {
-                await enableEncryption(workspaceMeta.workspaceId);
-                setJustEnabledEncryption(true);
-              } catch (err) {
-                setError(`Failed to enable encryption: ${String(err)}`);
-              }
-            }}
-          >
-            Enable Encryption
-          </Button>
-        </SettingRow>
-      </>
-    );
-  }
-
  return (
    <div className="mb-auto flex flex-col-reverse">
      <Button
@@ -324,7 +279,7 @@ function KeyRevealer({

 function HighlightedKey({ keyText, show }: { keyText: string; show: boolean }) {
  return (
-    <span className="text-xs font-mono **:cursor-auto **:select-text">
+    <span className="text-xs font-mono [&_*]:cursor-auto [&_*]:select-text">
      {show ? (
        keyText.split("").map((c, i) => {
          return (
@@ -10,7 +10,7 @@ import { CookieDropdown } from "./CookieDropdown";
 import { IconButton } from "./core/IconButton";
 import { PillButton } from "./core/PillButton";
 import { EnvironmentActionsDropdown } from "./EnvironmentActionsDropdown";
-import { ImportCurl } from "./ImportCurl";
+import { ImportCurlButton } from "./ImportCurlButton";
 import { LicenseBadge } from "./LicenseBadge";
 import { RecentRequestsDropdown } from "./RecentRequestsDropdown";
 import { SettingsDropdown } from "./SettingsDropdown";
@@ -56,7 +56,7 @@ export const WorkspaceHeader = memo(function WorkspaceHeader({
        <RecentRequestsDropdown />
      </div>
      <div className="flex-1 flex gap-1 items-center h-full justify-end pointer-events-none pr-1">
-        <ImportCurl />
+        <ImportCurlButton />
        {showEncryptionSetup ? (
          <PillButton color="danger" onClick={setupOrConfigureEncryption}>
            Enter Encryption Key
@@ -1,23 +1,20 @@
 import { patchModel, workspaceMetasAtom, workspacesAtom } from "@yaakapp-internal/models";
-import { Banner, HStack, InlineCode } from "@yaakapp-internal/ui";
+import { Banner, HStack, InlineCode, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
 import { useAuthTab } from "../hooks/useAuthTab";
 import { useHeadersTab } from "../hooks/useHeadersTab";
 import { useInheritedHeaders } from "../hooks/useInheritedHeaders";
 import { deleteModelWithConfirm } from "../lib/deleteModelWithConfirm";
-import { showDialog } from "../lib/dialog";
 import { router } from "../lib/router";
 import { CopyIconButton } from "./CopyIconButton";
 import { Button } from "./core/Button";
 import { CountBadge } from "./core/CountBadge";
 import { PlainInput } from "./core/PlainInput";
-import { SettingsList, SettingsSection } from "./core/SettingRow";
 import { TabContent, Tabs } from "./core/Tabs/Tabs";
 import { DnsOverridesEditor } from "./DnsOverridesEditor";
 import { HeadersEditor } from "./HeadersEditor";
 import { HttpAuthenticationEditor } from "./HttpAuthenticationEditor";
 import { MarkdownEditor } from "./MarkdownEditor";
-import { ModelSettingsEditor } from "./ModelSettingsEditor";
 import { SyncToFilesystemSetting } from "./SyncToFilesystemSetting";
 import { WorkspaceEncryptionSetting } from "./WorkspaceEncryptionSetting";

@@ -28,17 +25,17 @@ interface Props {
 }

 const TAB_AUTH = "auth";
+const TAB_DATA = "data";
 const TAB_DNS = "dns";
 const TAB_HEADERS = "headers";
 const TAB_GENERAL = "general";
-const TAB_SETTINGS = "settings";

 export type WorkspaceSettingsTab =
  | typeof TAB_AUTH
  | typeof TAB_DNS
  | typeof TAB_HEADERS
  | typeof TAB_GENERAL
-  | typeof TAB_SETTINGS;
+  | typeof TAB_DATA;

 const DEFAULT_TAB: WorkspaceSettingsTab = TAB_GENERAL;

@@ -74,8 +71,8 @@ export function WorkspaceSettingsDialog({ workspaceId, hide, tab }: Props) {
      tabs={[
        { value: TAB_GENERAL, label: "Workspace" },
        {
-          value: TAB_SETTINGS,
-          label: "Settings",
+          value: TAB_DATA,
+          label: "Storage",
        },
        ...headersTab,
        ...authTab,
@@ -103,22 +100,6 @@ export function WorkspaceSettingsDialog({ workspaceId, hide, tab }: Props) {
          stateKey={`headers.${workspace.id}`}
        />
      </TabContent>
-      <TabContent value={TAB_SETTINGS} className="overflow-y-auto h-full px-4">
-        <SettingsList className="space-y-8 pb-3">
-          <SettingsSection title={null}>
-            <SyncToFilesystemSetting
-              layout="settings"
-              value={{ filePath: workspaceMeta.settingSyncDir }}
-              onCreateNewWorkspace={hide}
-              onChange={({ filePath }) => patchModel(workspaceMeta, { settingSyncDir: filePath })}
-            />
-            <div className="mt-4">
-              <WorkspaceEncryptionSetting layout="settings" size="xs" />
-            </div>
-          </SettingsSection>
-          <ModelSettingsEditor model={workspace} showSectionTitles />
-        </SettingsList>
-      </TabContent>
      <TabContent value={TAB_GENERAL} className="overflow-y-auto h-full px-4">
        <div className="grid grid-rows-[auto_minmax(0,1fr)_auto] gap-4 pb-3 h-full">
          <PlainInput
@@ -127,7 +108,7 @@ export function WorkspaceSettingsDialog({ workspaceId, hide, tab }: Props) {
            placeholder="Workspace Name"
            label="Name"
            defaultValue={workspace.name}
-            className="text-base! font-sans"
+            className="!text-base font-sans"
            onChange={(name) => patchModel(workspace, { name })}
          />

@@ -161,7 +142,7 @@ export function WorkspaceSettingsDialog({ workspaceId, hide, tab }: Props) {
            <InlineCode className="flex gap-1 items-center text-primary pl-2.5">
              {workspaceId}
              <CopyIconButton
-                className="opacity-70 text-primary!"
+                className="opacity-70 !text-primary"
                size="2xs"
                iconSize="sm"
                title="Copy workspace ID"
@@ -171,21 +152,19 @@ export function WorkspaceSettingsDialog({ workspaceId, hide, tab }: Props) {
          </HStack>
        </div>
      </TabContent>
+      <TabContent value={TAB_DATA} className="overflow-y-auto h-full px-4">
+        <VStack space={4} alignItems="start" className="pb-3 h-full">
+          <SyncToFilesystemSetting
+            value={{ filePath: workspaceMeta.settingSyncDir }}
+            onCreateNewWorkspace={hide}
+            onChange={({ filePath }) => patchModel(workspaceMeta, { settingSyncDir: filePath })}
+          />
+          <WorkspaceEncryptionSetting size="xs" />
+        </VStack>
+      </TabContent>
      <TabContent value={TAB_DNS} className="overflow-y-auto h-full px-4">
        <DnsOverridesEditor workspace={workspace} />
      </TabContent>
    </Tabs>
  );
 }
-
-WorkspaceSettingsDialog.show = (workspaceId: string, tab?: WorkspaceSettingsTab) => {
-  showDialog({
-    id: "workspace-settings",
-    size: "lg",
-    className: "h-[calc(100vh-5rem)] max-h-200!",
-    noPadding: true,
-    render: ({ hide }) => (
-      <WorkspaceSettingsDialog workspaceId={workspaceId} hide={hide} tab={tab} />
-    ),
-  });
-};
@@ -72,7 +72,7 @@ export function AutoScroller<T>({
            size="sm"
            iconSize="md"
            variant="border"
-            className="bg-surface! z-10"
+            className="!bg-surface z-10"
            onClick={() => setAutoScroll((v) => !v)}
          />
        </div>
@@ -80,7 +80,7 @@ export function AutoScroller<T>({
      {header ?? <span aria-hidden />}
      <div
        ref={containerRef}
-        className="h-full w-full overflow-y-auto focus:outline-hidden"
+        className="h-full w-full overflow-y-auto focus:outline-none"
        onScroll={handleScroll}
        tabIndex={focusable ? 0 : undefined}
      >
@@ -1,36 +0,0 @@
-import { describe, expect, test } from "vite-plus/test";
-import { parseBulkPairLine } from "./BulkPairEditor";
-
-describe("parseBulkPairLine", () => {
-  test("parses colon-space pairs as name and value", () => {
-    expect(parseBulkPairLine("foo: bar")).toMatchObject({
-      enabled: true,
-      name: "foo",
-      value: "bar",
-    });
-  });
-
-  test("preserves colon-without-space lines as a name with an empty value", () => {
-    expect(parseBulkPairLine("foo:bar")).toMatchObject({
-      enabled: true,
-      name: "foo:bar",
-      value: "",
-    });
-  });
-
-  test("preserves malformed lines instead of dropping their contents", () => {
-    expect(parseBulkPairLine("not a pair")).toMatchObject({
-      enabled: true,
-      name: "not a pair",
-      value: "",
-    });
-  });
-
-  test("unescapes newlines in parsed values", () => {
-    expect(parseBulkPairLine("foo: bar\\nbaz")).toMatchObject({
-      enabled: true,
-      name: "foo",
-      value: "bar\nbaz",
-    });
-  });
-});
@@ -17,7 +17,7 @@ export function BulkPairEditor({
  const pairsText = useMemo(() => {
    return pairs
      .filter((p) => !(p.name.trim() === "" && p.value.trim() === ""))
-      .map(formatBulkPairLine)
+      .map(pairToLine)
      .join("\n");
  }, [pairs]);

@@ -26,7 +26,7 @@ export function BulkPairEditor({
      const pairs = text
        .split("\n")
        .filter((l: string) => l.trim())
-        .map(parseBulkPairLine);
+        .map(lineToPair);
      onChange(pairs);
    },
    [onChange],
@@ -47,16 +47,16 @@ export function BulkPairEditor({
  );
 }

-export function formatBulkPairLine(pair: Pair) {
+function pairToLine(pair: Pair) {
  const value = pair.value.replaceAll("\n", "\\n");
  return `${pair.name}: ${value}`;
 }

-export function parseBulkPairLine(line: string): PairWithId {
-  const [, name, value] = line.match(/^([^:]+):\s+(.*)$/) ?? [];
+function lineToPair(line: string): PairWithId {
+  const [, name, value] = line.match(/^(:?[^:]+):\s+(.*)$/) ?? [];
  return {
    enabled: true,
-    name: (name ?? line).trim(),
+    name: (name ?? "").trim(),
    value: (value ?? "").replaceAll("\\n", "\n").trim(),
    id: generateId(),
  };
@@ -13,7 +13,6 @@ export interface CheckboxProps {
  hideLabel?: boolean;
  fullWidth?: boolean;
  help?: ReactNode;
-  size?: "sm" | "md";
 }

 export function Checkbox({
@@ -26,7 +25,6 @@ export function Checkbox({
  hideLabel,
  fullWidth,
  help,
-  size = "sm",
 }: CheckboxProps) {
  return (
    <HStack
@@ -39,10 +37,8 @@ export function Checkbox({
        <input
          aria-hidden
          className={classNames(
-            "appearance-none shrink-0 border border-border",
-            size === "sm" && "w-4 h-4",
-            size === "md" && "w-5 h-5",
-            "rounded-sm outline-hidden ring-0",
+            "appearance-none w-4 h-4 flex-shrink-0 border border-border",
+            "rounded outline-none ring-0",
            !disabled && "hocus:border-border-focus hocus:bg-focus/[5%]",
            disabled && "border-dotted",
          )}
@@ -54,7 +50,7 @@ export function Checkbox({
        />
        <div className="absolute inset-0 flex items-center justify-center">
          <Icon
-            size={size}
+            size="sm"
            className={classNames(disabled && "opacity-disabled")}
            icon={checked === "indeterminate" ? "minus" : checked ? "check" : "empty"}
          />
@@ -17,7 +17,7 @@ export function ColorPicker({ onChange, color, className }: Props) {
    <div className={className}>
      <HexColorPicker
        color={color ?? undefined}
-        className="w-full!"
+        className="!w-full"
        onChange={(color) => {
          onChange(color);
          regenerateKey(); // To force input to change
@@ -96,7 +96,7 @@ export function ColorPickerWithThemeColors({ onChange, color, className }: Props
        <>
          <HexColorPicker
            color={color ?? undefined}
-            className="w-full!"
+            className="!w-full"
            onChange={(color) => {
              onChange(color);
              regenerateKey(); // To force input to change
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gregory Schier	ab785b18a4	Merge branch 'main' into codex-review/pr-457	2026-05-14 07:57:35 -07:00
Stijn Brouwers	947e3f2e97	Merge branch 'main' into feature/manual-cookies	2026-05-08 09:50:24 +02:00
Stijn BROUWERS	8b1f5e807f	feat(cookies): Allow manually creating cookies	2026-05-07 19:56:49 +02:00