Use baseUrl variable for OpenAPI imports

.claude/commands/release/generate-release-notes.md

@@ -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".

.codex/skills/release-generate-release-notes/SKILL.md

@@ -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.
 

.codex/skills/yaak-changelog/SKILL.md

@@ -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`.

.codex/skills/yaak-changelog/agents/openai.yaml

@@ -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

.github/pull_request_template.md

@@ -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/... -->
 

.github/scripts/check-contribution-policy.js

@@ -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,
-};

.github/workflows/ci.yml

@@ -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

.github/workflows/claude.yml

@@ -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:*)'

.github/workflows/contribution-policy.yml

@@ -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 });

.github/workflows/flathub.yml

@@ -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

.github/workflows/release-api-npm.yml

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

.github/workflows/release-app.yml

@@ -5,7 +5,6 @@ on:
 
 jobs:
   build-artifacts:
-    if: github.repository == 'mountain-loop/yaak'
     permissions:
       contents: write
 
@@ -15,59 +14,35 @@ 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: 40
@@ -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"

.github/workflows/release-cli-npm.yml

@@ -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

.github/workflows/sponsors.yml

@@ -7,7 +7,6 @@ permissions:
   contents: write
 jobs:
   deploy:
-    if: github.repository == 'mountain-loop/yaak'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️

.gitignore

@@ -58,4 +58,3 @@ flatpak/node-sources.json
 
 # Claude Code local settings
 .claude/settings.local.json
-.claude/worktrees/

AGENTS.md

@@ -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

CONTRIBUTING.md

@@ -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
 

Cargo.toml

@@ -31,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",
 ]
@@ -48,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"
@@ -89,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" }

README.md

@@ -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

apps/yaak-client/commands/openFolderSettings.tsx

@@ -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} />,
   });

apps/yaak-client/components/BinaryFileEditor.tsx

@@ -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?

apps/yaak-client/components/CloneGitRepositoryDialog.tsx

@@ -4,7 +4,6 @@ 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";
@@ -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}

apps/yaak-client/components/ColorIndicator.tsx

@@ -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) {

apps/yaak-client/components/CommandPaletteDialog.tsx

@@ -439,7 +439,7 @@ export function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
           name="command"
           label="Command"
           placeholder="Search or type a command"
-          className="font-sans text-base!"
+          className="font-sans !text-base"
           defaultValue={command}
           onChange={handleSetCommand}
           onKeyDownCapture={handleKeyDown}
@@ -448,7 +448,7 @@ export function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
       <div className="h-full px-1.5 overflow-y-auto pt-2 pb-1">
         {filteredGroups.map((g) => (
           <div key={g.key} className="mb-1.5 w-full">
-            <Heading level={2} className="text-xs! uppercase px-1.5 h-sm flex items-center">
+            <Heading level={2} className="!text-xs uppercase px-1.5 h-sm flex items-center">
               {g.label}
             </Heading>
             {g.items.map((v) => (
@@ -491,7 +491,7 @@ function CommandPaletteItem({
       color="custom"
       justify="start"
       className={classNames(
-        "w-full h-sm flex items-center rounded-sm px-1.5",
+        "w-full h-sm flex items-center rounded px-1.5",
         "hover:text-text",
         active && "bg-surface-highlight",
         !active && "text-text-subtle",

apps/yaak-client/components/CommercialUseBanner.tsx

@@ -1,130 +0,0 @@
-import { invoke } from "@tauri-apps/api/core";
-import { openUrl } from "@tauri-apps/plugin-opener";
-import type { LicenseCheckStatus } 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";
-
-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 invoke<LicenseCheckStatus>("plugin:yaak-license|check");
-    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 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;
-}

apps/yaak-client/components/ContextMenus.tsx

@@ -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>
-      ))}
-    </>
-  );
-}

apps/yaak-client/components/CookieDialog.tsx

@@ -155,7 +155,7 @@ export const CookieDialog = ({ cookieJarId }: Props) => {
           rightSlot={
             filter.length > 0 && (
               <IconButton
-                className="bg-transparent! h-auto! min-h-full opacity-50 hover:opacity-100 -mr-1"
+                className="!bg-transparent !h-auto min-h-full opacity-50 hover:opacity-100 -mr-1"
                 icon="x"
                 title="Clear filter"
                 onClick={() => {
@@ -239,7 +239,7 @@ export const CookieDialog = ({ cookieJarId }: Props) => {
                         <TableCell className={classNames("pl-2", isSelected && "rounded-l")}>
                           {c.name}
                         </TableCell>
-                        <TruncatedWideTableCell className="min-w-40">
+                        <TruncatedWideTableCell className="min-w-[10rem]">
                           {c.value}
                         </TruncatedWideTableCell>
                         <TableCell>{cookieDomain(c)}</TableCell>
@@ -547,7 +547,7 @@ function CookieEditor({
 }
 
 function CookieKeyValueRow({ labelClassName, ...props }: ComponentProps<typeof KeyValueRow>) {
-  return <KeyValueRow labelClassName={classNames("w-28", labelClassName)} {...props} />;
+  return <KeyValueRow labelClassName={classNames("w-[7rem]", labelClassName)} {...props} />;
 }
 
 function CookieTextInput({
@@ -589,7 +589,7 @@ function CookieTextarea({ onChange, value }: { onChange: (value: string) => void
     <textarea
       autoCapitalize="off"
       autoCorrect="off"
-      className={classNames(cookieInputClassName, "min-h-20 resize-y")}
+      className={classNames(cookieInputClassName, "min-h-[5rem] resize-y")}
       onChange={(event) => onChange(event.target.value)}
       value={value}
     />
@@ -600,7 +600,7 @@ const NEW_COOKIE_KEY = "__new-cookie__";
 const NON_EMPTY_INPUT_PATTERN = ".*\\S.*";
 const cookieInputClassName = classNames(
   "x-theme-input w-full min-w-0 min-h-sm rounded-md bg-transparent",
-  "border border-border-subtle outline-hidden",
+  "border border-border-subtle outline-none",
   "px-2 text-xs font-mono cursor-text placeholder:text-placeholder",
   "focus:border-border-focus invalid:border-danger",
   "disabled:opacity-disabled disabled:border-dotted",

apps/yaak-client/components/DnsOverridesEditor.tsx

@@ -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>
 

apps/yaak-client/components/DropMarker.tsx

@@ -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>

apps/yaak-client/components/DynamicForm.tsx

@@ -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}

apps/yaak-client/components/EnvironmentActionsDropdown.tsx

@@ -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.

apps/yaak-client/components/EnvironmentEditDialog.tsx

@@ -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}

apps/yaak-client/components/ExportDataDialog.tsx

@@ -8,7 +8,6 @@ import slugify from "slugify";
 import { activeWorkspaceAtom } from "../hooks/useActiveWorkspace";
 import { pluralizeCount } from "../lib/pluralize";
 import { invokeCmd } from "../lib/tauri";
-import { CommercialUseBanner } from "./CommercialUseBanner";
 import { Button } from "./core/Button";
 import { Checkbox } from "./core/Checkbox";
 import { DetailsBanner } from "./core/DetailsBanner";
@@ -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>

apps/yaak-client/components/FeedbackToast.tsx

@@ -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 { invokeCmd } from "../lib/tauri";
-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
-    invokeCmd("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>
-  );
-}

apps/yaak-client/components/FolderLayout.tsx

@@ -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" />}

apps/yaak-client/components/FolderSettingsDialog.tsx

@@ -84,12 +84,12 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
   return (
     <div className="h-full flex flex-col">
       <div className="flex items-center gap-3 px-6 pr-10 mt-4 mb-2 min-w-0 text-xl">
-        <Icon icon="folder_cog" size="lg" color="secondary" className="shrink-0" />
+        <Icon icon="folder_cog" size="lg" color="secondary" className="flex-shrink-0" />
         <div className="flex items-center gap-1.5 font-semibold text-text min-w-0 overflow-hidden flex-1">
           {breadcrumbs.map((item, index) => (
             <Fragment key={item.id}>
               {index > 0 && (
-                <Icon icon="chevron_right" size="lg" className="opacity-50 shrink-0" />
+                <Icon icon="chevron_right" size="lg" className="opacity-50 flex-shrink-0" />
               )}
               <span className="text-text-subtle truncate min-w-0" title={item.name}>
                 {item.name}
@@ -97,7 +97,7 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
             </Fragment>
           ))}
           {breadcrumbs.length > 0 && (
-            <Icon icon="chevron_right" size="lg" className="opacity-50 shrink-0" />
+            <Icon icon="chevron_right" size="lg" className="opacity-50 flex-shrink-0" />
           )}
           <span className="whitespace-nowrap" title={folder.name}>
             {folder.name}
@@ -149,7 +149,7 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
               <InlineCode className="flex gap-1 items-center text-primary pl-2.5">
                 {folder.id}
                 <CopyIconButton
-                  className="opacity-70 text-primary!"
+                  className="opacity-70 !text-primary"
                   size="2xs"
                   iconSize="sm"
                   title="Copy folder ID"

apps/yaak-client/components/GrpcEditor.tsx

@@ -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={

apps/yaak-client/components/GrpcRequestPane.tsx

@@ -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";
@@ -80,13 +75,11 @@ export function GrpcRequestPane({
   const { width: paneWidth } = useContainerSize(urlContainerEl);
 
   const handleChangeUrl = useCallback(
-    (url: string) => patchModelDebounced(activeRequest, { url }),
+    (url: string) => patchModel(activeRequest, { url }),
     [activeRequest],
   );
 
   const handleChangeMessage = useCallback(
-    // Not debounced: handleSend reads message from the store, so a pending
-    // debounced patch would send stale text
     (message: string) => patchModel(activeRequest, { message }),
     [activeRequest],
   );
@@ -153,12 +146,12 @@ export function GrpcRequestPane({
   );
 
   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 +162,7 @@ export function GrpcRequestPane({
         className={classNames(
           "grid grid-cols-[minmax(0,1fr)_auto] gap-1.5",
           paneWidth === 0 && "opacity-0",
-          paneWidth > 0 && paneWidth < 400 && "grid-cols-1!",
+          paneWidth > 0 && paneWidth < 400 && "!grid-cols-1",
         )}
       >
         <UrlBar
@@ -208,7 +201,7 @@ export function GrpcRequestPane({
               rightSlot={<Icon size="sm" icon="chevron_down" />}
               disabled={isStreaming || services == null}
               className={classNames(
-                "font-mono text-editor min-w-20 ring-0!",
+                "font-mono text-editor min-w-[5rem] !ring-0",
                 paneWidth < 400 && "flex-1",
               )}
             >
@@ -266,7 +259,7 @@ export function GrpcRequestPane({
       <Tabs
         label="Request"
         tabs={tabs}
-        tabListClassName="mt-1 mb-1.5!"
+        tabListClassName="mt-1 !mb-1.5"
         storageKey="grpc_request_tabs"
         activeTabKey={activeRequest.id}
       >
@@ -303,10 +296,10 @@ export function GrpcRequestPane({
               hideLabel
               forceUpdateKey={forceUpdateKey}
               defaultValue={activeRequest.name}
-              className="font-sans text-xl! px-0!"
+              className="font-sans !text-xl !px-0"
               containerClassName="border-0"
               placeholder={resolvedModelName(activeRequest)}
-              onChange={(name) => patchModelDebounced(activeRequest, { name })}
+              onChange={(name) => patchModel(activeRequest, { name })}
             />
             <MarkdownEditor
               name="request-description"

apps/yaak-client/components/HeadersEditor.tsx

@@ -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 };
 };
 

apps/yaak-client/components/HttpAuthenticationEditor.tsx

@@ -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>
       }

apps/yaak-client/components/HttpRequestLayout.tsx

@@ -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}
           />
         )}

apps/yaak-client/components/HttpRequestPane.tsx

@@ -1,11 +1,12 @@
 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 { 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";
@@ -15,10 +16,9 @@ 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";
@@ -74,12 +74,15 @@ const TAB_SETTINGS = "settings";
 const TAB_DESCRIPTION = "description";
 const TABS_STORAGE_KEY = "http_request_tabs";
 
-// Derived from the identity-stable URL list so this only recomputes when a URL
-// actually changes. The active request's own URL is included, but exact matches
-// are filtered out at completion time by genericCompletion.
-const requestUrlOptionsAtom = atom((get): GenericCompletionOption[] =>
-  get(allRequestUrlsAtom).map((url) => ({ type: "constant", label: url })),
-);
+const nonActiveRequestUrlsAtom = atom((get) => {
+  const activeRequestId = get(activeRequestIdAtom);
+  const requests = get(allRequestsAtom);
+  return requests
+    .filter((r) => r.id !== activeRequestId)
+    .map((r): GenericCompletionOption => ({ type: "constant", label: r.url }));
+});
+
+const memoNotActiveRequestUrlsAtom = deepEqualAtom(nonActiveRequestUrlsAtom);
 
 export function HttpRequestPane({ style, fullHeight, className, activeRequest }: Props) {
   const activeRequestId = activeRequest.id;
@@ -127,33 +130,22 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
     [activeRequest],
   );
 
-  // Renaming a path placeholder has to rewrite the URL and rename the parameter together, or the
-  // value detaches from the placeholder.
-  // NOTE: Reads the request fresh rather than closing over `activeRequest`. The row that calls this
-  //  holds onto it until the URL's placeholders change, so a captured request would go stale and
-  //  patch its parameter list back over newer edits.
-  const handleRenamePathPlaceholder = useCallback(
-    (oldName: string, newName: string) => {
-      const request = getModel("http_request", activeRequestId);
-      if (request == null) return false;
-
-      const patch = renamePathPlaceholder(request, oldName, newName);
-      if (patch == null) return false; // Unusable name, so the editor reverts the field
-      void patchModel(request, patch);
-      return true;
-    },
-    [activeRequestId],
-  );
-
-  const { urlParameterPairs, urlParametersKey } = useMemo(
-    () =>
-      derivePathPlaceholderPairs(
-        activeRequest.url,
-        activeRequest.urlParameters,
-        handleRenamePathPlaceholder,
-      ),
-    [activeRequest.url, activeRequest.urlParameters, handleRenamePathPlaceholder],
-  );
+  const { urlParameterPairs, urlParametersKey } = useMemo(() => {
+    const placeholderNames = Array.from(activeRequest.url.matchAll(/\/(:[^/]+)/g)).map(
+      (m) => m[1] ?? "",
+    );
+    const nonEmptyParameters = activeRequest.urlParameters.filter((p) => p.name || p.value);
+    const items: Pair[] = [...nonEmptyParameters];
+    for (const name of placeholderNames) {
+      const item = items.find((p) => p.name === name);
+      if (item) {
+        item.readOnlyName = true;
+      } else {
+        items.push({ name, value: "", enabled: true, readOnlyName: true, id: generateId() });
+      }
+    }
+    return { urlParameterPairs: items, urlParametersKey: placeholderNames.join(",") };
+  }, [activeRequest.url, activeRequest.urlParameters]);
 
   let numParams = 0;
   if (
@@ -204,14 +196,7 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
               });
             };
 
-            const patch: Partial<HttpRequest> = {
-              bodyType,
-              body: convertRequestBody({
-                body: activeRequest.body,
-                fromBodyType: activeRequest.bodyType,
-                toBodyType: bodyType,
-              }),
-            };
+            const patch: Partial<HttpRequest> = { bodyType };
             let newContentType: string | null | undefined;
             if (bodyType === BODY_TYPE_NONE) {
               newContentType = null;
@@ -281,19 +266,28 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
   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],
   );
 
@@ -330,7 +324,7 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
   );
 
   const handleUrlChange = useCallback(
-    (url: string) => patchModelDebounced(activeRequest, { url }),
+    (url: string) => patchModel(activeRequest, { url }),
     [activeRequest],
   );
 
@@ -353,7 +347,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}
@@ -376,7 +370,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}>
@@ -384,7 +378,7 @@ 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}>
@@ -436,7 +430,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" ? (
@@ -463,7 +457,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 })}

apps/yaak-client/components/HttpResponsePane.tsx

@@ -4,12 +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 { 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";
@@ -80,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[]>(
     () => [
@@ -97,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,
-            },
-          ],
         },
       },
       {
@@ -155,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,
@@ -193,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",
             )}
@@ -206,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>
@@ -220,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">
@@ -249,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" />}
                       >
@@ -262,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}
@@ -275,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>
             )}

apps/yaak-client/components/ImportDataDialog.tsx

@@ -1,7 +1,6 @@
 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 { SelectFile } from "./SelectFile";
 
@@ -15,8 +14,6 @@ export function ImportDataDialog({ importData }: Props) {
 
   return (
     <VStack space={5} className="pb-4">
-      <CommercialUseBanner source="data-import" title="Importing work data?" />
-
       <VStack space={1}>
         <ul className="list-disc pl-5">
           <li>OpenAPI 3.0, 3.1</li>

apps/yaak-client/components/JsonBodyEditor.tsx

@@ -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={

apps/yaak-client/components/LargeValueDialog.tsx

@@ -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} />,
-  });
-}

apps/yaak-client/components/LicenseBadge.tsx

@@ -59,7 +59,7 @@ function getDetail(
             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,

apps/yaak-client/components/MarkdownEditor.tsx

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

apps/yaak-client/components/ModelSettingsEditor.tsx

@@ -13,7 +13,6 @@ import {
   modelSupportsSetting,
   type RequestSettingDefinition,
   SETTING_FOLLOW_REDIRECTS,
-  SETTING_REQUEST_MESSAGE_SIZE,
   SETTING_REQUEST_TIMEOUT,
   SETTING_SEND_COOKIES,
   SETTING_STORE_COOKIES,
@@ -23,44 +22,21 @@ import { Checkbox } from "./core/Checkbox";
 import { PlainInput } from "./core/PlainInput";
 import {
   SettingOverrideRow,
-  SettingRow,
   SettingRowBoolean,
+  SettingRowNumber,
   SettingsList,
   SettingsSection,
 } from "./core/SettingRow";
 
-const BYTES_PER_MB = 1024 * 1024;
-const MAX_REQUEST_MESSAGE_SIZE_BYTES = 2_147_483_647;
-const MAX_MESSAGE_SIZE_MB = MAX_REQUEST_MESSAGE_SIZE_BYTES / BYTES_PER_MB;
-
 interface Props {
   showSectionTitles?: boolean;
   model: ModelWithSettings;
 }
 
-type ModelWithSettings =
-  | Workspace
-  | Folder
-  | HttpRequest
-  | WebsocketRequest
-  | GrpcRequest;
+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 ModelWithTlsSettings = Workspace | Folder | HttpRequest | WebsocketRequest | GrpcRequest;
+type ModelWithCookieSettings = Workspace | Folder | HttpRequest | WebsocketRequest;
 type BooleanSetting = boolean | InheritedBoolSetting;
 type IntegerSetting = number | InheritedIntSetting;
 type CookieSettingsPatch = {
@@ -74,19 +50,12 @@ type HttpSettingsPatch = {
 type TlsSettingsPatch = {
   settingValidateCertificates?: ModelWithTlsSettings["settingValidateCertificates"];
 };
-type MessageSizeSettingsPatch = {
-  settingRequestMessageSize?: ModelWithMessageSizeSettings["settingRequestMessageSize"];
-};
 
-export function ModelSettingsEditor({
-  model,
-  showSectionTitles = false,
-}: Props) {
+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">
@@ -108,22 +77,6 @@ export function ModelSettingsEditor({
               }
             />
           )}
-          {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}
@@ -157,9 +110,7 @@ export function ModelSettingsEditor({
         </SettingsSection>
       )}
       {supportsCookieSettings && (
-        <SettingsSection
-          title={supportsTlsSettings || showSectionTitles ? "Cookies" : null}
-        >
+        <SettingsSection title={supportsTlsSettings || showSectionTitles ? "Cookies" : null}>
           <BooleanSettingRow
             settingDefinition={SETTING_SEND_COOKIES}
             setting={model.settingSendCookies}
@@ -207,103 +158,46 @@ export function countOverriddenSettings(model: ModelWithSettings) {
     settings.push(model.settingFollowRedirects, model.settingRequestTimeout);
   }
 
-  if (modelSupportsMessageSizeSettings(model)) {
-    settings.push(model.settingRequestMessageSize);
-  }
-
-  return settings.filter(
-    (setting) => isInheritedSetting(setting) && setting.enabled === true,
-  ).length;
+  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 patchCookieSettings(model: ModelWithCookieSettings, patch: Partial<CookieSettingsPatch>) {
+  if (model.model === "workspace") return patchModel(model, patch as Partial<Workspace>);
+  if (model.model === "folder") return patchModel(model, patch as Partial<Folder>);
+  if (model.model === "http_request") return patchModel(model, patch as Partial<HttpRequest>);
+  if (model.model === "websocket_request")
+    return patchModel(model, patch as Partial<WebsocketRequest>);
+  throw new Error("Unsupported cookie settings model");
 }
 
-function patchHttpSettings(
-  model: ModelWithHttpSettings,
-  patch: Partial<HttpSettingsPatch>,
-) {
-  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 patchHttpSettings(model: ModelWithHttpSettings, patch: Partial<HttpSettingsPatch>) {
+  if (model.model === "workspace") return patchModel(model, patch as Partial<Workspace>);
+  if (model.model === "folder") return patchModel(model, patch as Partial<Folder>);
+  return patchModel(model, patch as Partial<HttpRequest>);
 }
 
-function patchTlsSettings(
-  model: ModelWithTlsSettings,
-  patch: Partial<TlsSettingsPatch>,
-) {
-  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 patchTlsSettings(model: ModelWithTlsSettings, patch: Partial<TlsSettingsPatch>) {
+  if (model.model === "workspace") return patchModel(model, patch as Partial<Workspace>);
+  if (model.model === "folder") return patchModel(model, patch as Partial<Folder>);
+  if (model.model === "http_request") return patchModel(model, patch as Partial<HttpRequest>);
+  if (model.model === "websocket_request")
+    return patchModel(model, patch as Partial<WebsocketRequest>);
+  return patchModel(model, patch as Partial<GrpcRequest>);
 }
 
-function 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 {
+function modelSupportsHttpSettings(model: ModelWithSettings): model is ModelWithHttpSettings {
   return modelSupportsSetting(model, SETTING_REQUEST_TIMEOUT);
 }
 
-function modelSupportsCookieSettings(
-  model: ModelWithSettings,
-): model is ModelWithCookieSettings {
+function modelSupportsCookieSettings(model: ModelWithSettings): model is ModelWithCookieSettings {
   return modelSupportsSetting(model, SETTING_SEND_COOKIES);
 }
 
-function modelSupportsTlsSettings(
-  model: ModelWithSettings,
-): model is ModelWithTlsSettings {
+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,
@@ -317,11 +211,7 @@ function BooleanSettingRow({
 }) {
   const inherited = isInheritedSetting(setting);
   const overridden = inherited ? setting.enabled === true : false;
-  const value = inherited
-    ? overridden
-      ? setting.value
-      : inheritedValue
-    : setting;
+  const value = inherited ? (overridden ? setting.value : inheritedValue) : setting;
 
   if (!inherited) {
     return (
@@ -365,92 +255,19 @@ function IntegerSettingRow({
 }) {
   const inherited = isInheritedSetting(setting);
   const overridden = inherited ? setting.enabled === true : false;
-  const value = inherited
-    ? overridden
-      ? setting.value
-      : inheritedValue
-    : setting;
+  const value = inherited ? (overridden ? setting.value : inheritedValue) : setting;
 
   if (!inherited) {
     return (
-      <SettingRow
+      <SettingRowNumber
+        name={settingDefinition.modelKey}
         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}`}
+        value={value}
         placeholder={`${settingDefinition.defaultValue}`}
-        validate={isValidInteger}
-        onChange={(value) =>
-          onChange({
-            ...setting,
-            enabled: true,
-            value: parseInteger(value),
-          })
-        }
+        validate={(value) => value === "" || Number.parseInt(value, 10) >= 0}
+        onChange={(value) => onChange(value)}
       />
-    </SettingOverrideRow>
-  );
-}
-
-function MessageSizeSettingRow({
-  inheritedValue,
-  setting,
-  settingDefinition,
-  onChange,
-}: {
-  inheritedValue: number;
-  setting: IntegerSetting;
-  settingDefinition: RequestSettingDefinition<"settingRequestMessageSize">;
-  onChange: (setting: IntegerSetting) => void;
-}) {
-  const inherited = isInheritedSetting(setting);
-  const overridden = inherited ? setting.enabled === true : false;
-  const value = inherited
-    ? overridden
-      ? setting.value
-      : inheritedValue
-    : setting;
-  const displayValue = formatMegabytes(value);
-  const placeholder = "0";
-
-  if (!inherited) {
-    return (
-      <SettingRow
-        title={settingDefinition.title}
-        description={settingDefinition.description}
-      >
-        <MessageSizeInput
-          name={settingDefinition.modelKey}
-          label={settingDefinition.title}
-          value={displayValue}
-          placeholder={placeholder}
-          onChange={(value) => onChange(parseMegabytes(value))}
-        />
-      </SettingRow>
     );
   }
 
@@ -461,16 +278,21 @@ function MessageSizeSettingRow({
       overridden={overridden}
       onResetOverride={() => onChange({ ...setting, enabled: false })}
     >
-      <MessageSizeInput
+      <PlainInput
+        hideLabel
         name={settingDefinition.modelKey}
         label={settingDefinition.title}
-        value={displayValue}
-        placeholder={placeholder}
+        size="sm"
+        type="number"
+        placeholder={`${settingDefinition.defaultValue}`}
+        defaultValue={`${value}`}
+        containerClassName="!w-48"
+        validate={(value) => value === "" || Number.parseInt(value, 10) >= 0}
         onChange={(value) =>
           onChange({
             ...setting,
             enabled: true,
-            value: parseMegabytes(value),
+            value: Number.parseInt(value, 10) || 0,
           })
         }
       />
@@ -478,79 +300,6 @@ function MessageSizeSettingRow({
   );
 }
 
-function MessageSizeInput({
-  label,
-  name,
-  onChange,
-  placeholder,
-  value,
-}: {
-  label: string;
-  name: string;
-  onChange: (value: string) => void;
-  placeholder: string;
-  value: string;
-}) {
-  return (
-    <NumberUnitInput
-      name={name}
-      label={label}
-      unit="MB"
-      value={value}
-      inputMode="decimal"
-      step="any"
-      placeholder={placeholder}
-      validate={isValidMegabytes}
-      onChange={onChange}
-    />
-  );
-}
-
-function NumberUnitInput({
-  inputMode,
-  label,
-  name,
-  onChange,
-  placeholder,
-  step,
-  unit,
-  validate,
-  value,
-}: {
-  inputMode?: "decimal" | "numeric";
-  label: string;
-  name: string;
-  onChange: (value: string) => void;
-  placeholder: string;
-  step?: number | "any";
-  unit: string;
-  validate: (value: string) => boolean;
-  value: string;
-}) {
-  return (
-    <PlainInput
-      hideLabel
-      name={name}
-      label={label}
-      size="sm"
-      type="number"
-      inputMode={inputMode}
-      step={step}
-      placeholder={placeholder}
-      defaultValue={value}
-      className="[appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
-      containerClassName="w-48!"
-      validate={validate}
-      rightSlot={
-        <span className="flex self-stretch items-center border-l border-border-subtle px-2 text-xs font-medium text-text-subtle">
-          {unit}
-        </span>
-      }
-      onChange={onChange}
-    />
-  );
-}
-
 function isInheritedSetting<T>(
   setting: T | { enabled?: boolean; value: T },
 ): setting is { enabled?: boolean; value: T } {
@@ -559,7 +308,7 @@ function isInheritedSetting<T>(
 
 function resolveInheritedValue(
   ancestors: (Folder | Workspace)[],
-  key: "settingRequestTimeout" | "settingRequestMessageSize",
+  key: "settingRequestTimeout",
   fallback: IntegerSetting,
 ): number;
 function resolveInheritedValue(
@@ -589,46 +338,10 @@ function resolveInheritedValue(
 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
-  );
-}
+type BooleanWorkspaceSettingKey = Exclude<keyof WorkspaceSettings, "settingRequestTimeout">;

apps/yaak-client/components/MoveToWorkspaceDialog.tsx

@@ -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",

apps/yaak-client/components/Prose.css

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

apps/yaak-client/components/RecentGrpcConnectionsDropdown.tsx

@@ -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

apps/yaak-client/components/RecentHttpResponsesDropdown.tsx

@@ -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

apps/yaak-client/components/RecentWebsocketConnectionsDropdown.tsx

@@ -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

apps/yaak-client/components/ResponseCookies.tsx

@@ -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>
                   )}

apps/yaak-client/components/ResponseHeaders.tsx

@@ -1,6 +1,5 @@
 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";
@@ -30,20 +29,12 @@ 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={() => openUrl(response.url)}
                 title="Open in browser"

apps/yaak-client/components/ResponseInfo.tsx

@@ -24,7 +24,7 @@ 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={() => openUrl(response.url)}
                 title="Open in browser"

apps/yaak-client/components/RouteError.tsx

@@ -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}

apps/yaak-client/components/SelectFile.tsx

@@ -108,7 +108,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}

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

@@ -93,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 => ({
@@ -131,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>

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

@@ -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) => (

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

@@ -2,15 +2,22 @@ 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 {
+  SETTING_FOLLOW_REDIRECTS,
+  SETTING_REQUEST_TIMEOUT,
+  SETTING_SEND_COOKIES,
+  SETTING_STORE_COOKIES,
+  SETTING_VALIDATE_CERTIFICATES,
+} from "../../lib/requestSettings";
 import { revealInFinderText } from "../../lib/reveal";
 import { CargoFeature } from "../CargoFeature";
-import { CommercialUseBanner } from "../CommercialUseBanner";
-import { DismissibleBanner } from "../core/DismissibleBanner";
 import { IconButton } from "../core/IconButton";
 import {
   ModelSettingRowBoolean,
+  ModelSettingRowNumber,
   ModelSettingSelectControl,
   SettingValue,
   SettingRow,
@@ -20,29 +27,20 @@ import {
   SettingsSection,
 } from "../core/SettingRow";
 
-const WORKSPACE_SETTINGS_MOVED_AT = "2026-06-30";
-
 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>
-      </div>
-      <div className="mt-3 mb-5">
-        <CommercialUseBanner source="settings-general" title="Using Yaak for work?" />
+        <p className="text-text-subtle">Configure general settings for update behavior and more.</p>
       </div>
       <SettingsList className="space-y-8">
         <CargoFeature feature="updater">
@@ -56,7 +54,7 @@ export function SettingsGeneral() {
                   model={settings}
                   modelKey="updateChannel"
                   label="Update Channel"
-                  selectClassName="w-full!"
+                  selectClassName="!w-full"
                   options={[
                     { label: "Stable", value: "stable" },
                     { label: "Beta", value: "beta" },
@@ -78,9 +76,7 @@ export function SettingsGeneral() {
               description="Choose whether updates are installed automatically or manually."
               name="autoupdate"
               value={settings.autoupdate ? "auto" : "manual"}
-              onChange={(v) =>
-                patchModel(settings, { autoupdate: v === "auto" })
-              }
+              onChange={(v) => patchModel(settings, { autoupdate: v === "auto" })}
               options={[
                 { label: "Automatic", value: "auto" },
                 { label: "Manual", value: "manual" },
@@ -112,30 +108,54 @@ export function SettingsGeneral() {
           </SettingsSection>
         </CargoFeature>
 
-        <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>
+        <SettingsSection
+          title={
+            <>
+              Workspace{" "}
+              <span className="inline-block bg-surface-highlight px-2 py-0.5 rounded text">
+                {workspace.name}
+              </span>
+            </>
+          }
+        >
+          <ModelSettingRowNumber
+            model={workspace}
+            modelKey={SETTING_REQUEST_TIMEOUT.modelKey}
+            title={SETTING_REQUEST_TIMEOUT.title}
+            description={SETTING_REQUEST_TIMEOUT.description}
+            placeholder={`${SETTING_REQUEST_TIMEOUT.defaultValue}`}
+            required
+            validate={(value) => Number.parseInt(value, 10) >= 0}
+          />
 
-        {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>
-        )}
+          <ModelSettingRowBoolean
+            model={workspace}
+            modelKey={SETTING_VALIDATE_CERTIFICATES.modelKey}
+            title={SETTING_VALIDATE_CERTIFICATES.title}
+            description={SETTING_VALIDATE_CERTIFICATES.description}
+          />
+
+          <ModelSettingRowBoolean
+            model={workspace}
+            modelKey={SETTING_FOLLOW_REDIRECTS.modelKey}
+            title={SETTING_FOLLOW_REDIRECTS.title}
+            description={SETTING_FOLLOW_REDIRECTS.description}
+          />
+
+          <ModelSettingRowBoolean
+            model={workspace}
+            modelKey={SETTING_SEND_COOKIES.modelKey}
+            title={SETTING_SEND_COOKIES.title}
+            description={SETTING_SEND_COOKIES.description}
+          />
+
+          <ModelSettingRowBoolean
+            model={workspace}
+            modelKey={SETTING_STORE_COOKIES.modelKey}
+            title={SETTING_STORE_COOKIES.title}
+            description={SETTING_STORE_COOKIES.description}
+          />
+        </SettingsSection>
 
         <SettingsSection title="App Info">
           <SettingRow title="Version" description="Current Yaak version.">

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

@@ -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",
           )}
         >

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

@@ -8,7 +8,6 @@ import { useAtomValue } from "jotai";
 import { useState } from "react";
 import { activeWorkspaceAtom } from "../../hooks/useActiveWorkspace";
 import { showConfirm } from "../../lib/confirm";
-import { pricingUrl } from "../../lib/pricingUrl";
 import { invokeCmd } from "../../lib/tauri";
 import { CargoFeature } from "../CargoFeature";
 import { Button } from "../core/Button";
@@ -89,7 +88,7 @@ export function SettingsInterface() {
               <SettingSelectControl
                 name="uiFont"
                 label="Interface font"
-                selectClassName="w-72!"
+                selectClassName="!w-72"
                 value={settings.interfaceFont ?? NULL_FONT_VALUE}
                 defaultValue={NULL_FONT_VALUE}
                 options={[
@@ -106,7 +105,7 @@ export function SettingsInterface() {
             <SettingSelectControl
               name="interfaceFontSize"
               label="Interface Font Size"
-              selectClassName="w-20!"
+              selectClassName="!w-20"
               value={`${settings.interfaceFontSize}`}
               defaultValue="14"
               options={fontSizeOptions}
@@ -123,7 +122,7 @@ export function SettingsInterface() {
               <SettingSelectControl
                 name="editorFont"
                 label="Editor font"
-                selectClassName="w-72!"
+                selectClassName="!w-72"
                 value={settings.editorFont ?? NULL_FONT_VALUE}
                 defaultValue={NULL_FONT_VALUE}
                 options={[
@@ -139,7 +138,7 @@ export function SettingsInterface() {
             <SettingSelectControl
               name="editorFontSize"
               label="Editor Font Size"
-              selectClassName="w-20!"
+              selectClassName="!w-20"
               value={`${settings.editorFontSize}`}
               defaultValue="12"
               options={fontSizeOptions}
@@ -253,9 +252,7 @@ function LicenseSettings({ settings }: { settings: Settings }) {
                   </p>
                   <p>
                     Licenses help keep Yaak independent and sustainable.{" "}
-                    <Link href={pricingUrl("app.license.badge-hide-confirm")}>
-                      Purchase a License →
-                    </Link>
+                    <Link href="https://yaak.app/pricing?s=badge">Purchase a License →</Link>
                   </p>
                 </VStack>
               ),

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

@@ -6,7 +6,6 @@ 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";
@@ -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={() => 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={() =>
-              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

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

@@ -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

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

@@ -2,7 +2,6 @@ import { patchModel, settingsAtom } from "@yaakapp-internal/models";
 import type { ProxySetting } from "@yaakapp-internal/models";
 import { Heading, InlineCode, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
-import { CommercialUseBanner } from "../CommercialUseBanner";
 import {
   SettingRowBoolean,
   SettingRowSelect,
@@ -34,7 +33,6 @@ 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
@@ -56,7 +54,7 @@ export function SettingsProxy() {
               { label: "Custom proxy configuration", value: "enabled" },
               { label: "No proxy", value: "disabled" },
             ]}
-            selectClassName="w-64!"
+            selectClassName="!w-64"
           />
         </SettingsSection>
 
@@ -99,7 +97,7 @@ export function SettingsProxy() {
                 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!"
+                inputWidthClassName="!w-96"
                 onChange={(bypass) => patchProxy({ bypass })}
               />
             </SettingsSection>

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

@@ -120,7 +120,7 @@ export function SettingsTheme() {
         <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"
+            className="mt-4 w-full bg-surface p-3 border border-dashed border-border-subtle rounded overflow-x-auto"
           >
             <HStack className="text" space={1.5}>
               <Icon icon={appearance === "dark" ? "moon" : "sun"} />

apps/yaak-client/components/SettingsDropdown.tsx

@@ -7,7 +7,6 @@ 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";
@@ -77,8 +76,7 @@ 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: () =>
-            openUrl(pricingUrl(`app.menu.purchase.${check.data?.status ?? "unknown"}`)),
+          onSelect: () => openUrl("https://yaak.app/pricing"),
         },
         {
           label: "Install CLI",

apps/yaak-client/components/Sidebar.tsx

@@ -112,7 +112,6 @@ function Sidebar({ className }: { className?: string }) {
   const treeId = `tree.${activeWorkspaceId ?? "unknown"}`;
   const filterText = useAtomValue(sidebarFilterAtom);
   const [tree, allFields, emptyFilterSuggestions] = useAtomValue(sidebarTreeAtom) ?? [];
-
   const wrapperRef = useRef<HTMLElement>(null);
   const treeRef = useRef<TreeHandle>(null);
   const filterRef = useRef<InputHandle>(null);
@@ -589,7 +588,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}
@@ -668,8 +667,8 @@ function Sidebar({ className }: { className?: string }) {
         <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"
+              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{" "}
@@ -678,7 +677,7 @@ function Sidebar({ className }: { className?: string }) {
                     {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"
+                      className="max-w-full rounded align-middle focus-visible:outline focus-visible:outline-2 focus-visible:outline-info"
                       onClick={() => applyFilterExample(suggestion.filterText)}
                     >
                       <InlineCode className="inline-block max-w-36 truncate align-middle whitespace-nowrap transition-colors hover:border-border hover:bg-surface-active hover:text-text">
@@ -691,8 +690,8 @@ function Sidebar({ className }: { className?: string }) {
             </EmptyStateText>
           ) : (
             <EmptyStateText
-              wrapperClassName="h-auto! mb-auto"
-              className="h-auto! py-3 px-3 text-text-subtle! text-sm leading-relaxed text-center"
+              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{" "}
@@ -725,11 +724,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,

apps/yaak-client/components/TemplateFunctionDialog.tsx

@@ -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,

apps/yaak-client/components/UrlBar.tsx

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

apps/yaak-client/components/UrlParameterEditor.tsx

@@ -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) {

apps/yaak-client/components/WebsocketRequestPane.tsx

@@ -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,15 +18,16 @@ 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";
@@ -56,12 +53,15 @@ 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;
@@ -82,33 +82,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 [
@@ -139,15 +128,23 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
   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 +154,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 +166,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 +218,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 +237,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 +250,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 +258,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,7 +270,7 @@ 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>
@@ -288,10 +284,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 +295,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>

apps/yaak-client/components/WebsocketResponsePane.tsx

@@ -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 !== ""

apps/yaak-client/components/Workspace.tsx

@@ -85,7 +85,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 +162,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>

apps/yaak-client/components/WorkspaceActionsDropdown.tsx

@@ -176,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}

apps/yaak-client/components/WorkspaceEncryptionSetting.tsx

@@ -324,7 +324,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 (

apps/yaak-client/components/WorkspaceSettingsDialog.tsx

@@ -112,9 +112,7 @@ export function WorkspaceSettingsDialog({ workspaceId, hide, tab }: Props) {
               onCreateNewWorkspace={hide}
               onChange={({ filePath }) => patchModel(workspaceMeta, { settingSyncDir: filePath })}
             />
-            <div className="mt-4">
-              <WorkspaceEncryptionSetting layout="settings" size="xs" />
-            </div>
+            <WorkspaceEncryptionSetting layout="settings" size="xs" />
           </SettingsSection>
           <ModelSettingsEditor model={workspace} showSectionTitles />
         </SettingsList>
@@ -127,7 +125,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 +159,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"
@@ -182,7 +180,7 @@ WorkspaceSettingsDialog.show = (workspaceId: string, tab?: WorkspaceSettingsTab)
   showDialog({
     id: "workspace-settings",
     size: "lg",
-    className: "h-[calc(100vh-5rem)] max-h-200!",
+    className: "h-[calc(100vh-5rem)] !max-h-[50rem]",
     noPadding: true,
     render: ({ hide }) => (
       <WorkspaceSettingsDialog workspaceId={workspaceId} hide={hide} tab={tab} />

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

@@ -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}
       >

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

@@ -39,10 +39,10 @@ export function Checkbox({
         <input
           aria-hidden
           className={classNames(
-            "appearance-none shrink-0 border border-border",
+            "appearance-none flex-shrink-0 border border-border",
             size === "sm" && "w-4 h-4",
             size === "md" && "w-5 h-5",
-            "rounded-sm outline-hidden ring-0",
+            "rounded outline-none ring-0",
             !disabled && "hocus:border-border-focus hocus:bg-focus/[5%]",
             disabled && "border-dotted",
           )}

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

@@ -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

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

@@ -18,7 +18,7 @@ export function CountBadge({ count, count2, className, color, showZero }: Props)
       className={classNames(
         className,
         "flex items-center",
-        "opacity-70 border text-4xs rounded-sm mb-0.5 px-1 ml-1 h-4 font-mono",
+        "opacity-70 border text-4xs rounded mb-0.5 px-1 ml-1 h-4 font-mono",
         color == null && "border-border-subtle",
         color === "primary" && "text-primary",
         color === "secondary" && "text-secondary",

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

@@ -42,7 +42,7 @@ export function DetailsBanner({
   return (
     <Banner color={color} className={className}>
       <details className="group list-none" open={isOpen} onToggle={handleToggle} {...extraProps}>
-        <summary className="cursor-default! select-none! list-none flex items-center gap-3 focus:outline-hidden opacity-70">
+        <summary className="!cursor-default !select-none list-none flex items-center gap-3 focus:outline-none opacity-70">
           <div
             className={classNames(
               "transition-transform",

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

@@ -74,13 +74,13 @@ export function Dialog({
             "relative bg-surface pointer-events-auto",
             "rounded-lg",
             "border border-border-subtle shadow-lg shadow-[rgba(0,0,0,0.1)]",
-            "min-h-40",
+            "min-h-[10rem]",
             "max-w-[calc(100vw-5rem)] max-h-[calc(100vh-5rem)]",
-            size === "sm" && "w-120",
-            size === "md" && "w-200",
-            size === "lg" && "w-280",
-            size === "full" && "w-screen h-screen",
-            size === "dynamic" && "min-w-80 max-w-[100vw]",
+            size === "sm" && "w-[30rem]",
+            size === "md" && "w-[50rem]",
+            size === "lg" && "w-[70rem]",
+            size === "full" && "w-[100vw] h-[100vh]",
+            size === "dynamic" && "min-w-[20rem] max-w-[100vw]",
           )}
         >
           {title ? (

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

@@ -1,111 +1,57 @@
 import type { Color } from "@yaakapp-internal/plugins";
 import type { BannerProps } from "@yaakapp-internal/ui";
-import { Banner } from "@yaakapp-internal/ui";
+import { Banner, HStack } from "@yaakapp-internal/ui";
 import classNames from "classnames";
-import type { MouseEvent } from "react";
-import { useEffect } from "react";
 import { useKeyValue } from "../../hooks/useKeyValue";
-import type { ButtonProps } from "./Button";
 import { Button } from "./Button";
 
-type DismissibleBannerSize = "sm" | "xs";
-
 export function DismissibleBanner({
   children,
   className,
   id,
-  size = "sm",
-  onDismiss,
-  onShow,
   actions,
   ...props
 }: BannerProps & {
   id: string;
-  size?: DismissibleBannerSize;
-  onDismiss?: () => void | Promise<void>;
-  onShow?: () => void | Promise<void>;
-  actions?: {
-    label: string;
-    onClick: () => void;
-    color?: Color;
-    variant?: ButtonProps["variant"];
-  }[];
+  actions?: { label: string; onClick: () => void; color?: Color }[];
 }) {
-  const {
-    isLoading,
-    set: setDismissed,
-    value: dismissed,
-  } = useKeyValue<boolean>({
+  const { set: setDismissed, value: dismissed } = useKeyValue<boolean>({
     namespace: "global",
     key: ["dismiss-banner", id],
     fallback: false,
   });
 
-  const shouldShow = !isLoading && !dismissed;
-
-  useEffect(() => {
-    if (shouldShow) {
-      Promise.resolve(onShow?.()).catch(console.error);
-    }
-  }, [onShow, shouldShow]);
-
-  if (!shouldShow) return null;
-
-  const actionSize: ButtonProps["size"] = size === "xs" ? "2xs" : "xs";
-  const stopParentClick = (event: MouseEvent) => {
-    event.preventDefault();
-    event.stopPropagation();
-  };
+  if (dismissed) return null;
 
   return (
     <Banner
-      className={classNames(
-        className,
-        "relative",
-        size === "xs" && "!px-2 !py-2 text-xs",
-      )}
+      className={classNames(className, "relative grid grid-cols-[1fr_auto] gap-3")}
       {...props}
     >
-      <div className="@container">
-        <div
-          className={classNames(
-            "grid @[34rem]:grid-cols-[minmax(0,1fr)_auto] @[34rem]:items-center",
-            size === "xs" ? "gap-1.5 @[34rem]:gap-2" : "gap-2 @[34rem]:gap-3",
-          )}
+      {children}
+      <HStack space={1.5}>
+        {actions?.map((a) => (
+          <Button
+            key={a.label}
+            variant="border"
+            color={a.color ?? props.color}
+            size="xs"
+            onClick={a.onClick}
+            title={a.label}
+          >
+            {a.label}
+          </Button>
+        ))}
+        <Button
+          variant="border"
+          color={props.color}
+          size="xs"
+          onClick={() => setDismissed((d) => !d)}
+          title="Dismiss message"
         >
-          {children}
-          <div className="flex flex-wrap gap-1.5 @[34rem]:justify-end">
-            <Button
-              variant="border"
-              color={props.color}
-              size={actionSize}
-              onClick={(event) => {
-                stopParentClick(event);
-                setDismissed(true).catch(console.error);
-                Promise.resolve(onDismiss?.()).catch(console.error);
-              }}
-              title="Dismiss message"
-            >
-              Dismiss
-            </Button>
-            {actions?.map((a) => (
-              <Button
-                key={a.label}
-                variant={a.variant ?? "border"}
-                color={a.color ?? props.color}
-                size={actionSize}
-                onClick={(event) => {
-                  stopParentClick(event);
-                  a.onClick();
-                }}
-                title={a.label}
-              >
-                {a.label}
-              </Button>
-            ))}
-          </div>
-        </div>
-      </div>
+          Dismiss
+        </Button>
+      </HStack>
     </Banner>
   );
 }

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

@@ -233,40 +233,23 @@ export const Dropdown = forwardRef<DropdownRef, DropdownProps>(function Dropdown
 
 export interface ContextMenuProps {
   triggerPosition: { x: number; y: number } | null;
-  /**
-   * The box the menu belongs to, when the trigger has one.
-   *
-   * Placement aligns to the trigger's left or right edge depending on the room beside it, so a
-   * menu opened from an element wants its real rect. Without one the position is treated as a
-   * zero-width point, which is right for a menu opened at the cursor and wrong for one opened
-   * from a button.
-   */
-  triggerRect?: Pick<DOMRect, "top" | "bottom" | "left" | "right">;
-  /**
-   * The element the menu belongs to, so a click on it doesn't count as a click outside.
-   *
-   * Without this the trigger gets both: the outside-click handler closes the menu on mousedown,
-   * then the trigger's own click opens it again, and pressing it looks like it does nothing.
-   */
-  triggerRef?: RefObject<HTMLElement | null>;
   className?: string;
   items: DropdownProps["items"];
   onClose: () => void;
 }
 
 export const ContextMenu = forwardRef<DropdownRef, ContextMenuProps>(function ContextMenu(
-  { triggerPosition, triggerRect, triggerRef, className, items, onClose },
+  { triggerPosition, className, items, onClose },
   ref,
 ) {
   const triggerShape = useMemo(
-    () =>
-      triggerRect ?? {
-        top: triggerPosition?.y ?? 0,
-        bottom: triggerPosition?.y ?? 0,
-        left: triggerPosition?.x ?? 0,
-        right: triggerPosition?.x ?? 0,
-      },
-    [triggerPosition, triggerRect],
+    () => ({
+      top: triggerPosition?.y ?? 0,
+      bottom: triggerPosition?.y ?? 0,
+      left: triggerPosition?.x ?? 0,
+      right: triggerPosition?.x ?? 0,
+    }),
+    [triggerPosition],
   );
 
   if (triggerPosition == null) return null;
@@ -276,13 +259,9 @@ export const ContextMenu = forwardRef<DropdownRef, ContextMenuProps>(function Co
       isOpen={true} // Always open because we return null if not
       className={className}
       defaultSelectedIndex={null}
-      // A menu opened from an element points back at it. One opened at the cursor has nothing
-      // to point at, so it goes without.
-      showTriangle={triggerRect != null}
       ref={ref}
       items={items}
       onClose={onClose}
-      triggerRef={triggerRef}
       triggerShape={triggerShape}
     />
   );
@@ -298,9 +277,7 @@ interface MenuProps {
   fullWidth?: boolean;
   isOpen: boolean;
   items: DropdownItem[];
-  // Any element, not just a button: a menu can be opened from anything, and this is only ever
-  // used to ask whether a click landed on the trigger
-  triggerRef?: RefObject<HTMLElement | null>;
+  triggerRef?: RefObject<HTMLButtonElement | null>;
   isSubmenu?: boolean;
 }
 
@@ -735,7 +712,7 @@ const Menu = forwardRef<Omit<DropdownRef, "open" | "isOpen" | "toggle" | "items"
         className={classNames(
           className,
           "x-theme-menu",
-          "outline-hidden my-1 pointer-events-auto z-40",
+          "outline-none my-1 pointer-events-auto z-40",
           "fixed",
         )}
       >
@@ -757,7 +734,7 @@ const Menu = forwardRef<Omit<DropdownRef, "open" | "isOpen" | "toggle" | "items"
           {filter && (
             <HStack
               space={2}
-              className="pb-0.5 px-1.5 mb-2 text-sm border border-border-subtle mx-2 rounded-sm font-mono h-xs"
+              className="pb-0.5 px-1.5 mb-2 text-sm border border-border-subtle mx-2 rounded font-mono h-xs"
             >
               <Icon icon="search" size="xs" />
               <div className="text">{filter}</div>
@@ -939,24 +916,24 @@ function MenuItem({
         )
       }
       rightSlot={rightSlot && <div className="ml-auto pl-3">{rightSlot}</div>}
-      innerClassName="text-left!"
+      innerClassName="!text-left"
       color="custom"
       className={classNames(
         className,
         "h-xs", // More compact
-        "min-w-32 outline-hidden px-2 mx-1.5 flex whitespace-nowrap",
-        "focus:bg-surface-highlight focus:text rounded-sm focus:outline-hidden focus-visible:outline-1",
-        isParentOfActiveSubmenu && "bg-surface-highlight text rounded-sm",
-        item.color === "danger" && "text-danger!",
-        item.color === "primary" && "text-primary!",
-        item.color === "success" && "text-success!",
-        item.color === "warning" && "text-warning!",
-        item.color === "notice" && "text-notice!",
-        item.color === "info" && "text-info!",
+        "min-w-[8rem] outline-none px-2 mx-1.5 flex whitespace-nowrap",
+        "focus:bg-surface-highlight focus:text rounded focus:outline-none focus-visible:outline-1",
+        isParentOfActiveSubmenu && "bg-surface-highlight text rounded",
+        item.color === "danger" && "!text-danger",
+        item.color === "primary" && "!text-primary",
+        item.color === "success" && "!text-success",
+        item.color === "warning" && "!text-warning",
+        item.color === "notice" && "!text-notice",
+        item.color === "info" && "!text-info",
       )}
       {...props}
     >
-      <div className={classNames("truncate min-w-20")}>{item.label}</div>
+      <div className={classNames("truncate min-w-[5rem]")}>{item.label}</div>
     </Button>
   );
 }

apps/yaak-client/components/core/Editor/DiffViewer.css

@@ -1,5 +1,3 @@
-@reference "../../../main.css";
-
 .cm-wrapper.cm-multiline .cm-mergeView {
   @apply h-full w-full overflow-auto pr-0.5;
 
@@ -11,7 +9,7 @@
     @apply w-full min-h-full relative;
 
     .cm-collapsedLines {
-      @apply bg-none bg-surface border border-border py-1 mx-0.5 text-text opacity-80 hover:opacity-100 rounded-sm cursor-default;
+      @apply bg-none bg-surface border border-border py-1 mx-0.5 text-text opacity-80 hover:opacity-100 rounded cursor-default;
     }
   }
 
@@ -21,21 +19,21 @@
   .cm-changedLine {
     /* Round top corners only if previous line is not a changed line */
     &:not(.cm-changedLine + &) {
-      @apply rounded-t-sm;
+      @apply rounded-t;
     }
     /* Round bottom corners only if next line is not a changed line */
     &:not(:has(+ .cm-changedLine)) {
-      @apply rounded-b-sm;
+      @apply rounded-b;
     }
   }
 
   /* Let content grow and disable individual scrolling for sync */
   .cm-editor {
-    @apply h-auto! relative!;
+    @apply h-auto relative !important;
     position: relative !important;
   }
 
   .cm-scroller {
-    @apply overflow-visible!;
+    @apply overflow-visible !important;
   }
 }

apps/yaak-client/components/core/Editor/Editor.css

@@ -1,5 +1,3 @@
-@reference "../../../main.css";
-
 .cm-wrapper {
   @apply h-full overflow-hidden;
 
@@ -9,7 +7,7 @@
     /* Regular cursor */
 
     .cm-cursor {
-      @apply border-text!;
+      @apply border-text !important;
       /* Widen the cursor a bit */
       @apply border-l-[2px];
     }
@@ -17,8 +15,8 @@
     /* Vim-mode cursor */
 
     .cm-fat-cursor {
-      @apply outline-0! bg-text!;
-      @apply text-surface!;
+      @apply outline-0 bg-text !important;
+      @apply text-surface !important;
     }
 
     /* Matching bracket */
@@ -61,12 +59,12 @@
 
       * {
         @apply cursor-text;
-        @apply caret-transparent!;
+        @apply caret-transparent !important;
       }
     }
 
     .cm-selectionBackground {
-      @apply bg-selection!;
+      @apply bg-selection !important;
     }
 
     /* Fix WebKit/WKWebView rendering bug where selection layer leaves a ghost
@@ -90,7 +88,7 @@
     }
 
     .cm-gutter-lint {
-      @apply w-auto!;
+      @apply w-auto !important;
 
       .cm-gutterElement {
         @apply px-0;
@@ -113,7 +111,7 @@
       @apply bg-surface text-text-subtle border-border-subtle whitespace-nowrap cursor-default;
       @apply hover:border-border hover:text-text hover:bg-surface-highlight;
 
-      @apply inline border px-1 mx-[0.5px] rounded-sm dark:shadow;
+      @apply inline border px-1 mx-[0.5px] rounded dark:shadow;
 
       -webkit-text-security: none;
 
@@ -121,24 +119,6 @@
         @apply cursor-default;
       }
 
-      /* The chevron on a tag that opens a menu. The tag itself is the button, so this is
-         only the affordance that says so. */
-      .tag-action {
-        @apply inline-flex items-center align-middle ml-1;
-        @apply text-text-subtlest;
-
-        svg {
-          @apply w-[0.9em] h-[0.9em];
-        }
-      }
-
-      /* A preview of the value a tag stands for. Sized before the image loads, so arriving
-         never changes the line's height. */
-      .tag-thumbnail {
-        @apply inline-block align-middle mr-1 rounded-xs;
-        @apply w-[1.1em] h-[1.1em] object-cover bg-surface-highlight;
-      }
-
       .fn {
         @apply inline-block;
         .fn-inner {
@@ -182,7 +162,7 @@
 
       &::-webkit-scrollbar-corner,
       &::-webkit-scrollbar {
-        @apply hidden!;
+        @apply hidden !important;
       }
     }
   }
@@ -209,16 +189,16 @@
 
 /* Style search matches */
 .cm-searchMatch {
-  @apply bg-transparent!;
+  @apply bg-transparent !important;
   @apply rounded-[2px] outline outline-1;
 
   &.cm-searchMatch-selected {
     @apply outline-text;
-    @apply bg-text!;
+    @apply bg-text !important;
 
     &,
     * {
-      @apply text-surface! font-semibold!;
+      @apply text-surface font-semibold !important;
     }
   }
 }
@@ -243,8 +223,8 @@
 }
 
 .cm-editor .fold-gutter-icon {
-  @apply pt-[0.25em] pl-[0.4em] px-[0.4em] h-4 rounded-sm;
-  @apply cursor-default!;
+  @apply pt-[0.25em] pl-[0.4em] px-[0.4em] h-4 rounded;
+  @apply cursor-default !important;
 }
 
 .cm-editor .fold-gutter-icon::after {
@@ -268,7 +248,7 @@
 .cm-editor .cm-foldPlaceholder {
   @apply px-2 border border-border-subtle bg-surface-highlight;
   @apply hover:text-text hover:border-border-subtle text-text;
-  @apply cursor-default!;
+  @apply cursor-default !important;
 }
 
 .cm-editor .cm-activeLineGutter {
@@ -297,7 +277,7 @@
 }
 
 .cm-tooltip-lint {
-  @apply font-mono! text-editor! rounded-sm! overflow-hidden! bg-surface-highlight! border! border-border! shadow!;
+  @apply font-mono text-editor rounded overflow-hidden bg-surface-highlight border border-border shadow !important;
 
   .cm-diagnostic-error {
     @apply border-l-danger px-4 py-2;
@@ -313,18 +293,18 @@
 }
 
 .cm-tooltip.cm-tooltip-hover {
-  @apply shadow-lg bg-surface rounded-sm text-text-subtle border border-border-subtle z-50 pointer-events-auto text-sm;
+  @apply shadow-lg bg-surface rounded text-text-subtle border border-border-subtle z-50 pointer-events-auto text-sm;
   @apply p-1.5;
 
   /* Style the tooltip for popping up "open in browser" and other stuff */
 
   a,
   button {
-    @apply text-text hover:bg-surface-highlight w-full h-sm flex items-center px-2 rounded-sm;
+    @apply text-text hover:bg-surface-highlight w-full h-sm flex items-center px-2 rounded;
   }
 
   a {
-    @apply cursor-default!;
+    @apply cursor-default !important;
 
     &::after {
       @apply text-text bg-text h-3 w-3 ml-1;
@@ -339,10 +319,10 @@
 /* NOTE: Extra selector required to override default styles */
 .cm-tooltip.cm-tooltip-autocomplete,
 .cm-tooltip.cm-completionInfo {
-  @apply shadow-lg bg-surface rounded-sm text-text-subtle border border-border-subtle z-50 pointer-events-auto;
+  @apply shadow-lg bg-surface rounded text-text-subtle border border-border-subtle z-50 pointer-events-auto;
 
   & * {
-    @apply font-mono! text-editor!;
+    @apply font-mono text-editor !important;
   }
 
   .cm-completionIcon {
@@ -429,7 +409,7 @@
     }
 
     .cm-completionIcon {
-      @apply text-sm flex items-center pb-0.5 shrink-0;
+      @apply text-sm flex items-center pb-0.5 flex-shrink-0;
     }
 
     .cm-completionLabel {
@@ -447,7 +427,7 @@
 
   input,
   button {
-    @apply rounded-sm outline-hidden;
+    @apply rounded-sm outline-none;
   }
 
   button {
@@ -456,12 +436,12 @@
   }
 
   button[name="close"] {
-    @apply text-text-subtle! hocus:text-text! px-2! -mr-1.5!;
+    @apply text-text-subtle hocus:text-text px-2 -mr-1.5 !important;
   }
 
   input {
     @apply bg-surface border-border-subtle focus:border-border-focus;
-    @apply border outline-hidden;
+    @apply border outline-none;
   }
 
   input.cm-textfield {

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

@@ -8,7 +8,6 @@ import { emacs } from "@replit/codemirror-emacs";
 import { vim } from "@replit/codemirror-vim";
 
 import { vscodeKeymap } from "@replit/codemirror-vscode-keymap";
-import { debounce } from "@yaakapp-internal/lib";
 import type { EditorKeymap } from "@yaakapp-internal/models";
 import { settingsAtom } from "@yaakapp-internal/models";
 import type { EditorLanguage, TemplateFunction } from "@yaakapp-internal/plugins";
@@ -16,6 +15,7 @@ import { HStack } from "@yaakapp-internal/ui";
 import classNames from "classnames";
 import type { GraphQLSchema } from "graphql";
 import { useAtomValue } from "jotai";
+import { md5 } from "js-md5";
 import type { ReactNode, RefObject } from "react";
 import {
   Children,
@@ -33,7 +33,6 @@ import { useEnvironmentVariables } from "../../../hooks/useEnvironmentVariables"
 import { eventMatchesHotkey } from "../../../hooks/useHotKey";
 import { useRequestEditor } from "../../../hooks/useRequestEditor";
 import { useTemplateFunctionCompletionOptions } from "../../../hooks/useTemplateFunctions";
-import { docFingerprint } from "../../../lib/docFingerprint";
 import { editEnvironment } from "../../../lib/editEnvironment";
 import { tryFormatJson, tryFormatXml } from "../../../lib/formatters";
 import { jotaiStore } from "../../../lib/jotai";
@@ -43,7 +42,6 @@ import { IconButton } from "../IconButton";
 import "./Editor.css";
 import {
   baseExtensions,
-  editableExtensions,
   getLanguageExtension,
   multiLineExtensions,
   readonlyExtensions,
@@ -284,22 +282,6 @@ function EditorInner({
     [disableTabIndent],
   );
 
-  // Update read-only
-  const readOnlyCompartment = useRef(new Compartment());
-  useEffect(
-    function configureReadOnly() {
-      if (cm.current === null) return;
-      const current = readOnlyCompartment.current.get(cm.current.view.state) ?? emptyExtension;
-      const next = readOnly ? readonlyExtensions : editableExtensions;
-      // PERF: This is expensive with hundreds of editors on screen, so only do it when necessary
-      if (current === next) return;
-
-      const effects = readOnlyCompartment.current.reconfigure(next);
-      cm.current?.view.dispatch({ effects });
-    },
-    [readOnly],
-  );
-
   const onClickFunction = useCallback(
     async (fn: TemplateFunction, tagValue: string, startPos: number) => {
       const show = () => {
@@ -383,7 +365,6 @@ function EditorInner({
   const initEditorRef = useCallback(
     function initEditorRef(container: HTMLDivElement | null) {
       if (container === null) {
-        flushCachedEditorState(stateKey);
         cm.current?.view.destroy();
         cm.current = null;
         return;
@@ -413,9 +394,9 @@ function EditorInner({
           keymapCompartment.current.of(
             keymapExtensions[settings.editorKeymap] ?? keymapExtensions.default,
           ),
-          readOnlyCompartment.current.of(readOnly ? readonlyExtensions : editableExtensions),
           ...getExtensions({
             container,
+            readOnly,
             singleLine,
             hideGutter,
             stateKey,
@@ -433,7 +414,7 @@ function EditorInner({
               : []),
         ];
 
-        const cachedJsonState = getCachedEditorState(defaultValue ?? "", stateKey, !!readOnly);
+        const cachedJsonState = getCachedEditorState(defaultValue ?? "", stateKey);
 
         const doc = `${defaultValue ?? ""}`;
         const config: EditorStateConfig = { extensions, doc };
@@ -489,7 +470,7 @@ function EditorInner({
   const decoratedActions = useMemo(() => {
     const results = [];
     const actionClassName = classNames(
-      "bg-surface transition-opacity transform-gpu opacity-0 group-hover:opacity-100 hover:opacity-100! shadow",
+      "bg-surface transition-opacity transform-gpu opacity-0 group-hover:opacity-100 hover:!opacity-100 shadow",
     );
 
     if (format) {
@@ -572,6 +553,7 @@ function EditorInner({
 function getExtensions({
   stateKey,
   container,
+  readOnly,
   singleLine,
   hideGutter,
   onChange,
@@ -580,7 +562,7 @@ function getExtensions({
   onFocus,
   onBlur,
   onKeyDown,
-}: Pick<EditorProps, "singleLine" | "hideGutter"> & {
+}: Pick<EditorProps, "singleLine" | "readOnly" | "hideGutter"> & {
   stateKey: EditorProps["stateKey"];
   container: HTMLDivElement | null;
   onChange: RefObject<EditorProps["onChange"]>;
@@ -630,6 +612,7 @@ function getExtensions({
     keymap.of(singleLine ? defaultKeymap.filter((k) => k.key !== "Enter") : defaultKeymap),
     ...(singleLine ? [singleLineExtensions()] : []),
     ...(!singleLine ? multiLineExtensions({ hideGutter }) : []),
+    ...(readOnly ? readonlyExtensions : []),
 
     // ------------------------ //
     // Things that must be last //
@@ -642,7 +625,7 @@ function getExtensions({
         onChange.current?.(update.state.doc.toString());
       }
 
-      saveCachedEditorStateDebounced(stateKey, update.state);
+      saveCachedEditorState(stateKey, update.state);
     }),
   ];
 }
@@ -655,53 +638,13 @@ const placeholderElFromText = (text: string | undefined) => {
   return el;
 };
 
-// Caching the state is too expensive to do on every update (every keystroke and cursor move),
-// so debounce it per state key and flush when the editor unmounts.
-//
-// The cost scales with the document, and every update pays it in full:
-//   - `state.toJSON` flattens the whole rope into a string, ~0.13 ms per 200 KB
-//   - the fingerprint is an exact md5 for editable documents, ~0.3 ms per 200 KB. `docFingerprint`
-//     only samples read-only ones, so editing a large body still hashes all of it
-//   - `sessionStorage.setItem` is synchronous and blocks the main thread
-// Typing in a 200 KB body costs ~0.4 ms per keystroke before the storage write, and a 1 MB one
-// ~2.3 ms. Read-only documents skip most of the hashing but still serialize, which is the larger
-// half once documents get into the megabytes.
-const SAVE_STATE_DEBOUNCE_MS = 500;
-const stateSavers = new Map<string, ReturnType<typeof debounce>>();
-
-function saveCachedEditorStateDebounced(stateKey: string | null, state: EditorState) {
-  if (!stateKey) return;
-  let saver = stateSavers.get(stateKey);
-  if (saver == null) {
-    saver = debounce(
-      (s: EditorState) => saveCachedEditorState(stateKey, s),
-      SAVE_STATE_DEBOUNCE_MS,
-    );
-    stateSavers.set(stateKey, saver);
-  }
-  saver(state);
-}
-
-// NOTE: Only called when an editor unmounts, so the saver is dropped rather than left in the map
-//  for every state key the session has ever shown. A pending saver holds the last EditorState,
-//  which holds the whole document.
-function flushCachedEditorState(stateKey: string | null) {
-  if (!stateKey) return;
-  const saver = stateSavers.get(stateKey);
-  if (saver == null) return;
-  saver.flush();
-  stateSavers.delete(stateKey);
-}
-
 function saveCachedEditorState(stateKey: string | null, state: EditorState | null) {
   if (!stateKey || state == null) return;
   const stateObj = state.toJSON(stateFields);
 
-  // Save state in sessionStorage by removing doc and saving a fingerprint of it instead.
+  // Save state in sessionStorage by removing doc and saving the hash of it instead.
   // This will be checked on restore and put back in if it matches.
-  // Editable documents get the exact hash, so a collision can never restore undo history
-  // belonging to other content
-  stateObj.docHash = docFingerprint(stateObj.doc, { exact: !state.readOnly });
+  stateObj.docHash = md5(stateObj.doc);
   stateObj.doc = undefined;
 
   try {
@@ -711,7 +654,7 @@ function saveCachedEditorState(stateKey: string | null, state: EditorState | nul
   }
 }
 
-function getCachedEditorState(doc: string, stateKey: string | null, readOnly: boolean) {
+function getCachedEditorState(doc: string, stateKey: string | null) {
   if (stateKey == null) return;
 
   try {
@@ -721,7 +664,7 @@ function getCachedEditorState(doc: string, stateKey: string | null, readOnly: bo
     const { docHash, ...state } = JSON.parse(stateStr);
 
     // Ensure the doc matches the one that was used to save the state
-    if (docHash !== docFingerprint(doc, { exact: !readOnly })) {
+    if (docHash !== md5(doc)) {
       return null;
     }
 

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

@@ -59,7 +59,6 @@ import { pluralizeCount } from "../../../lib/pluralize";
 import { showGraphQLDocExplorerAtom } from "../../graphql/graphqlAtoms";
 import type { EditorProps } from "./Editor";
 import { jsonParseLinter } from "./json-lint";
-import { largeValues, mediaValues } from "./largeValues";
 import { pairs } from "./pairs/extension";
 import { searchMatchCount } from "./searchMatchCount";
 import { text } from "./text/extension";
@@ -259,19 +258,8 @@ export const baseExtensions = [
 export const readonlyExtensions = [
   EditorState.readOnly.of(true),
   EditorView.contentAttributes.of({ tabindex: "-1" }),
-  // Nobody is editing this, so every rule applies
-  largeValues,
 ];
 
-/**
- * The counterpart for a document being edited.
- *
- * Only encoded media collapses here: it is pasted rather than typed, and replaced rather than
- * edited, so a tag stands in for it without hiding anything anyone meant to read. The rules that
- * hide text by length alone stay out. See {@link mediaValues}.
- */
-export const editableExtensions = [mediaValues];
-
 export const multiLineExtensions = ({ hideGutter }: { hideGutter?: boolean }) => [
   search({ top: true }),
   searchMatchCount(),

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

@@ -1,14 +1,10 @@
-import type { Completion, CompletionContext } from "@codemirror/autocomplete";
+import type { CompletionContext } from "@codemirror/autocomplete";
 import type { GenericCompletionOption } from "@yaakapp-internal/plugins";
 import { defaultBoost } from "./twig/completion";
 
-export type GenericCompletion = GenericCompletionOption & {
-  apply?: Completion["apply"];
-};
-
 export interface GenericCompletionConfig {
   minMatch?: number;
-  options: GenericCompletion[];
+  options: GenericCompletionOption[];
 }
 
 /**

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

@@ -1,500 +0,0 @@
-import { EditorState } from "@codemirror/state";
-import { jsonc } from "@shopify/lang-jsonc";
-import { text } from "./text/extension";
-import { twig } from "./twig/extension";
-import { describe, expect, test } from "vite-plus/test";
-import {
-  COLLAPSE_MEDIA_CHARS,
-  COLLAPSE_TOKEN_CHARS,
-  collapseDecorations,
-  largeValues,
-  MAX_VISIBLE_LINE_CHARS,
-} from "./largeValues";
-import type { SniffedValue } from "./sniffValue";
-
-const BIG = "A".repeat(1_000_000);
-
-/** With a grammar, so tokens can be collapsed individually */
-const jsonState = (doc: string) => EditorState.create({ doc, extensions: [jsonc(), largeValues] });
-
-/** Without a grammar, so only the column rule applies */
-const plainState = (doc: string) => EditorState.create({ doc, extensions: largeValues });
-
-/**
- * The decorations as if the whole document were on screen.
- *
- * In the editor the plugin passes the viewport instead, which is the same call with narrower
- * ranges — the rules themselves don't know the difference.
- */
-function decorationsFor(state: EditorState) {
-  return collapseDecorations(state, [{ from: 0, to: state.doc.length }]);
-}
-
-function collapsedRanges(state: EditorState) {
-  const ranges: { from: number; to: number }[] = [];
-  const iter = decorationsFor(state).iter();
-  while (iter.value != null) {
-    ranges.push({ from: iter.from, to: iter.to });
-    iter.next();
-  }
-  return ranges;
-}
-
-/** How much of each line is still rendered */
-function visibleLineLengths(state: EditorState) {
-  const hidden = collapsedRanges(state);
-  const lengths: number[] = [];
-  for (let n = 1; n <= state.doc.lines; n++) {
-    const line = state.doc.line(n);
-    const covered = hidden
-      .filter((h) => h.from >= line.from && h.to <= line.to)
-      .reduce((sum, h) => sum + (h.to - h.from), 0);
-    lengths.push(line.length - covered);
-  }
-  return lengths;
-}
-
-describe("collapsing", () => {
-  test("leaves an ordinary body alone", () => {
-    expect(collapsedRanges(jsonState('{"hello":"world"}'))).toEqual([]);
-  });
-
-  test("leaves a large body of short lines alone", () => {
-    const doc = Array.from({ length: 20_000 }, (_, i) => `  { "id": ${i} },`).join("\n");
-    expect(doc.length).toBeGreaterThan(MAX_VISIBLE_LINE_CHARS);
-    expect(collapsedRanges(jsonState(doc))).toEqual([]);
-  });
-
-  test("leaves a line just under the column limit alone", () => {
-    expect(collapsedRanges(plainState("x".repeat(MAX_VISIBLE_LINE_CHARS)))).toEqual([]);
-  });
-
-  test("never renders more than the column limit per line", () => {
-    for (const state of [jsonState(`{"image":"${BIG}"}`), plainState(BIG)]) {
-      for (const length of visibleLineLengths(state)) {
-        expect(length).toBeLessThanOrEqual(MAX_VISIBLE_LINE_CHARS);
-      }
-    }
-  });
-
-  test("keeps the document text intact", () => {
-    const doc = `{"image":"${BIG}"}`;
-    expect(jsonState(doc).sliceDoc()).toBe(doc);
-    expect(jsonState(doc).doc.length).toBe(doc.length);
-  });
-});
-
-describe("token collapsing, with a grammar", () => {
-  test("hides the whole value, leaving its quotes visible", () => {
-    const doc = `{"name":"a.png","image":"${BIG}","size":12}`;
-    const state = jsonState(doc);
-    const ranges = collapsedRanges(state);
-
-    expect(ranges).toHaveLength(1);
-    // Exactly the text between the quotes, so the line reads as `"image":"<tag>"`
-    expect(state.sliceDoc(ranges[0]!.from, ranges[0]!.to)).toBe(BIG);
-    expect(doc[ranges[0]!.from - 1]).toBe('"');
-    expect(doc[ranges[0]!.to]).toBe('"');
-
-    // Everything after the value is still rendered, unlike a plain column cut
-    expect(doc.slice(ranges[0]!.to)).toContain('"size":12}');
-  });
-
-  // Small enough that the parse always finishes inside PARSE_TIMEOUT_MS, even on a slow
-  // machine. With a bigger body this falls back to the column cut, which is by design but
-  // makes the assertion depend on how fast the runner is.
-  test("keeps every key visible in a minified body with several large values", () => {
-    const chunk = "B".repeat(20_000);
-    const doc = `{${["a", "b", "c", "d", "e"].map((k) => `"${k}":"${chunk}"`).join(",")}}`;
-    const state = jsonState(doc);
-    const ranges = collapsedRanges(state);
-
-    expect(ranges).toHaveLength(5);
-    for (const key of ["a", "b", "c", "d", "e"]) {
-      // No collapse swallows the key
-      const at = doc.indexOf(`"${key}":`);
-      expect(ranges.some((r) => r.from <= at && r.to > at)).toBe(false);
-    }
-    expect(visibleLineLengths(state)[0]).toBeLessThanOrEqual(MAX_VISIBLE_LINE_CHARS);
-  });
-
-  test("collapses a value on a pretty-printed line", () => {
-    const doc = `{\n  "name": "a.png",\n  "image": "${BIG}"\n}`;
-    const state = jsonState(doc);
-    const ranges = collapsedRanges(state);
-
-    expect(ranges).toHaveLength(1);
-    expect(state.sliceDoc(ranges[0]!.from, ranges[0]!.to)).toBe(BIG);
-    // Only the long line is touched, and all that is left of it is `  "image": ""`
-    expect(visibleLineLengths(state)).toEqual([1, 18, 13, 1]);
-    expect(state.doc.line(2).text).toBe('  "name": "a.png",');
-  });
-
-  test("ignores tokens under the collapse threshold", () => {
-    // Under the threshold once the surrounding quotes are counted
-    const short = "C".repeat(COLLAPSE_TOKEN_CHARS - 10);
-    const doc = `{${Array.from({ length: 4 }, (_, i) => `"k${i}":"${short}"`).join(",")}}`;
-    expect(doc.length).toBeGreaterThan(MAX_VISIBLE_LINE_CHARS);
-
-    // Nothing is big enough to collapse on its own, so the column rule takes over
-    const ranges = collapsedRanges(jsonState(doc));
-    expect(ranges).toHaveLength(1);
-    expect(ranges[0]!.to).toBe(doc.length);
-  });
-});
-
-describe("column collapsing, without a grammar", () => {
-  test("collapses everything past the limit", () => {
-    const ranges = collapsedRanges(plainState(BIG));
-    expect(ranges).toHaveLength(1);
-    expect(ranges[0]!.from).toBe(MAX_VISIBLE_LINE_CHARS);
-    expect(ranges[0]!.to).toBe(BIG.length);
-  });
-
-  test("handles a long line of many short tokens", () => {
-    // A single-line CSV row: no token is long enough to collapse on its own
-    const row = Array.from({ length: 40_000 }, (_, i) => `value ${i}`).join(", ");
-    const ranges = collapsedRanges(plainState(row));
-    expect(ranges).toHaveLength(1);
-    expect(ranges[0]!.from).toBe(MAX_VISIBLE_LINE_CHARS);
-  });
-
-  test("collapses each long line independently", () => {
-    const doc = `${BIG}\nshort\n${BIG}`;
-    const ranges = collapsedRanges(plainState(doc));
-    expect(ranges).toHaveLength(2);
-    for (const length of visibleLineLengths(plainState(doc))) {
-      expect(length).toBeLessThanOrEqual(MAX_VISIBLE_LINE_CHARS);
-    }
-  });
-
-  test("never hides a line break", () => {
-    const doc = `${BIG}\nshort`;
-    const state = plainState(doc);
-    for (const { from, to } of collapsedRanges(state)) {
-      expect(state.sliceDoc(from, to)).not.toContain("\n");
-    }
-    expect(state.doc.lines).toBe(2);
-  });
-});
-
-describe("undelimited tokens", () => {
-  // The text grammar parses a whole line as one token. Collapsing it whole would leave the
-  // line with nothing on it but a tag, so the column cut handles it instead.
-  const textState = (doc: string) => EditorState.create({ doc, extensions: [text(), largeValues] });
-
-  test("falls back to the column cut for a long line of plain text", () => {
-    const doc = Array.from({ length: 90_000 }, (_, i) => `word${i}`).join(" ");
-    const ranges = collapsedRanges(textState(doc));
-
-    expect(ranges).toHaveLength(1);
-    expect(ranges[0]!.from).toBe(MAX_VISIBLE_LINE_CHARS);
-    expect(ranges[0]!.to).toBe(doc.length);
-  });
-
-  test("leaves the start of the line readable", () => {
-    const doc = `IMPORTANT-PREFIX ${"z".repeat(500_000)}`;
-    const state = textState(doc);
-    const ranges = collapsedRanges(state);
-
-    expect(ranges[0]!.from).toBe(MAX_VISIBLE_LINE_CHARS);
-    expect(state.sliceDoc(0, 16)).toBe("IMPORTANT-PREFIX");
-  });
-});
-
-describe("sniffing the collapsed value", () => {
-  /** The widget standing in for each collapse, in document order */
-  function widgets(state: EditorState) {
-    const found: { valueFrom: number; sniffed: SniffedValue | null }[] = [];
-    const iter = decorationsFor(state).iter();
-    while (iter.value != null) {
-      found.push(iter.value.spec.widget);
-      iter.next();
-    }
-    return found;
-  }
-
-  /** A base64 value that starts with a PNG signature and runs on well past the limits */
-  function pngBase64(length = 1_000_000) {
-    const bytes = new Uint8Array(length);
-    bytes.set([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
-    let binary = "";
-    for (const byte of bytes) binary += String.fromCharCode(byte);
-    return btoa(binary);
-  }
-
-  test("names the format of a base64 value inside JSON", () => {
-    const state = jsonState(`{"image":"${pngBase64()}"}`);
-    expect(widgets(state)[0]?.sniffed).toMatchObject({ mime: "image/png", label: "PNG" });
-  });
-
-  test("names the format of a data URI", () => {
-    const doc = `{"image":"data:image/jpeg;base64,${BIG}"}`;
-    expect(widgets(jsonState(doc))[0]?.sniffed).toMatchObject({ label: "JPEG" });
-  });
-
-  test("names nothing when the value is just text", () => {
-    expect(widgets(jsonState(`{"image":"${BIG}"}`))[0]?.sniffed).toBeNull();
-    expect(widgets(plainState(BIG))[0]?.sniffed).toBeNull();
-  });
-
-  test("reads a column cut from the start of its line, not from the cut", () => {
-    // A body that is nothing but one base64 blob: the tail is hidden, but the value it
-    // belongs to begins at the start of the line, which is where the signature is
-    const state = plainState(pngBase64());
-    const [widget] = widgets(state);
-
-    expect(widget?.valueFrom).toBe(0);
-    expect(widget?.sniffed).toMatchObject({ label: "PNG" });
-  });
-
-  test("reads a token collapse from the value itself", () => {
-    const doc = `{"image":"${pngBase64()}"}`;
-    const [widget] = widgets(jsonState(doc));
-
-    // Just past the opening quote, so the signature is the first thing it sees
-    expect(widget?.valueFrom).toBe(doc.indexOf('"', doc.indexOf("image") + 6) + 1);
-    expect(widget?.sniffed).toMatchObject({ label: "PNG" });
-  });
-
-  test("finds a run that starts partway through a line, and names it", () => {
-    // No grammar here, and the value is not the whole line. The run is found by its alphabet,
-    // so the prefix stays on screen and the blob is still named.
-    const prefix = "some prefix text ";
-    const state = plainState(`${prefix}${pngBase64()}`);
-    const [widget] = widgets(state);
-
-    expect(widget?.valueFrom).toBe(prefix.length);
-    expect(widget?.sniffed).toMatchObject({ label: "PNG" });
-  });
-});
-
-describe("recomputing", () => {
-  test("updates when the document changes", () => {
-    const state = plainState('{"image":"short"}');
-    expect(collapsedRanges(state)).toEqual([]);
-
-    const next = state.update({
-      changes: { from: 0, to: state.doc.length, insert: BIG },
-    }).state;
-    expect(collapsedRanges(next)).toHaveLength(1);
-  });
-});
-
-describe("media collapsing, below the length rules", () => {
-  /** A real PNG signature, at a size that no length rule would touch */
-  function png(bytes: number) {
-    const b = new Uint8Array(bytes);
-    b.set([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
-    let binary = "";
-    for (const byte of b) binary += String.fromCharCode(byte);
-    return btoa(binary);
-  }
-
-  /** Well under every length threshold, so only the media rule can collapse it */
-  const SMALL = png(3_000);
-
-  test("collapses a small image on a short line", () => {
-    expect(SMALL.length).toBeLessThan(MAX_VISIBLE_LINE_CHARS);
-    expect(SMALL.length).toBeLessThan(COLLAPSE_TOKEN_CHARS);
-
-    const state = jsonState(`{\n  "avatar": "${SMALL}"\n}`);
-    const ranges = collapsedRanges(state);
-
-    expect(ranges).toHaveLength(1);
-    expect(state.sliceDoc(ranges[0]!.from, ranges[0]!.to)).toBe(SMALL);
-  });
-
-  test("names it, so the tag can say what it is", () => {
-    const state = jsonState(`{"avatar":"${SMALL}"}`);
-    const iter = decorationsFor(state).iter();
-    expect(iter.value?.spec.widget.sniffed).toMatchObject({ mime: "image/png", label: "PNG" });
-  });
-
-  test("leaves a value of the same size alone when nothing recognises it", () => {
-    // The only difference from the case above is what the bytes turn out to be
-    const prose = "x".repeat(SMALL.length);
-    expect(collapsedRanges(jsonState(`{"note":"${prose}"}`))).toEqual([]);
-  });
-
-  test("leaves anything under the media threshold alone, recognised or not", () => {
-    const tiny = png(400);
-    expect(tiny.length).toBeLessThan(COLLAPSE_MEDIA_CHARS);
-    expect(collapsedRanges(jsonState(`{"icon":"${tiny}"}`))).toEqual([]);
-  });
-
-  test("leaves text alone even when its first bytes match a signature", () => {
-    // `Qk0` decodes to `BM`, the whole of the BMP signature. Two bytes come up by chance often
-    // enough that the sniff alone must not be allowed to hide something.
-    const prose = `Qk0 ${"the quick brown fox jumps over the lazy dog. ".repeat(40)}`;
-    expect(prose.length).toBeGreaterThan(COLLAPSE_MEDIA_CHARS);
-    expect(collapsedRanges(jsonState(`{"note":"${prose}"}`))).toEqual([]);
-  });
-
-  test("still collapses it once it is long enough to be a rendering problem", () => {
-    // Past the length rule the sniff no longer decides anything, so this is hidden for its size
-    const prose = "Qk0 " + "words and more words ".repeat(COLLAPSE_TOKEN_CHARS);
-    expect(collapsedRanges(jsonState(`{"note":"${prose}"}`))).toHaveLength(1);
-  });
-
-  test("collapses a data URI on a short line", () => {
-    const state = jsonState(`{"avatar":"data:image/jpeg;base64,${SMALL}"}`);
-    expect(collapsedRanges(state)).toHaveLength(1);
-  });
-
-  test("still leaves an ordinary document completely untouched", () => {
-    const doc = Array.from({ length: 5_000 }, (_, i) => `  { "id": ${i}, "name": "item" },`).join(
-      "\n",
-    );
-    expect(collapsedRanges(jsonState(doc))).toEqual([]);
-  });
-});
-
-describe("media rule only, for a document being edited", () => {
-  /** What an editable editor gets: rule 2 alone */
-  function editableRanges(state: EditorState) {
-    const ranges: { from: number; to: number }[] = [];
-    const iter = collapseDecorations(state, [{ from: 0, to: state.doc.length }], "media").iter();
-    while (iter.value != null) {
-      ranges.push({ from: iter.from, to: iter.to });
-      iter.next();
-    }
-    return ranges;
-  }
-
-  function png(bytes: number) {
-    const b = new Uint8Array(bytes);
-    b.set([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
-    let binary = "";
-    for (const byte of b) binary += String.fromCharCode(byte);
-    return btoa(binary);
-  }
-
-  test("collapses a pasted image, the one thing it is for", () => {
-    const value = png(3_000);
-    const state = jsonState(`{\n  "avatar": "${value}"\n}`);
-
-    expect(editableRanges(state)).toHaveLength(1);
-    expect(state.sliceDoc(editableRanges(state)[0]!.from, editableRanges(state)[0]!.to)).toBe(
-      value,
-    );
-  });
-
-  test("leaves a long value alone when nothing can name it", () => {
-    // Rule 1 would take this on a stalling line. Editing it is plausible, so it stays.
-    const doc = `{"blob":"${"Z".repeat(COLLAPSE_TOKEN_CHARS * 3)}"}`;
-    expect(doc.length).toBeGreaterThan(MAX_VISIBLE_LINE_CHARS);
-    expect(editableRanges(jsonState(doc))).toEqual([]);
-  });
-
-  test("never cuts at the column limit, which would strand text out of reach", () => {
-    // Rule 3 territory: a minified body with no value big enough to collapse on its own
-    const doc = `[${Array.from({ length: 4_000 }, (_, i) => `"word-${i}"`).join(",")}]`;
-    expect(doc.length).toBeGreaterThan(MAX_VISIBLE_LINE_CHARS);
-    expect(editableRanges(jsonState(doc))).toEqual([]);
-    // The read-only rules still cut it
-    expect(collapsedRanges(jsonState(doc))).toHaveLength(1);
-  });
-
-  test("never swallows a template tag, collapsing only the run beside it", () => {
-    // A brace is not in the base64 alphabet, so the run starts after the tag and the tag stays
-    // on screen where it can still be read and edited
-    const tag = "{{ image }}";
-    const doc = `{"avatar":"${tag}${png(3_000)}"}`;
-    const ranges = editableRanges(jsonState(doc));
-
-    expect(ranges).toHaveLength(1);
-    expect(ranges[0]!.from).toBe(doc.indexOf(tag) + tag.length);
-    expect(doc.slice(ranges[0]!.from, ranges[0]!.to)).not.toContain("{");
-  });
-
-  test("finds a data URI whole, header and all", () => {
-    const value = `data:image/jpeg;base64,${png(3_000)}`;
-    const doc = `{"avatar":"${value}"}`;
-    const ranges = editableRanges(jsonState(doc));
-
-    expect(ranges).toHaveLength(1);
-    expect(doc.slice(ranges[0]!.from, ranges[0]!.to)).toBe(value);
-  });
-
-  test("hides no line break, so the plugin may provide it from the viewport", () => {
-    const state = jsonState(`{\n  "a": "${png(3_000)}",\n  "b": 1\n}`);
-    for (const { from, to } of editableRanges(state)) {
-      expect(state.sliceDoc(from, to)).not.toContain("\n");
-    }
-  });
-});
-
-describe("templated fields, where the grammar is an overlay", () => {
-  // Every editable field mixes its language with twig, which mounts the base language as an
-  // overlay. Overlays are not traversed by `Tree.iterate`, so a rule that walks the tree sees
-  // one enormous Text node and finds nothing. Rule 2 reads the text instead, and this is the
-  // case that has to keep working: an image pasted into a JSON request body.
-  const twigState = (doc: string) =>
-    EditorState.create({
-      doc,
-      extensions: [
-        twig({
-          base: jsonc(),
-          environmentVariables: [],
-          completionOptions: [],
-          onClickVariable: () => {},
-          onClickMissingVariable: () => {},
-          onClickPathParameter: () => {},
-          extraExtensions: [],
-        }),
-        largeValues,
-      ],
-    });
-
-  function png(bytes: number) {
-    const b = new Uint8Array(bytes);
-    b.set([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
-    let binary = "";
-    for (const byte of b) binary += String.fromCharCode(byte);
-    return btoa(binary);
-  }
-
-  test("collapses a pasted image in a templated body", () => {
-    const value = png(3_000);
-    const state = twigState(`{\n  "avatar": "${value}"\n}`);
-    const ranges: { from: number; to: number }[] = [];
-    const iter = collapseDecorations(state, [{ from: 0, to: state.doc.length }], "media").iter();
-    while (iter.value != null) {
-      ranges.push({ from: iter.from, to: iter.to });
-      iter.next();
-    }
-
-    expect(ranges).toHaveLength(1);
-    expect(state.sliceDoc(ranges[0]!.from, ranges[0]!.to)).toBe(value);
-  });
-});
-
-describe("viewport scoping", () => {
-  const doc = () => {
-    const value = "A".repeat(COLLAPSE_TOKEN_CHARS * 2);
-    return `{\n${["a", "b", "c"].map((k) => `  "${k}": "${value}"`).join(",\n")}\n}`;
-  };
-
-  test("decorates only the ranges it is given", () => {
-    const state = jsonState(doc());
-    const secondLine = state.doc.line(3);
-
-    const all = collapseDecorations(state, [{ from: 0, to: state.doc.length }]);
-    const one = collapseDecorations(state, [{ from: secondLine.from, to: secondLine.to }]);
-
-    expect(all.size).toBe(3);
-    expect(one.size).toBe(1);
-  });
-
-  test("covers a line the range only partly overlaps", () => {
-    // The viewport can start mid-line; the collapse still has to span the whole value
-    const state = jsonState(doc());
-    const line = state.doc.line(2);
-    const partial = collapseDecorations(state, [{ from: line.from + 5, to: line.from + 6 }]);
-
-    expect(partial.size).toBe(1);
-    const iter = partial.iter();
-    expect(iter.to).toBeGreaterThan(line.from + 6);
-  });
-});

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

@@ -1,584 +0,0 @@
-import { ensureSyntaxTree, syntaxTree } from "@codemirror/language";
-import { formatSize } from "@yaakapp-internal/lib/formatSize";
-import type { EditorState, Extension, Range } from "@codemirror/state";
-import type { Tree as SyntaxTree } from "@lezer/common";
-import type { DecorationSet, ViewUpdate } from "@codemirror/view";
-import { Decoration, EditorView, ViewPlugin, WidgetType } from "@codemirror/view";
-import { fireAndForget } from "../../../lib/fireAndForget";
-import type { SniffedValue } from "./sniffValue";
-import { isEncodedRun, SNIFF_HEAD_CHARS, sniffValue } from "./sniffValue";
-
-/**
- * How much of a line may be rendered before the rest is collapsed.
- *
- * VS Code draws nothing past column 10,000 (`editor.stopRenderingLineAfter`) for the same
- * reason. It can afford to be blunt about it because it doesn't soft wrap by default; we
- * collapse to a placeholder that can be opened instead.
- */
-export const MAX_VISIBLE_LINE_CHARS = 10_000;
-
-/**
- * A quoted value longer than this is collapsed whole, whatever it turns out to hold. Long
- * enough that nothing a person might actually read is ever hidden on length alone.
- */
-export const COLLAPSE_TOKEN_CHARS = 5_000;
-
-/**
- * A quoted value longer than this is collapsed too, but only when {@link sniffValue} can say
- * what it is. Encoded media is never worth reading, so once we can name it and offer a viewer,
- * a tag beats a wall of base64 well below the length that would make it a rendering problem —
- * this covers the avatars and icons that make up most base64 in real payloads. Anything we
- * can't identify stays visible until it's big enough to be a problem on its own.
- */
-export const COLLAPSE_MEDIA_CHARS = 1_000;
-
-/**
- * Collapses what can't be read: over-long lines, which stall layout, and encoded media, which
- * is only noise on screen.
- *
- * Layout cost tracks the length of the longest line, not the size of the document. A 1 MB
- * response of ordinary multi-line JSON renders fine, while the same 1 MB on a single line stalls
- * the UI, because soft wrap has to measure the whole line end to end to find its break points.
- * Measured in WKWebView, the engine macOS ships: 221 ms per render pass at 1 MB and 968 ms at
- * 3 MB, against 51 ms and 138 ms once collapsed, with soft wrap left on.
- *
- * Three rules:
- *
- * 1. Collapse quoted values over {@link COLLAPSE_TOKEN_CHARS} whole, so a base64 string reads
- *    as `"image": "PNG · 999.8 KB"` with its key intact. A minified body with several large
- *    values keeps every one of its keys. Needs a grammar to find the value.
- * 2. Collapse quoted values over {@link COLLAPSE_MEDIA_CHARS} that sniff as a known format,
- *    which is what catches an ordinary embedded image long before it is a rendering problem.
- * 3. On a line still over {@link MAX_VISIBLE_LINE_CHARS}, collapse whatever is left past the
- *    column limit. This needs no grammar, so it covers plain text, undelimited tokens, and any
- *    line that is simply long.
- *
- * Only what the viewport covers is examined, and only lines long enough to hold a collapse are
- * looked at, so a document of ordinary short lines costs a length check per visible line and
- * nothing else — no grammar is consulted and no tree is walked.
- *
- * Nothing leaves the document. Copy, filter and save all still see the full text, and the tag
- * itself is a button, opening a menu that views, copies or saves exactly what it stands for.
- *
- * The value's own head says what it is — a `data:` URI names its media type, and raw base64
- * gives its format up in the first dozen bytes — so the tag can name the format and open the
- * value in the matching viewer without any of it being read. See {@link sniffValue}.
- *
- * An editable document gets rule 2 alone, as {@link mediaValues}. Encoded media is never typed
- * by hand: it arrives pasted, and the only edit anyone makes to it is replacing it wholesale,
- * which the tag already supports — {@link EditorView.atomicRanges} makes it delete as one unit.
- * So collapsing it hides nothing anyone was going to read. The other two rules stay out, since
- * they hide text by length alone, without being able to say what it is: under rule 3 a minified
- * body would become uneditable past the column limit, which really would be editing text you
- * can't see.
- */
-
-/**
- * Which of the three rules to apply.
- *
- * `media` is the subset safe for a document being edited: collapse only what we can name.
- */
-export type CollapseRules = "all" | "media";
-
-/**
- * A hidden range, the value it belongs to, and what that value turned out to be.
- *
- * The hidden range and the value differ under the column rule, where the value starts at the
- * beginning of the line but only what runs past the limit is hidden. The tag stands in for
- * [from, to) and copies exactly that; the viewer needs the whole value, [valueFrom, to).
- */
-interface Collapse {
-  from: number;
-  to: number;
-  valueFrom: number;
-  sniffed: SniffedValue | null;
-}
-
-/**
- * Lucide's `chevron-down`, inlined because the widget builds its DOM synchronously and
- * rendering React here would leave it empty while CodeMirror measures line heights.
- */
-const CHEVRON_DOWN =
-  '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" ' +
-  'stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" ' +
-  'aria-hidden="true"><path d="m6 9 6 6 6-6"/></svg>';
-
-/**
- * Marks the tag as the thing that opens the menu.
- *
- * The whole tag is the target rather than the chevron alone: there is only one action, and a
- * label you can't click next to a hit area a few pixels wide is a worse button than the tag
- * itself. The chevron stays as the affordance that says so.
- *
- * A span with a role rather than a real button, because a button's box model makes the line
- * taller — the one thing this extension exists to keep from happening.
- */
-function makeTagButton(el: HTMLElement, title: string, onOpen: () => void) {
-  el.role = "button";
-  el.ariaHasPopup = "menu";
-  el.tabIndex = 0;
-  el.title = title;
-  el.ariaLabel = title;
-
-  // Keep the editor from moving the cursor when the tag is pressed
-  el.addEventListener("mousedown", (e) => {
-    e.preventDefault();
-    e.stopPropagation();
-  });
-  el.addEventListener("click", (e) => {
-    e.preventDefault();
-    e.stopPropagation();
-    onOpen();
-  });
-  el.addEventListener("keydown", (e) => {
-    if (e.key !== "Enter" && e.key !== " ") return;
-    e.preventDefault();
-    e.stopPropagation();
-    onOpen();
-  });
-}
-
-class LargeValueWidget extends WidgetType {
-  constructor(
-    private readonly from: number,
-    private readonly to: number,
-    private readonly valueFrom: number,
-    private readonly sniffed: SniffedValue | null,
-  ) {
-    super();
-  }
-
-  eq(other: LargeValueWidget) {
-    return (
-      other.from === this.from &&
-      other.to === this.to &&
-      other.valueFrom === this.valueFrom &&
-      other.sniffed?.mime === this.sniffed?.mime
-    );
-  }
-
-  toDOM(view: EditorView) {
-    const length = this.to - this.from;
-
-    const el = document.createElement("span");
-    // The same neutral tag styling a path parameter uses. The theme scope matters: these
-    // tokens resolve against the tag palette, not the editor's ambient one, where a
-    // tag-sized border is meant to be near invisible.
-    el.className = "x-theme-templateTag x-theme-templateTag--secondary template-tag";
-
-    const thumbnail = buildThumbnail(view, this.valueFrom, this.to, this.sniffed);
-    if (thumbnail != null) {
-      el.appendChild(thumbnail);
-    }
-
-    const label = document.createElement("span");
-    // A named type reads as a stand-in for the value, so it only needs to say what and how big.
-    // Without a name there is nothing to show but the fact that something is missing.
-    label.textContent =
-      this.sniffed == null
-        ? `${formatSize(length)} hidden…`
-        : `${this.sniffed.label} · ${formatSize(length)}`;
-    el.appendChild(label);
-
-    const chevron = document.createElement("span");
-    chevron.className = "tag-action";
-    chevron.ariaHidden = "true";
-    chevron.innerHTML = CHEVRON_DOWN;
-    el.appendChild(chevron);
-
-    makeTagButton(
-      el,
-      this.sniffed == null ? "Value actions" : `${this.sniffed.label} actions`,
-      () => fireAndForget(this.openMenu(view, el)),
-    );
-
-    return el;
-  }
-
-  /**
-   * Copy, view and save, in a menu opened against the button.
-   *
-   * Everything the menu needs is pulled in on click. The editor loads on every response, and
-   * neither the React menu nor the viewers behind the dialog are worth carrying until someone
-   * asks for them.
-   */
-  private async openMenu(view: EditorView, tag: HTMLElement) {
-    const [{ toggleContextMenu }, { showLargeValueDialog }, { encodingLabel, largeValueActions }] =
-      await Promise.all([
-        import("../../../lib/contextMenu"),
-        import("../../LargeValueDialog"),
-        import("../../../lib/largeValue"),
-      ]);
-
-    const { sniffed } = this;
-    // Sliced when an action runs rather than now, so opening the menu never touches the value
-    const value = () => view.state.sliceDoc(this.valueFrom, this.to);
-    const head = view.state.sliceDoc(
-      this.valueFrom,
-      Math.min(this.valueFrom + SNIFF_HEAD_CHARS, this.to),
-    );
-
-    // The whole tag, so the menu can align to whichever edge has room beside it
-    const rect = tag.getBoundingClientRect();
-    toggleContextMenu({
-      id: "large-value",
-      triggerPosition: { x: rect.left, y: rect.bottom },
-      triggerRect: rect,
-      triggerEl: tag,
-      items: [
-        { type: "separator", label: encodingLabel(head, sniffed, this.to - this.from) },
-        ...largeValueActions({
-          value,
-          sniffed,
-          // Exactly what the tag stands in for, which under the column rule is only the tail
-          copyText: () => view.state.sliceDoc(this.from, this.to),
-          onView: () => showLargeValueDialog({ text: value(), sniffed }),
-        }),
-      ],
-    });
-  }
-
-  ignoreEvent() {
-    return false;
-  }
-}
-
-/**
- * How much encoded image a tag will preview. Roughly 3 MB of file, base64 being 4 bytes to 3.
- *
- * The decode runs on WebKit's image thread, but the bitmap it produces is sized by the image's
- * own dimensions, not by the box we draw it in — a 4000×3000 photo costs 48 MB however small the
- * thumbnail. So there has to be a limit, even though encoded size is only a proxy for the one
- * that matters: a well-compressed photo can decode larger than a lossless screenshot twice its
- * file size. This is set high enough to cover ordinary screenshots and wallpapers, since a tag
- * that previews some images and not others is worse than one that previews none. Only widgets in
- * the viewport are ever built, so a screenful is the most that decode at once.
- */
-const THUMBNAIL_MAX_CHARS = 4_000_000;
-
-/**
- * A preview of the value, at a size fixed before it loads.
- *
- * The box is a fixed square from the moment it's inserted, so the image arriving never changes
- * the line's height or the tag's width. A growing line box is the layout cost this whole
- * extension exists to avoid, and an image of unknown dimensions is the classic way to cause one.
- *
- * The src is the value's own text handed straight to the decoder as a data URI. Decoding the
- * base64 ourselves first would mean walking megabytes on the main thread, which is the one
- * thing that must not happen here.
- */
-function buildThumbnail(
-  view: EditorView,
-  valueFrom: number,
-  to: number,
-  sniffed: SniffedValue | null,
-): HTMLElement | null {
-  if (sniffed == null || !sniffed.mime.startsWith("image/")) return null;
-  if (sniffed.encoding !== "base64") return null;
-  if (to - valueFrom > THUMBNAIL_MAX_CHARS) return null;
-
-  const img = document.createElement("img");
-  img.className = "tag-thumbnail";
-  img.alt = "";
-  img.ariaHidden = "true";
-  img.decoding = "async";
-  // A magic number can be wrong, and a data URI can lie. Drop the box rather than leave a
-  // broken-image glyph sitting in the tag.
-  img.addEventListener("error", () => img.remove());
-  // Read the document and build the data URI after the widget is measured and on screen
-  requestAnimationFrame(() => {
-    if (!img.isConnected) return;
-    const payload = view.state.sliceDoc(valueFrom + sniffed.offset, to);
-    img.src = `data:${sniffed.mime};base64,${payload}`;
-  });
-  return img;
-}
-
-interface Line {
-  from: number;
-  to: number;
-}
-
-/**
- * The lines the given ranges touch, in document order and each listed once.
- *
- * Only lines long enough to hold a collapse are returned. That check is what keeps this free on
- * ordinary documents: no grammar is consulted and no tree is walked for a screen of short lines.
- */
-function collapsibleLines(state: EditorState, ranges: readonly { from: number; to: number }[]) {
-  const lines: Line[] = [];
-  let lastFrom = -1;
-
-  for (const range of ranges) {
-    let pos = range.from;
-    for (;;) {
-      const line = state.doc.lineAt(pos);
-      if (line.from > lastFrom) {
-        lastFrom = line.from;
-        if (line.to - line.from >= COLLAPSE_MEDIA_CHARS) {
-          lines.push({ from: line.from, to: line.to });
-        }
-      }
-      if (line.to >= range.to) break;
-      pos = line.to + 1;
-    }
-  }
-
-  return lines;
-}
-
-/**
- * How long to spend parsing before falling back to the column rule.
- *
- * The initial parse is budgeted by time, so it stops partway through a document with several
- * large values, and we'd only find the first one. Parsing the rest of a 1 MB body costs about
- * 12 ms, against the 171 ms of layout it saves.
- */
-const PARSE_TIMEOUT_MS = 100;
-
-/**
- * The parsed tree covering these lines.
- *
- * Parsing is only ever forced for a line long enough to stall layout, where finding the values
- * inside it is what saves the frame. For everything else we take whatever the background parse
- * has reached and decorate again when it advances — a forced parse runs from the top of the
- * document, so making one happen on every scroll would cost far more than the tags are worth.
- */
-function treeForLines(state: EditorState, lines: Line[]): SyntaxTree {
-  const last = lines[lines.length - 1];
-  const stalls = lines.some((l) => l.to - l.from > MAX_VISIBLE_LINE_CHARS);
-  if (last == null || !stalls) {
-    return syntaxTree(state);
-  }
-  return ensureSyntaxTree(state, last.to, PARSE_TIMEOUT_MS) ?? syntaxTree(state);
-}
-
-const QUOTES = ['"', "'", "`"];
-
-/** A run of base64, long enough to be worth looking at. Nothing else can be encoded media. */
-const ENCODED_RUN = new RegExp(`[A-Za-z0-9+/=_-]{${COLLAPSE_MEDIA_CHARS},}`, "g");
-
-/** The header that turns a bare run into a data URI, when one sits right before it. */
-const DATA_URI_HEAD = /data:[^,;\s"']*(?:;[^,;\s"']*)*;base64,$/;
-
-/**
- * Encoded media on this line, found by reading the text rather than the grammar.
- *
- * Deliberately grammar-free. Every editable field in the app mixes its language with the twig
- * parser, which mounts the base language as an *overlay*, and overlays are not traversed by
- * `Tree.iterate` — so a rule that walks the tree finds one enormous `Text` node and nothing
- * inside it. Rule 2 has to work in those fields above all, since that is where images get
- * pasted, and a run of base64 is a text pattern anyway: no grammar can describe it better than
- * the alphabet does.
- *
- * A `data:` header is picked up by looking backwards from the run, so the whole URI collapses
- * as one thing and its declared type is what names it.
- */
-function findMediaRuns(state: EditorState, line: Line): Collapse[] {
-  const text = state.sliceDoc(line.from, line.to);
-  const collapses: Collapse[] = [];
-
-  ENCODED_RUN.lastIndex = 0;
-  for (let m = ENCODED_RUN.exec(text); m != null; m = ENCODED_RUN.exec(text)) {
-    let start = m.index;
-    // A data URI's own header breaks the alphabet, so the run starts after it
-    const header = DATA_URI_HEAD.exec(text.slice(0, start));
-    if (header != null) {
-      start = header.index;
-    }
-
-    const valueFrom = line.from + start;
-    const valueTo = line.from + m.index + m[0].length;
-    const head = state.sliceDoc(valueFrom, Math.min(valueFrom + SNIFF_HEAD_CHARS, valueTo));
-    const sniffed = sniffValue(head);
-
-    // Only hide what we can name. A short magic number matches by chance now and then, so the
-    // run itself has to look encoded too.
-    if (sniffed != null && sniffed.encoding === "base64" && isEncodedRun(head, sniffed.offset)) {
-      collapses.push({ from: valueFrom, to: valueTo, valueFrom, sniffed });
-    }
-  }
-
-  return collapses;
-}
-
-/**
- * Quoted values big enough to be a rendering problem on their own, whatever they hold.
- *
- * Needs the grammar, to find where the value starts and ends, and so only runs for a document
- * nobody is editing — which is also the only place this rule applies.
- */
-function findLargeTokens(state: EditorState, tree: SyntaxTree, line: Line): Collapse[] {
-  const collapses: Collapse[] = [];
-
-  tree.iterate({
-    from: line.from,
-    to: line.to,
-    enter: (node) => {
-      // A node this small can't contain anything worth collapsing, and neither can its children
-      if (node.to - node.from < COLLAPSE_TOKEN_CHARS) return false;
-      // Only leaves, so we collapse the string itself rather than the object holding it
-      if (node.node.firstChild != null) return true;
-
-      const from = Math.max(node.from, line.from);
-      const to = Math.min(node.to, line.to);
-      const open = state.sliceDoc(from, from + 1);
-      const quoted = to - from >= 2 && QUOTES.includes(open) && state.sliceDoc(to - 1, to) === open;
-      if (!quoted) return false;
-
-      // Everything inside the quotes. The whole value is hidden, so it is its own value range
-      const valueFrom = from + 1;
-      const valueTo = to - 1;
-      if (valueTo - valueFrom < COLLAPSE_TOKEN_CHARS) return false;
-
-      const head = state.sliceDoc(valueFrom, Math.min(valueFrom + SNIFF_HEAD_CHARS, valueTo));
-      collapses.push({ from: valueFrom, to: valueTo, valueFrom, sniffed: sniffValue(head) });
-      return false;
-    },
-  });
-
-  return collapses;
-}
-
-/**
- * Both rules' findings as one list, in document order, with nothing overlapping.
- *
- * A big quoted base64 value satisfies both rules, and two decorations over the same text is an
- * error. The token wins where they collide, because its range stops at the quotes and so leaves
- * the structure around it readable.
- */
-function mergeCollapses(tokens: Collapse[], runs: Collapse[]): Collapse[] {
-  const merged = [...tokens];
-  for (const run of runs) {
-    if (!tokens.some((t) => run.from < t.to && t.from < run.to)) {
-      merged.push(run);
-    }
-  }
-  return merged.sort((a, b) => a.from - b.from);
-}
-
-/**
- * Where the line runs past the column limit, counting only what is still visible after the
- * token collapses, or -1 if it fits.
- */
-function findColumnCut(line: Line, tokens: Collapse[]): number {
-  let visible = 0;
-  let pos = line.from;
-
-  for (const token of [...tokens, null]) {
-    const segmentEnd = token == null ? line.to : token.from;
-    if (segmentEnd > pos) {
-      if (visible + (segmentEnd - pos) > MAX_VISIBLE_LINE_CHARS) {
-        return pos + (MAX_VISIBLE_LINE_CHARS - visible);
-      }
-      visible += segmentEnd - pos;
-    }
-    if (token != null) {
-      pos = token.to;
-    }
-  }
-
-  return -1;
-}
-
-function collapsesForLine(
-  state: EditorState,
-  tree: SyntaxTree,
-  line: Line,
-  rules: CollapseRules,
-): Collapse[] {
-  const runs = findMediaRuns(state, line);
-  // Length alone only hides things on a line that would stall without it, and never in a
-  // document being edited, where hiding text by size would put it out of reach
-  const stalls = rules === "all" && line.to - line.from > MAX_VISIBLE_LINE_CHARS;
-  const tokens = mergeCollapses(stalls ? findLargeTokens(state, tree, line) : [], runs);
-
-  // Short enough to render, so there is nothing left to cut
-  if (!stalls) {
-    return tokens;
-  }
-
-  const cut = findColumnCut(line, tokens);
-  if (cut < 0) {
-    return tokens;
-  }
-
-  // The cut always lands in a visible stretch, so it never splits a token collapse
-  const kept = tokens.filter((t) => t.to <= cut);
-  // Only the tail is hidden, but the value it belongs to runs from the start of the line — a
-  // body that is nothing but one base64 blob is still recognisable from there
-  const head = state.sliceDoc(line.from, Math.min(line.from + SNIFF_HEAD_CHARS, line.to));
-  kept.push({ from: cut, to: line.to, valueFrom: line.from, sniffed: sniffValue(head) });
-  return kept;
-}
-
-/**
- * The collapses covering the given document ranges.
- *
- * Kept separate from the plugin so the rules can be exercised against a state directly, with no
- * view and no DOM.
- */
-export function collapseDecorations(
-  state: EditorState,
-  ranges: readonly { from: number; to: number }[],
-  rules: CollapseRules = "all",
-): DecorationSet {
-  const lines = collapsibleLines(state, ranges);
-  if (lines.length === 0) {
-    return Decoration.none;
-  }
-
-  const tree = treeForLines(state, lines);
-  const decorations: Range<Decoration>[] = [];
-  for (const line of lines) {
-    for (const { from, to, valueFrom, sniffed } of collapsesForLine(state, tree, line, rules)) {
-      const widget = new LargeValueWidget(from, to, valueFrom, sniffed);
-      decorations.push(Decoration.replace({ widget }).range(from, to));
-    }
-  }
-  return Decoration.set(decorations);
-}
-
-/**
- * Scoped to the viewport, so the cost is a screenful however big the document is.
- *
- * Recomputed when the document changes, when the viewport moves, and when background parsing
- * advances — a value can only be found once the grammar has reached it.
- */
-function collapsePlugin(rules: CollapseRules) {
-  return ViewPlugin.fromClass(
-    class {
-      decorations: DecorationSet;
-
-      constructor(view: EditorView) {
-        this.decorations = collapseDecorations(view.state, view.visibleRanges, rules);
-      }
-
-      update(update: ViewUpdate) {
-        if (
-          update.docChanged ||
-          update.viewportChanged ||
-          syntaxTree(update.startState) !== syntaxTree(update.state)
-        ) {
-          this.decorations = collapseDecorations(
-            update.view.state,
-            update.view.visibleRanges,
-            rules,
-          );
-        }
-      }
-    },
-    {
-      decorations: (v) => v.decorations,
-      // Step the cursor over a placeholder instead of stranding it inside, and delete it whole
-      provide: (plugin) =>
-        EditorView.atomicRanges.of((view) => view.plugin(plugin)?.decorations ?? Decoration.none),
-    },
-  );
-}
-
-/** All three rules. For a document nobody is editing. */
-export const largeValues: Extension = [collapsePlugin("all")];
-
-/** Only what we can name, which is the part that is safe to hide while someone is editing. */
-export const mediaValues: Extension = [collapsePlugin("media")];

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

@@ -1,170 +0,0 @@
-import { describe, expect, test } from "vite-plus/test";
-import { decodeBase64Prefix, labelForMime, SNIFF_HEAD_CHARS, sniffValue } from "./sniffValue";
-
-/** A base64 value that starts with `magic` and runs on for a while, as a real one would */
-function base64Of(magic: number[], length = 2_000): string {
-  const bytes = new Uint8Array(length);
-  bytes.set(magic);
-  for (let i = magic.length; i < length; i++) {
-    bytes[i] = i % 251;
-  }
-  let binary = "";
-  for (const byte of bytes) {
-    binary += String.fromCharCode(byte);
-  }
-  return btoa(binary);
-}
-
-/** One character, one byte. These are all ASCII signatures. */
-function ascii(s: string): number[] {
-  const bytes: number[] = [];
-  for (let i = 0; i < s.length; i++) {
-    bytes.push(s.charCodeAt(i));
-  }
-  return bytes;
-}
-
-/** Four bytes no signature looks at: a RIFF chunk length, or an ISO-BMFF box size */
-const IGNORED = [0x00, 0x00, 0x00, 0x20];
-
-const PNG = [0x89, ...ascii("PNG"), 0x0d, 0x0a, 0x1a, 0x0a];
-const JPEG = [0xff, 0xd8, 0xff, 0xe0];
-const PDF = ascii("%PDF-1.7");
-
-describe("magic numbers", () => {
-  const cases: [string, number[], string, string][] = [
-    ["PNG", PNG, "image/png", "PNG"],
-    ["JPEG", JPEG, "image/jpeg", "JPEG"],
-    ["GIF", ascii("GIF89a"), "image/gif", "GIF"],
-    ["PDF", PDF, "application/pdf", "PDF"],
-    ["WEBP", [...ascii("RIFF"), ...IGNORED, ...ascii("WEBP")], "image/webp", "WEBP"],
-    ["WAV", [...ascii("RIFF"), ...IGNORED, ...ascii("WAVE")], "audio/wav", "WAV"],
-    ["ZIP", [...ascii("PK"), 0x03, 0x04], "application/zip", "ZIP"],
-    ["GZIP", [0x1f, 0x8b, 0x08], "application/gzip", "GZIP"],
-    ["MP3", [...ascii("ID3"), 0x04], "audio/mpeg", "MP3"],
-    ["OGG", ascii("OggS"), "audio/ogg", "OGG"],
-    ["FLAC", ascii("fLaC"), "audio/flac", "FLAC"],
-    ["WEBM", [0x1a, 0x45, 0xdf, 0xa3], "video/webm", "WEBM"],
-    ["MP4", [...IGNORED, ...ascii("ftypisom")], "video/mp4", "MP4"],
-    ["AVIF", [...IGNORED, ...ascii("ftypavif")], "image/avif", "AVIF"],
-    ["HEIC", [...IGNORED, ...ascii("ftypheic")], "image/heic", "HEIC"],
-    ["M4A", [...IGNORED, ...ascii("ftypM4A ")], "audio/mp4", "M4A"],
-    ["MOV", [...IGNORED, ...ascii("ftypqt  ")], "video/quicktime", "MOV"],
-    ["BMP", ascii("BMxx"), "image/bmp", "BMP"],
-    ["TIFF", [...ascii("II"), 0x2a, 0x00], "image/tiff", "TIFF"],
-  ];
-
-  for (const [name, magic, mime, label] of cases) {
-    test(`recognises ${name}`, () => {
-      expect(sniffValue(base64Of(magic))).toEqual({ mime, label, offset: 0, encoding: "base64" });
-    });
-  }
-
-  test("recognises nothing in arbitrary base64", () => {
-    expect(sniffValue(btoa("just some text that happens to be encoded"))).toBeNull();
-  });
-
-  test("recognises nothing in text that isn't base64", () => {
-    expect(sniffValue("the quick brown fox jumps over the lazy dog".repeat(10))).toBeNull();
-  });
-
-  test("recognises nothing in a JWT-shaped value", () => {
-    expect(sniffValue(`${btoa('{"alg":"HS256"}')}.${btoa('{"sub":"1"}')}.c2ln`)).toBeNull();
-  });
-
-  test("reads the url-safe alphabet", () => {
-    const urlSafe = base64Of(PNG).replaceAll("+", "-").replaceAll("/", "_");
-    expect(sniffValue(urlSafe)?.label).toBe("PNG");
-  });
-
-  test("ignores leading whitespace, and counts it in the offset", () => {
-    expect(sniffValue(`   ${base64Of(PNG)}`)).toMatchObject({ label: "PNG", offset: 3 });
-  });
-});
-
-describe("data URIs", () => {
-  test("takes the declared type over the bytes", () => {
-    const uri = `data:image/svg+xml;base64,${btoa("<svg/>")}`;
-    expect(sniffValue(uri)).toEqual({
-      mime: "image/svg+xml",
-      label: "SVG",
-      offset: "data:image/svg+xml;base64,".length,
-      encoding: "base64",
-    });
-  });
-
-  test("points past the header, so the payload can be decoded from there", () => {
-    const payload = base64Of(PNG);
-    const uri = `data:image/png;base64,${payload}`;
-    const sniffed = sniffValue(uri)!;
-    expect(uri.slice(sniffed.offset, sniffed.offset + 8)).toBe(payload.slice(0, 8));
-  });
-
-  test("falls back to the bytes when the declared type says nothing", () => {
-    const uri = `data:application/octet-stream;base64,${base64Of(PDF)}`;
-    expect(sniffValue(uri)).toMatchObject({ mime: "application/pdf", label: "PDF" });
-  });
-
-  test("handles a header with no type at all", () => {
-    expect(sniffValue(`data:;base64,${base64Of(JPEG)}`)).toMatchObject({ mime: "image/jpeg" });
-  });
-
-  test("handles extra parameters", () => {
-    const uri = `data:text/plain;charset=utf-8;base64,${btoa("hello")}`;
-    expect(sniffValue(uri)).toMatchObject({ mime: "text/plain", encoding: "base64" });
-  });
-
-  test("handles a percent-encoded payload", () => {
-    expect(sniffValue("data:text/html,%3Ch1%3Ehi%3C/h1%3E")).toEqual({
-      mime: "text/html",
-      label: "HTML",
-      offset: "data:text/html,".length,
-      encoding: "percent",
-    });
-  });
-
-  test("defaults a bare percent-encoded payload to text", () => {
-    expect(sniffValue("data:,hello%20there")).toMatchObject({
-      mime: "text/plain",
-      encoding: "percent",
-    });
-  });
-});
-
-describe("decoding only the head", () => {
-  test("reads no more of the value than the bytes asked for", () => {
-    const big = base64Of(PNG, 3_000_000);
-    // Truncating to the head must not change what is found, which is the whole point:
-    // callers only ever hand it a slice
-    expect(sniffValue(big.slice(0, SNIFF_HEAD_CHARS))).toEqual(sniffValue(big));
-  });
-
-  test("decodes whole 4-character groups only", () => {
-    // 12 bytes needs 16 characters; a 15-character slice yields the 12 bytes of 3 whole groups
-    expect(decodeBase64Prefix(base64Of(PNG), 0, 12)).toHaveLength(12);
-    expect(decodeBase64Prefix(base64Of(PNG).slice(0, 15), 0, 12)).toHaveLength(9);
-  });
-
-  test("declines a value too short to hold a group", () => {
-    expect(decodeBase64Prefix("abc", 0, 12)).toBeNull();
-  });
-
-  test("declines text outside the alphabet", () => {
-    expect(decodeBase64Prefix("hello world, not base64!", 0, 12)).toBeNull();
-  });
-});
-
-describe("labels", () => {
-  test.each([
-    ["image/png", "PNG"],
-    ["image/svg+xml", "SVG"],
-    ["text/plain", "TEXT"],
-    ["application/vnd.ms-excel", "MS-EXCEL"],
-    ["image/x-icon", "ICON"],
-    ["application/octet-stream", "APPLICATION"],
-    ["font/woff2", "WOFF2"],
-    ["application/vnd.openxmlformats-officedocument.wordprocessingml.document", "DOCUMENT"],
-  ])("%s reads as %s", (mime, label) => {
-    expect(labelForMime(mime)).toBe(label);
-  });
-});

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

@@ -1,219 +0,0 @@
-/**
- * What a collapsed value turns out to be.
- *
- * Sniffing reads the head of the value only. A `data:` URI states its own media type, and raw
- * base64 gives up its type in the first few bytes, so neither needs the rest — which is the
- * point, since the whole reason these values are collapsed is that touching all of one costs
- * enough to stall the UI.
- */
-export interface SniffedValue {
-  /** Full media type, e.g. `image/png`. What the dialog routes on. */
-  mime: string;
-  /** A word for the tag, e.g. `PNG`. */
-  label: string;
-  /** Where the encoded payload starts in the value, past any `data:` header. */
-  offset: number;
-  encoding: "base64" | "percent";
-}
-
-/**
- * How much of a value {@link sniffValue} needs. Enough for a `data:` header of realistic
- * length, and far more than the 24 base64 characters the magic numbers are read from.
- */
-export const SNIFF_HEAD_CHARS = 256;
-
-/** Bytes the longest signature needs: `RIFF????WEBP`, and an ISO-BMFF brand at offset 8. */
-const SNIFF_BYTES = 12;
-
-/** `data:[<mime>][;<param>…],` — the payload follows the comma. */
-const DATA_URI = /^data:([^,;]*)((?:;[^,;]*)*),/;
-
-/** Media types that name no format, so the bytes are worth a look even when one is declared. */
-const UNINFORMATIVE = ["", "application/octet-stream", "binary/octet-stream"];
-
-interface Signature {
-  label: string;
-  mime: string;
-  offset?: number;
-  /** Byte values, where `null` matches anything */
-  magic: readonly (number | null)[];
-}
-
-/**
- * A magic number written as the ASCII it reads as, with `?` for a byte that varies.
- *
- * Indexed rather than iterated, because a signature is a sequence of bytes: one character here
- * is one byte, and splitting into code points would be the wrong unit for that.
- */
-function ascii(pattern: string): (number | null)[] {
-  const bytes: (number | null)[] = [];
-  for (let i = 0; i < pattern.length; i++) {
-    bytes.push(pattern[i] === "?" ? null : pattern.charCodeAt(i));
-  }
-  return bytes;
-}
-
-const SIGNATURES: readonly Signature[] = [
-  { label: "PNG", mime: "image/png", magic: [0x89, ...ascii("PNG"), 0x0d, 0x0a, 0x1a, 0x0a] },
-  { label: "JPEG", mime: "image/jpeg", magic: [0xff, 0xd8, 0xff] },
-  { label: "GIF", mime: "image/gif", magic: ascii("GIF8") },
-  { label: "BMP", mime: "image/bmp", magic: ascii("BM") },
-  { label: "WEBP", mime: "image/webp", magic: ascii("RIFF????WEBP") },
-  { label: "TIFF", mime: "image/tiff", magic: [...ascii("II"), 0x2a, 0x00] },
-  { label: "TIFF", mime: "image/tiff", magic: [...ascii("MM"), 0x00, 0x2a] },
-  { label: "ICO", mime: "image/x-icon", magic: [0x00, 0x00, 0x01, 0x00] },
-  { label: "PDF", mime: "application/pdf", magic: ascii("%PDF-") },
-  { label: "WAV", mime: "audio/wav", magic: ascii("RIFF????WAVE") },
-  { label: "AVI", mime: "video/x-msvideo", magic: ascii("RIFF????AVI ") },
-  { label: "MP3", mime: "audio/mpeg", magic: ascii("ID3") },
-  // A bare MPEG frame header: 11 sync bits, then a layer III / II / I version pair
-  { label: "MP3", mime: "audio/mpeg", magic: [0xff, 0xfb] },
-  { label: "MP3", mime: "audio/mpeg", magic: [0xff, 0xf3] },
-  { label: "MP3", mime: "audio/mpeg", magic: [0xff, 0xf2] },
-  { label: "OGG", mime: "audio/ogg", magic: ascii("OggS") },
-  { label: "FLAC", mime: "audio/flac", magic: ascii("fLaC") },
-  { label: "WEBM", mime: "video/webm", magic: [0x1a, 0x45, 0xdf, 0xa3] },
-  { label: "ZIP", mime: "application/zip", magic: [...ascii("PK"), 0x03, 0x04] },
-  { label: "GZIP", mime: "application/gzip", magic: [0x1f, 0x8b] },
-  { label: "7Z", mime: "application/x-7z-compressed", magic: [...ascii("7z"), 0xbc, 0xaf, 0x27] },
-  { label: "RAR", mime: "application/vnd.rar", magic: ascii("Rar!") },
-  { label: "GLTF", mime: "model/gltf-binary", magic: ascii("glTF") },
-];
-
-/**
- * ISO base media files all start `????ftyp`, so the format is in the brand that follows rather
- * than in the signature itself. Anything unlisted is some flavour of MP4.
- */
-const ISO_BRANDS: Record<string, { mime: string; label: string }> = {
-  avif: { mime: "image/avif", label: "AVIF" },
-  avis: { mime: "image/avif", label: "AVIF" },
-  heic: { mime: "image/heic", label: "HEIC" },
-  heix: { mime: "image/heic", label: "HEIC" },
-  hevc: { mime: "image/heic", label: "HEIC" },
-  mif1: { mime: "image/heif", label: "HEIF" },
-  msf1: { mime: "image/heif", label: "HEIF" },
-  "M4A ": { mime: "audio/mp4", label: "M4A" },
-  "qt  ": { mime: "video/quicktime", label: "MOV" },
-};
-
-function matches(bytes: Uint8Array, { magic, offset = 0 }: Signature): boolean {
-  if (bytes.length < offset + magic.length) return false;
-  return magic.every((b, i) => b == null || bytes[offset + i] === b);
-}
-
-function readAscii(bytes: Uint8Array, from: number, length: number): string {
-  return String.fromCharCode(...bytes.subarray(from, from + length));
-}
-
-/** The format the first bytes of a file identify it as, or null if they identify nothing. */
-export function sniffBytes(bytes: Uint8Array): { mime: string; label: string } | null {
-  if (readAscii(bytes, 4, 4) === "ftyp") {
-    return ISO_BRANDS[readAscii(bytes, 8, 4)] ?? { mime: "video/mp4", label: "MP4" };
-  }
-  const sig = SIGNATURES.find((s) => matches(bytes, s));
-  return sig == null ? null : { mime: sig.mime, label: sig.label };
-}
-
-/**
- * The first `bytes` bytes of a base64 payload, or null if it isn't base64 after all.
- *
- * Only the characters those bytes need are decoded. The trailing partial group is dropped
- * rather than padded, since `atob` rejects a group of one or two characters outright and we
- * have no use for the byte a three-character group would add.
- */
-export function decodeBase64Prefix(text: string, offset: number, bytes: number): Uint8Array | null {
-  const wanted = Math.ceil(bytes / 3) * 4;
-  let b64 = text.slice(offset, offset + wanted);
-  b64 = b64.slice(0, b64.length - (b64.length % 4));
-  if (b64.length === 0) return null;
-
-  // The URL-safe alphabet stands for the same bytes
-  b64 = b64.replaceAll("-", "+").replaceAll("_", "/");
-  if (!/^[A-Za-z0-9+/]+$/.test(b64)) return null;
-
-  try {
-    const binary = atob(b64);
-    const out = new Uint8Array(binary.length);
-    for (let i = 0; i < binary.length; i++) {
-      out[i] = binary.charCodeAt(i);
-    }
-    return out;
-  } catch {
-    return null;
-  }
-}
-
-/**
- * What a value is, from its head alone, or null if nothing recognises it.
- *
- * `head` need only be the first {@link SNIFF_HEAD_CHARS} characters — pass more and the rest is
- * ignored. The offsets in the result are relative to the start of the whole value.
- */
-export function sniffValue(head: string): SniffedValue | null {
-  const lead = head.length - head.trimStart().length;
-  const value = head.slice(lead);
-
-  const dataUri = DATA_URI.exec(value);
-  if (dataUri != null) {
-    const declared = dataUri[1]!.toLowerCase();
-    const offset = lead + dataUri[0].length;
-    if (!dataUri[2]!.split(";").includes("base64")) {
-      // A percent-encoded payload states its own type or is text by definition
-      const mime = declared === "" ? "text/plain" : declared;
-      return { mime, label: labelForMime(mime), offset, encoding: "percent" };
-    }
-    if (!UNINFORMATIVE.includes(declared)) {
-      return { mime: declared, label: labelForMime(declared), offset, encoding: "base64" };
-    }
-    return sniffBase64At(head, offset);
-  }
-
-  return sniffBase64At(head, lead);
-}
-
-function sniffBase64At(head: string, offset: number): SniffedValue | null {
-  const bytes = decodeBase64Prefix(head, offset, SNIFF_BYTES);
-  const sniffed = bytes == null ? null : sniffBytes(bytes);
-  return sniffed == null ? null : { ...sniffed, offset, encoding: "base64" };
-}
-
-/** The shortest run of base64 that {@link isEncodedRun} will accept as convincing */
-const ENCODED_RUN_CHARS = 64;
-
-/**
- * Whether a value is one unbroken run of base64, rather than text that merely opens like it.
- *
- * A magic number is only a few bytes, so short ones match by chance — `BM` is two, which comes
- * up about once in every 65,000 values. That was harmless while a value had to be long enough
- * to hurt rendering before anything was hidden, and the sniff only chose the label. It is not
- * harmless when the sniff itself decides to hide something, so that rule asks for this as well:
- * prose leaves the alphabet within a few characters, and an encoded blob never does.
- */
-export function isEncodedRun(head: string, offset: number): boolean {
-  const run = head.slice(offset);
-  return run.length >= ENCODED_RUN_CHARS && /^[A-Za-z0-9+/\-_]+={0,2}$/.test(run);
-}
-
-/** Subtypes whose own name makes a poor label */
-const LABEL_OVERRIDES: Record<string, string> = {
-  "text/plain": "TEXT",
-};
-
-/**
- * A word short enough for a tag. The distinguishing part of a subtype is its last dotted
- * segment before any `+suffix`, so `image/svg+xml` reads as SVG and `application/vnd.ms-excel`
- * as MS-EXCEL. Anything still too long falls back to the top-level type.
- */
-export function labelForMime(mime: string): string {
-  const override = LABEL_OVERRIDES[mime];
-  if (override != null) {
-    return override;
-  }
-
-  const [type, subtype] = mime.split("/");
-  const word = (subtype ?? "").split("+")[0]!.split(".").pop()!.replace(/^x-/, "");
-  if (word.length > 0 && word.length <= 10 && word !== "octet-stream") {
-    return word.toUpperCase();
-  }
-  return (type ?? mime).toUpperCase();
-}

apps/yaak-client/components/core/Editor/twig/pathParameters.ts

@@ -53,17 +53,19 @@ function pathParameters(
         if (node.name === "Text") {
           // Find the `url` node and then jump into it to find the placeholders
           for (let i = node.from; i < node.to; i++) {
-            const innerTree = tree.resolveInner(i);
+            const innerTree = syntaxTree(view.state).resolveInner(i);
             if (innerTree.node.name === "url") {
-              innerTree.node.cursor().iterate((node) => {
-                if (node.name !== "Placeholder") return;
-                const globalFrom = node.from;
-                const globalTo = node.to;
-                const rawText = view.state.doc.sliceString(globalFrom, globalTo);
-                const onClick = () => onClickPathParameter(rawText);
-                const widget = new PathPlaceholderWidget(rawText, globalFrom, onClick);
-                const deco = Decoration.replace({ widget, inclusive: false });
-                widgets.push(deco.range(globalFrom, globalTo));
+              innerTree.toTree().iterate({
+                enter(node) {
+                  if (node.name !== "Placeholder") return;
+                  const globalFrom = innerTree.node.from + node.from;
+                  const globalTo = innerTree.node.from + node.to;
+                  const rawText = view.state.doc.sliceString(globalFrom, globalTo);
+                  const onClick = () => onClickPathParameter(rawText);
+                  const widget = new PathPlaceholderWidget(rawText, globalFrom, onClick);
+                  const deco = Decoration.replace({ widget, inclusive: false });
+                  widgets.push(deco.range(globalFrom, globalTo));
+                },
               });
               break;
             }

apps/yaak-client/components/core/Editor/url/completion.test.ts

@@ -1,49 +0,0 @@
-import type { Completion } from "@codemirror/autocomplete";
-import { EditorState, type TransactionSpec } from "@codemirror/state";
-import type { EditorView } from "@codemirror/view";
-import { describe, expect, test } from "vite-plus/test";
-import { applyUrlCompletion, getUrlCompletionConfig } from "./completion";
-
-describe("applyUrlCompletion", () => {
-  test("consumes an existing protocol suffix and preserves the rest of the URL", () => {
-    expect(applyCompletion("http://rickandmortyapi.com/api/character", "http://", 4)).toBe(
-      "http://rickandmortyapi.com/api/character",
-    );
-  });
-
-  test("inserts a protocol when there is no existing suffix", () => {
-    expect(applyCompletion("htt", "http://", 3)).toBe("http://");
-  });
-
-  test("replaces the full URL when accepting a saved URL", () => {
-    expect(applyCompletion("htt://old.example/path", "https://new.example/api", 3)).toBe(
-      "https://new.example/api",
-    );
-  });
-});
-
-describe("getUrlCompletionConfig", () => {
-  test("always includes protocols alongside saved URL options", () => {
-    const config = getUrlCompletionConfig([{ label: "https://example.com" }]);
-
-    expect(config.options.map((option) => option.label)).toEqual([
-      "http://",
-      "https://",
-      "https://example.com",
-    ]);
-    expect(config.options.every((option) => option.apply === applyUrlCompletion)).toBe(true);
-  });
-});
-
-function applyCompletion(document: string, label: string, cursor: number) {
-  let state = EditorState.create({ doc: document, selection: { anchor: cursor } });
-  const view = {
-    state,
-    dispatch: (spec: TransactionSpec) => {
-      state = state.update(spec).state;
-    },
-  } as unknown as EditorView;
-
-  applyUrlCompletion(view, { label } satisfies Completion, 0, cursor);
-  return state.doc.toString();
-}

apps/yaak-client/components/core/Editor/url/completion.ts

@@ -1,51 +1,9 @@
-import { insertCompletionText, pickedCompletion, type Completion } from "@codemirror/autocomplete";
-import type { EditorView } from "@codemirror/view";
-import type { GenericCompletionOption } from "@yaakapp-internal/plugins";
-import {
-  genericCompletion,
-  type GenericCompletion,
-  type GenericCompletionConfig,
-} from "../genericCompletion";
+import { genericCompletion } from "../genericCompletion";
 
-const protocolOptions: GenericCompletionOption[] = [
-  { label: "http://", type: "constant" },
-  { label: "https://", type: "constant" },
-];
-
-export function getUrlCompletionConfig(
-  options: GenericCompletionOption[],
-  minMatch = 3,
-): GenericCompletionConfig {
-  const urlOptions = [
-    ...protocolOptions,
-    ...options.filter(
-      (option) => !protocolOptions.some((protocol) => protocol.label === option.label),
-    ),
-  ];
-  return {
-    minMatch,
-    options: urlOptions.map<GenericCompletion>((option) => ({
-      ...option,
-      apply: applyUrlCompletion,
-    })),
-  };
-}
-
-export function applyUrlCompletion(
-  view: EditorView,
-  completion: Completion,
-  from: number,
-  to: number,
-) {
-  const isProtocol = /^https?:\/\/$/.test(completion.label);
-  const replaceTo = isProtocol
-    ? to + (view.state.sliceDoc(to, to + 3) === "://" ? 3 : 0)
-    : view.state.doc.length;
-
-  view.dispatch({
-    ...insertCompletionText(view.state, completion.label, from, replaceTo),
-    annotations: pickedCompletion.of(completion),
-  });
-}
-
-export const completions = genericCompletion(getUrlCompletionConfig([], 1));
+export const completions = genericCompletion({
+  options: [
+    { label: "http://", type: "constant" },
+    { label: "https://", type: "constant" },
+  ],
+  minMatch: 1,
+});