diff --git a/.github/workflows/ksai.yml b/.github/workflows/ksai.yml
new file mode 100644
index 0000000000..4fb8ebe231
--- /dev/null
+++ b/.github/workflows/ksai.yml
@@ -0,0 +1,118 @@
+---
+name: KSAI
+
+permissions: {}
+
+on:  # yamllint disable-line rule:truthy
+  issue_comment:
+    types: [created]
+  pull_request_review_comment:
+    types: [created]
+  pull_request:
+    types: [review_requested, opened, ready_for_review]
+  pull_request_review:
+    types: [submitted]
+  workflow_dispatch:
+    inputs:
+      pr:
+        description: Pull request number to review
+        required: false
+      actor:
+        description: GitHub username to authorize against CODEOWNERS, matching comment authorization
+        required: false
+      issue_number:
+        description: Issue number for plan continuation; empty when work_ref names the work
+        required: false
+      work_ref:
+        description: The work to do when there is no GitHub issue, as jira/<KEY>
+        required: false
+      attempt:
+        description: Runs already spent by this continuation chain
+        required: false
+      stall:
+        description: Consecutive runs that completed no step
+        required: false
+      prev_remaining:
+        description: Unchecked boxes seen by the predecessor, with empty distinct from zero
+        required: false
+      comment_id:
+        description: Comment a dispatched request answers, read back from GitHub rather than believed
+        required: false
+      comment_kind:
+        description: Which space comment_id came from, issue, review or submitted_review
+        required: false
+      record_id:
+        description: Dispatch record written for this run, read back over the run's own OIDC token
+        required: false
+
+jobs:
+  ksai:
+    name: run
+    if: >-
+      (github.event_name == 'workflow_dispatch' &&
+      (inputs.pr != '' || inputs.issue_number != '' || inputs.work_ref != '' ||
+      inputs.comment_id != '' || inputs.comment_kind != '')) ||
+      ((github.event_name == 'issue_comment' ||
+      github.event_name == 'pull_request_review_comment') &&
+      github.event.comment.user.type != 'Bot' &&
+      (contains(github.event.comment.body, '/ksai') ||
+      (vars.KSAI_TRIGGER_PHRASE != '' &&
+      contains(github.event.comment.body, vars.KSAI_TRIGGER_PHRASE)))) ||
+      (github.event_name == 'issue_comment' &&
+      github.event.comment.user.type != 'Bot' &&
+      github.event.issue.pull_request &&
+      github.event.issue.user.type == 'Bot') ||
+      (github.event_name == 'pull_request_review_comment' &&
+      github.event.comment.user.type != 'Bot' &&
+      github.event.comment.in_reply_to_id &&
+      github.event.pull_request.head.repo.full_name == github.repository) ||
+      (github.event_name == 'pull_request_review' &&
+      github.event.action == 'submitted' &&
+      github.event.review.user.type != 'Bot' &&
+      github.event.pull_request.draft == true &&
+      github.event.pull_request.user.type == 'Bot' &&
+      github.event.pull_request.head.repo.full_name == github.repository)
+    uses: Kong/ksai-public/.github/workflows/ksai.yml@15f45eae5f0794b4e3f63875e9a8305fc9e60215 # v3.106.0
+    permissions:
+      contents: write       # checked out by every command, and pushed by one that changes code
+      issues: write         # every command answers with a comment, and reacts to the one that asked
+      pull-requests: write  # post reviews and maintain draft pull request plans
+      id-token: write       # mint the GitHub OIDC token for federation
+      checks: read          # read what CI said about the head
+      statuses: read        # the older API a build may report through
+      actions: write        # old caller review dispatch, successor plan runs and test publication
+    with:
+      trigger_phrase: ${{ vars.KSAI_TRIGGER_PHRASE }}
+      anthropic_base_url: ${{ vars.KSAI_ANTHROPIC_BASE_URL }}
+      federation_rule_id: ${{ vars.KSAI_FEDERATION_RULE_ID }}
+      organization_id: ${{ vars.KSAI_ORGANIZATION_ID }}
+      service_account_id: ${{ vars.KSAI_SERVICE_ACCOUNT_ID }}
+      workspace_id: ${{ vars.KSAI_WORKSPACE_ID }}
+      push_as_app: false
+      pr: ${{ inputs.pr }}
+      actor: ${{ inputs.actor }}
+      issue_number: ${{ inputs.issue_number }}
+      work_ref: ${{ inputs.work_ref }}
+      attempt: ${{ inputs.attempt }}
+      stall: ${{ inputs.stall }}
+      prev_remaining: ${{ inputs.prev_remaining }}
+      comment_id: ${{ inputs.comment_id }}
+      comment_kind: ${{ inputs.comment_kind }}
+      record_id: ${{ inputs.record_id }}
+
+  request:
+    if: >-
+      (github.event_name == 'pull_request' &&
+      github.event.action == 'review_requested' &&
+      github.event.requested_team.slug == (vars.KSAI_REVIEW_TEAM || 'ksai') &&
+      github.event.pull_request.head.repo.full_name == github.repository &&
+      github.event.sender.type != 'Bot') ||
+      (github.event_name == 'pull_request' &&
+      contains(fromJSON('["opened", "ready_for_review"]'), github.event.action) &&
+      github.event.pull_request.head.repo.full_name == github.repository)
+    uses: Kong/ksai-public/.github/workflows/ksai-request.yml@15f45eae5f0794b4e3f63875e9a8305fc9e60215 # v3.106.0
+    permissions:
+      actions: write  # dispatch this workflow onto the default branch
+      contents: read  # download the actions this call runs
+    with:
+      push_as_app: false
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index e50521fbc9..230e8da329 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -392,6 +392,8 @@ jobs:
 
       - name: Checkout branch
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
 
       - name: Get release version
         id: release_version
diff --git a/.github/workflows/release-recurring.yml b/.github/workflows/release-recurring.yml
index 4ee012c500..45352f7fdd 100644
--- a/.github/workflows/release-recurring.yml
+++ b/.github/workflows/release-recurring.yml
@@ -48,6 +48,8 @@ jobs:
 
       - name: Checkout branch
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
 
       - name: Setup Node
         uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
diff --git a/.github/workflows/release-start.yml b/.github/workflows/release-start.yml
index 666262bc0c..5136ad0006 100644
--- a/.github/workflows/release-start.yml
+++ b/.github/workflows/release-start.yml
@@ -36,6 +36,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           ref: develop
           fetch-depth: 0
+          persist-credentials: false
 
       - name: Setup Node
         uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
diff --git a/.github/workflows/sast.yml b/.github/workflows/sast.yml
index 762f298d78..f5d42d14e4 100644
--- a/.github/workflows/sast.yml
+++ b/.github/workflows/sast.yml
@@ -27,4 +27,6 @@ jobs:
           egress-policy: audit
 
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
       - uses: Kong/public-shared-actions/security-actions/semgrep@a18abf762d6e2444bcbfd20de70451ea1e3bc1b1 # 4.0.1
diff --git a/.github/workflows/test-cli.yml b/.github/workflows/test-cli.yml
index c9c6630711..80c4930855 100644
--- a/.github/workflows/test-cli.yml
+++ b/.github/workflows/test-cli.yml
@@ -32,6 +32,8 @@ jobs:
 
       - name: Checkout branch
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
 
       - name: Setup Node
         uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 4174c33782..c43f75d047 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -78,6 +78,8 @@ jobs:
 
       - name: Checkout branch
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
 
       - name: Setup Node
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
@@ -100,8 +102,82 @@ jobs:
           name: app-build
           path: packages/insomnia/build/
 
+      - name: Download previous Playwright last run state
+        if: ${{ github.run_attempt > 1 }}
+        continue-on-error: true
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          pattern: playwright-last-run-shard-${{ matrix.shardIndex }}-attempt-*
+          path: .playwright-last-run-history
+
+      - name: Restore previous Playwright last run state
+        if: ${{ github.run_attempt > 1 }}
+        env:
+          SHARD_INDEX: ${{ matrix.shardIndex }}
+          SHARD_TOTAL: ${{ matrix.shardTotal }}
+        run: |
+          set -euo pipefail
+          CURRENT_ATTEMPT="${GITHUB_RUN_ATTEMPT}"
+          PREVIOUS_ATTEMPT=$((CURRENT_ATTEMPT - 1))
+          mkdir -p packages/insomnia-smoke-test/traces
+
+          if [ ! -d .playwright-last-run-history ]; then
+            echo "::notice::No last-run history downloaded for shard $SHARD_INDEX/$SHARD_TOTAL. Falling back to full shard run."
+            exit 0
+          fi
+
+          CANDIDATE_FILE="$(
+            find .playwright-last-run-history -type f \( -name '.last-run.json' -o -path '*/traces/.last-run.json' \) \
+              | while IFS= read -r file; do
+                  if [[ "$file" =~ attempt-([0-9]+) ]]; then
+                    attempt="${BASH_REMATCH[1]}"
+                  else
+                    attempt="$PREVIOUS_ATTEMPT"
+                  fi
+
+                  if [ "$attempt" -lt "$CURRENT_ATTEMPT" ]; then
+                    printf '%s\t%s\n' "$attempt" "$file"
+                  fi
+                done \
+              | sort -t $'\t' -k1,1nr \
+              | head -n1 \
+              | cut -f2
+          )"
+
+          if [ -z "${CANDIDATE_FILE:-}" ]; then
+            echo "::notice::No previous last-run state found for shard $SHARD_INDEX/$SHARD_TOTAL. Falling back to full shard run."
+            exit 0
+          fi
+
+          cp "$CANDIDATE_FILE" packages/insomnia-smoke-test/traces/.last-run.json
+          echo "Restored Playwright last-run state from: $CANDIDATE_FILE"
+
       - name: Smoke test electron app (shard ${{ matrix.shardIndex }}/${{ matrix.shardTotal }})
-        run: npm run test:build -w packages/insomnia-smoke-test -- --project=Smoke --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
+        run: |
+          LAST_FAILED_ARGS=()
+
+          if [ "${GITHUB_RUN_ATTEMPT:-1}" -gt 1 ]; then
+            if [ ! -f packages/insomnia-smoke-test/traces/.last-run.json ]; then
+              echo "::notice::Rerun attempt detected but no previous .last-run.json for shard ${{ matrix.shardIndex }}/${{ matrix.shardTotal }}. Running full shard."
+            elif node -e "const fs=require('node:fs'); const data=JSON.parse(fs.readFileSync('packages/insomnia-smoke-test/traces/.last-run.json','utf8')); process.exit(Array.isArray(data.failedTests) && data.failedTests.length > 0 ? 0 : 1)"; then
+              echo "Rerun attempt detected. Running only last failed tests for shard ${{ matrix.shardIndex }}/${{ matrix.shardTotal }}."
+              LAST_FAILED_ARGS+=(--last-failed)
+            else
+              echo "::notice::No failed tests recorded in previous .last-run.json for shard ${{ matrix.shardIndex }}/${{ matrix.shardTotal }}. Running full shard."
+            fi
+          fi
+
+          npm run test:build -w packages/insomnia-smoke-test -- --project=Smoke --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} "${LAST_FAILED_ARGS[@]}"
+
+      - name: Upload Playwright last run state
+        if: ${{ always() }}
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          if-no-files-found: warn
+          name: playwright-last-run-shard-${{ matrix.shardIndex }}-attempt-${{ github.run_attempt }}
+          path: packages/insomnia-smoke-test/traces/.last-run.json
+          include-hidden-files: true
+          retention-days: 7
 
       - name: Upload smoke test traces
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a1eafd5f4c..8692dc5968 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -103,228 +103,92 @@ jobs:
         if: github.event_name != 'pull_request' || steps.vendor-changed.outputs.changed == 'true'
         run: npm run sandbox:vendored:test-regression -w insomnia
 
-      - name: Checkout base branch (cycle comparison)
-        if: github.event_name == 'pull_request' && always()
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          ref: ${{ github.event.pull_request.base.ref }}
-          path: insomnia-base
+      - name: Check circular references
+        id: check-cycles
+        continue-on-error: true
+        shell: bash
+        # Exit code 1 (a new cycle) and 2 (a stale baseline) are reported differently below, so
+        # capture it rather than letting `-e` collapse both into a generic step failure.
+        run: |
+          set +e
+          npm run check-cycle-references | tee cycle-report.txt
+          status=${PIPESTATUS[0]}
+          set -e
+          echo "status=$status" >> "$GITHUB_OUTPUT"
+          exit "$status"
 
-      - name: Setup Node (base branch tree)
-        if: github.event_name == 'pull_request' && always()
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
-        with:
-          node-version-file: insomnia-base/.nvmrc
-          cache: npm
-          cache-dependency-path: insomnia-base/package-lock.json
-          registry-url: 'https://npm.pkg.github.com'
-          scope: '@kong'
-
-      - name: Install packages (base branch tree)
-        if: github.event_name == 'pull_request' && always()
-        working-directory: insomnia-base
-        run: npm ci
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: '1'
-
-      - name: Check Circular References
-        if: github.event_name == 'pull_request' && always()
+      - name: Post circular references PR comment
+        if: github.event_name == 'pull_request' && always() && steps.check-cycles.outcome != 'skipped'
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const path = require('path');
+            const fs = require('fs');
 
-            const workspaceRoot = process.env.GITHUB_WORKSPACE;
-            const prPackagesDir = path.join(workspaceRoot, 'packages');
-            const basePackagesDir = path.join(workspaceRoot, 'insomnia-base', 'packages');
+            // 0 = matches baseline, 1 = a new cycle appeared, 2 = baseline is stale. Anything
+            // else means the check itself blew up, which is not a claim about cycles either way.
+            const status = '${{ steps.check-cycles.outputs.status }}';
+            const passed = status === '0';
+            const summaryByStatus = {
+              '0': { icon: '✅', text: 'No new circular references' },
+              '1': { icon: '⚠️', text: 'New circular references detected' },
+              '2': { icon: '♻️', text: 'No new circular references, but the baseline is stale — regenerate and commit it' },
+            };
+            const { icon, text } = summaryByStatus[status] ?? { icon: '💥', text: 'The circular reference check failed to run' };
+            const report = fs.readFileSync('cycle-report.txt', 'utf8').trim();
+            const markdownContent = `<details>
+            <summary>${icon} Circular References Report</summary>
 
-            async function analyzeCircularReferences(rootDir) {
-              const madge = require('madge');
-              const res = await madge(rootDir, {
-                fileExtensions: ['ts', 'tsx'],
-              });
-              return res.circular();
-            }
-
-            // Function to generate markdown report
-            function generateMarkdownReport(prCircularRefs, baseCircularRefs, prCount, baseCount, baseBranch) {
-              const timestamp = new Date().toISOString();
-              const diff = prCount - baseCount;
-              const diffPercent = baseCount > 0 ? ((diff / baseCount) * 100).toFixed(2) : '0.00';
-
-              let status = '✅ PASSED';
-              let statusEmoji = '✅';
-
-              if (diff > 0) {
-                status = '⚠️ WARNING';
-                statusEmoji = '⚠️';
-              } else if (diff === 0) {
-                status = '✅ NO CHANGE';
-                statusEmoji = '✅';
-              } else {
-                status = '✨ IMPROVED';
-                statusEmoji = '✨';
-              }
-
-              // Find new and removed circular references
-              const prCycleStrings = new Set(prCircularRefs.map(cycle => cycle.join(' -> ')));
-              const baseCycleStrings = new Set(baseCircularRefs.map(cycle => cycle.join(' -> ')));
-
-              const newCycles = Array.from(prCycleStrings).filter(cycle => !baseCycleStrings.has(cycle)).sort();
-              const removedCycles = Array.from(baseCycleStrings).filter(cycle => !prCycleStrings.has(cycle)).sort();
-
-              return `# ${statusEmoji} Circular References Report
-
-            **Generated at:** ${timestamp}
-            **Status:** ${status}
-
-            ## Summary
-            | Metric | Base (\`${baseBranch}\`) | PR | Change |
-            |--------|----------------|-----|---------|
-            | Total Circular References | ${baseCount} | ${prCount} | ${diff > 0 ? '+' : ''}${diff} (${diffPercent > 0 ? '+' : ''}${diffPercent}%) |
-
-            ${newCycles.length > 0 ? `
-            ## ⚠️ New Circular References Added (${newCycles.length})
-
-            <details open>
-            <summary>Click to expand/collapse</summary>
+            **Status:** ${text}
 
             \`\`\`
-            ${newCycles.join('\n')}
+            ${report}
             \`\`\`
-
             </details>
-            ` : ''}
-
-            ${removedCycles.length > 0 ? `
-            ## ✨ Circular References Removed (${removedCycles.length})
-
-            <details open>
-            <summary>Click to expand/collapse</summary>
-
-            \`\`\`
-            ${removedCycles.join('\n')}
-            \`\`\`
-
-            </details>
-            ` : ''}
-
-            <details>
-            <summary>Click to view all circular references in PR (${prCount})</summary>
-
-            \`\`\`
-            ${prCircularRefs.length > 0 ? prCircularRefs.sort().map(cycle => cycle.join(' -> ')).join('\n') : 'No circular references found'}
-            \`\`\`
-
-            </details>
-
-            <details>
-            <summary>Click to view all circular references in base branch (${baseCount})</summary>
-
-            \`\`\`
-            ${baseCircularRefs.length > 0 ? baseCircularRefs.sort().map(cycle => cycle.join(' -> ')).join('\n') : 'No circular references found'}
-            \`\`\`
-
-            </details>
-
-            ## Analysis
-
-            ${
-              diff > 0
-                ? `⚠️ **Warning:** This PR introduces ${diff} new circular ${diff === 1 ? 'reference' : 'references'}. Consider refactoring to avoid adding circular dependencies.`
-                : diff < 0
-                ? `✨ **Great Job!** This PR removes ${Math.abs(diff)} circular ${Math.abs(diff) === 1 ? 'reference' : 'references'}. Keep up the good work!`
-                : `✅ **No Change:** This PR does not introduce or remove any circular references.`
-            }
-
-            ---
-            *This report was generated automatically by comparing against the \`${baseBranch}\` branch.*
             `;
-            }
 
-            try {
-              const baseBranch = context.payload.pull_request.base.ref;
-              console.log(`Base branch (PR target): ${baseBranch}`);
-              console.log(`PR packages dir: ${prPackagesDir}`);
-              console.log(`Base packages dir: ${basePackagesDir}`);
+            const { data: comments } = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+            });
 
-              console.log('Analyzing circular references in PR (merge) tree...');
-              const prCircularRefs = await analyzeCircularReferences(prPackagesDir);
-              const prCount = prCircularRefs.length;
-              console.log(`PR: Found ${prCount} circular references`);
+            const botComment = comments.find(comment =>
+              comment.user?.type === 'Bot' &&
+              comment.body?.includes('Circular References Report')
+            );
 
-              console.log(`Analyzing circular references in ${baseBranch} tree...`);
-              const baseCircularRefs = await analyzeCircularReferences(basePackagesDir);
-              const baseCount = baseCircularRefs.length;
-              console.log(`Base: Found ${baseCount} circular references`);
-
-              // Generate report
-              const diff = prCount - baseCount;
-              const markdownContent = generateMarkdownReport(prCircularRefs, baseCircularRefs, prCount, baseCount, baseBranch);
-
-              // Post PR comment (skip creating/updating if there's no change in circular references,
-              // but clean up a stale comment from a previous run where there was a change)
-              if (context.eventName === 'pull_request') {
-                try {
-                  const { data: comments } = await github.rest.issues.listComments({
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    issue_number: context.issue.number,
-                  });
-
-                  const botComment = comments.find(comment =>
-                    comment.user?.type === 'Bot' &&
-                    comment.body?.includes('# ') &&
-                    comment.body?.includes('Circular References Report')
-                  );
-
-                  if (diff === 0) {
-                    if (botComment) {
-                      await github.rest.issues.deleteComment({
-                        owner: context.repo.owner,
-                        repo: context.repo.repo,
-                        comment_id: botComment.id,
-                      });
-                      console.log('Deleted stale PR comment (no change)');
-                    } else {
-                      console.log('No change in circular references, skipping PR comment');
-                    }
-                  } else if (botComment) {
-                    await github.rest.issues.updateComment({
-                      owner: context.repo.owner,
-                      repo: context.repo.repo,
-                      comment_id: botComment.id,
-                      body: markdownContent
-                    });
-                    console.log('Updated existing PR comment');
-                  } else {
-                    await github.rest.issues.createComment({
-                      owner: context.repo.owner,
-                      repo: context.repo.repo,
-                      issue_number: context.issue.number,
-                      body: markdownContent
-                    });
-                    console.log('Created new PR comment');
-                  }
-                } catch (error) {
-                  console.error('Error posting PR comment:', error);
-                }
-              }
-
-              // Log results but don't fail the build
-              if (diff > 0) {
-                console.log(`⚠️ Warning: This PR introduces ${diff} new circular ${diff === 1 ? 'reference' : 'references'}. Base: ${baseCount}, PR: ${prCount}`);
-              } else if (diff < 0) {
-                console.log(`✨ Great! This PR removes ${Math.abs(diff)} circular ${Math.abs(diff) === 1 ? 'reference' : 'references'}!`);
+            if (passed) {
+              if (botComment) {
+                await github.rest.issues.deleteComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  comment_id: botComment.id,
+                });
+                console.log('Deleted stale PR comment (no new circular references)');
               } else {
-                console.log(`✅ No change in circular references (${prCount})`);
+                console.log('No new circular references, skipping PR comment');
               }
-
-            } catch (error) {
-              console.error('Error analyzing circular references:', error);
-              core.setFailed('Failed to analyze circular references');
+            } else if (botComment) {
+              await github.rest.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: botComment.id,
+                body: markdownContent
+              });
+              console.log('Updated existing PR comment');
+            } else {
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number,
+                body: markdownContent
+              });
+              console.log('Created new PR comment');
             }
+
+      # Fails on a stale baseline too, not just on new cycles: the baseline is a ratchet, so a
+      # cycle left in it after being fixed would silently keep permitting its reintroduction.
+      - name: Fail if the circular reference check did not pass
+        if: steps.check-cycles.outcome == 'failure'
+        run: exit 1
diff --git a/package-lock.json b/package-lock.json
index afecb22c28..b75d87d59b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,6 +33,7 @@
         "@types/node": "^24.2.1",
         "@typescript-eslint/eslint-plugin": "^8.29.0",
         "@typescript-eslint/parser": "^8.29.0",
+        "dependency-cruiser": "^18.2.0",
         "esbuild": "^0.25.10",
         "esbuild-runner": "^2.2.2",
         "eslint": "^9.39.1",
@@ -43,7 +44,6 @@
         "eslint-plugin-simple-import-sort": "^12.1.1",
         "eslint-plugin-unicorn": "^62.0.0",
         "globals": "^16.5.0",
-        "madge": "^8.0.0",
         "patch-package": "^8.0.0",
         "prettier": "3.6.2",
         "prettier-plugin-tailwindcss": "^0.7.1",
@@ -1330,20 +1330,6 @@
       "integrity": "sha512-k5xhfgG1Sg9VRAzIsO/kuliM0hwTxg/4Fj2fmA83GtwKcihOTo71DkVXKN7ckh1GwWfHhf6htkpiBI2RjX/8Ag==",
       "license": "MIT"
     },
-    "node_modules/@dependents/detective-less": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@dependents/detective-less/-/detective-less-5.0.1.tgz",
-      "integrity": "sha512-Y6+WUMsTFWE5jb20IFP4YGa5IrGY/+a/FbOSjDF/wz9gepU2hwCYSXRHP/vPwBvwcY3SVMASt4yXxbXNXigmZQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "gonzales-pe": "^4.3.0",
-        "node-source-walk": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@develohpanda/fluent-builder": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@develohpanda/fluent-builder/-/fluent-builder-2.1.2.tgz",
@@ -3157,9 +3143,9 @@
       }
     },
     "node_modules/@kong/insomnia-plugin-external-vault": {
-      "version": "0.1.5-dev.20260806050036",
-      "resolved": "https://npm.pkg.github.com/download/@kong/insomnia-plugin-external-vault/0.1.5-dev.20260806050036/764507d31c7a92146b75d00e871059bc255ed28a",
-      "integrity": "sha512-7JVgIPeMgRLpcu/56A+KBhXdpLJj8m9ZivFsF1PTl5M6h02ctvC4g5h8gaMvL7LxJrCfCkfpB+PAytVrVf0suw==",
+      "version": "0.1.5",
+      "resolved": "https://npm.pkg.github.com/download/@kong/insomnia-plugin-external-vault/0.1.5/8c65150279fbca4ffc20ef2fb292397e81b0b8a4",
+      "integrity": "sha512-Z10Jqz8bcnLncOhPFXIKuZRP4N/wDEv9Qx6mZ0TOBUcCjQVq9iMoWYGx9Yl2WEQKfb8asztfgACCby6IyCN3Vg==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -6736,6 +6722,80 @@
       "integrity": "sha512-1EsNo0ZpgXu/90AWoRZf/oE3RVTUS80tiTUpt+hv5pjtAkw7icN4WskDwz/KdAw5ARbJLMhZBrO1NqThmy/McA==",
       "license": "MIT"
     },
+    "node_modules/@rjsf/core": {
+      "version": "6.0.0-beta.19",
+      "resolved": "https://registry.npmjs.org/@rjsf/core/-/core-6.0.0-beta.19.tgz",
+      "integrity": "sha512-w6sEQ0acFIS+DPMqf6stRRDFlv4NKd9/Ha1Ur5LckPDfG4++J79KMIZq2G8jFra+vzU8dHXd6sHO5BMElGe/VQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21",
+        "markdown-to-jsx": "^7.7.13",
+        "prop-types": "^15.8.1"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "peerDependencies": {
+        "@rjsf/utils": "^6.0.0-beta.19",
+        "react": ">=18"
+      }
+    },
+    "node_modules/@rjsf/utils": {
+      "version": "6.0.0-beta.19",
+      "resolved": "https://registry.npmjs.org/@rjsf/utils/-/utils-6.0.0-beta.19.tgz",
+      "integrity": "sha512-PXU07obCAOu5mMYoPfNkKZ6nyMXTfYhtYgKBU/wcu1Xryp5jI7ynsu5ifcfYcWDsEajznOLYBV+chpq7zjDpeg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "fast-uri": "^3.1.0",
+        "json-schema-merge-allof": "^0.8.1",
+        "jsonpointer": "^5.0.1",
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "peerDependencies": {
+        "react": ">=18"
+      }
+    },
+    "node_modules/@rjsf/validator-ajv8": {
+      "version": "6.0.0-beta.19",
+      "resolved": "https://registry.npmjs.org/@rjsf/validator-ajv8/-/validator-ajv8-6.0.0-beta.19.tgz",
+      "integrity": "sha512-Ps1iyaL4ldd5rHU843R7GVo5S7hH2E98fBeGNZ/GvlSqyband6sPfFp3qXnEdG2xmQOJNs64W7B6GhtN45V0hA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "ajv": "^8.17.1",
+        "ajv-formats": "^2.1.1",
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "peerDependencies": {
+        "@rjsf/utils": "^6.0.0-beta.19"
+      }
+    },
+    "node_modules/@rjsf/validator-ajv8/node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@rolldown/pluginutils": {
       "version": "1.0.0-beta.53",
       "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.53.tgz",
@@ -8595,96 +8655,6 @@
         "url": "https://github.com/tinyhttp/tinyhttp?sponsor=1"
       }
     },
-    "node_modules/@ts-graphviz/adapter": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@ts-graphviz/adapter/-/adapter-2.0.6.tgz",
-      "integrity": "sha512-kJ10lIMSWMJkLkkCG5gt927SnGZcBuG0s0HHswGzcHTgvtUe7yk5/3zTEr0bafzsodsOq5Gi6FhQeV775nC35Q==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ts-graphviz"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ts-graphviz"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "@ts-graphviz/common": "^2.1.5"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@ts-graphviz/ast": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@ts-graphviz/ast/-/ast-2.0.7.tgz",
-      "integrity": "sha512-e6+2qtNV99UT6DJSoLbHfkzfyqY84aIuoV8Xlb9+hZAjgpum8iVHprGeAMQ4rF6sKUAxrmY8rfF/vgAwoPc3gw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ts-graphviz"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ts-graphviz"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "@ts-graphviz/common": "^2.1.5"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@ts-graphviz/common": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@ts-graphviz/common/-/common-2.1.5.tgz",
-      "integrity": "sha512-S6/9+T6x8j6cr/gNhp+U2olwo1n0jKj/682QVqsh7yXWV6ednHYqxFw0ZsY3LyzT0N8jaZ6jQY9YD99le3cmvg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ts-graphviz"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ts-graphviz"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@ts-graphviz/core": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@ts-graphviz/core/-/core-2.0.7.tgz",
-      "integrity": "sha512-w071DSzP94YfN6XiWhOxnLpYT3uqtxJBDYdh6Jdjzt+Ce6DNspJsPQgpC7rbts/B8tEkq0LHoYuIF/O5Jh5rPg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ts-graphviz"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ts-graphviz"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "@ts-graphviz/ast": "^2.0.7",
-        "@ts-graphviz/common": "^2.1.5"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@types/accepts": {
       "version": "1.3.7",
       "resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.7.tgz",
@@ -9914,90 +9884,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@vue/compiler-core": {
-      "version": "3.5.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.31.tgz",
-      "integrity": "sha512-k/ueL14aNIEy5Onf0OVzR8kiqF/WThgLdFhxwa4e/KF/0qe38IwIdofoSWBTvvxQOesaz6riAFAUaYjoF9fLLQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/parser": "^7.29.2",
-        "@vue/shared": "3.5.31",
-        "entities": "^7.0.1",
-        "estree-walker": "^2.0.2",
-        "source-map-js": "^1.2.1"
-      }
-    },
-    "node_modules/@vue/compiler-core/node_modules/entities": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
-      "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/@vue/compiler-dom": {
-      "version": "3.5.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.31.tgz",
-      "integrity": "sha512-BMY/ozS/xxjYqRFL+tKdRpATJYDTTgWSo0+AJvJNg4ig+Hgb0dOsHPXvloHQ5hmlivUqw1Yt2pPIqp4e0v1GUw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@vue/compiler-core": "3.5.31",
-        "@vue/shared": "3.5.31"
-      }
-    },
-    "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.31.tgz",
-      "integrity": "sha512-M8wpPgR9UJ8MiRGjppvx9uWJfLV7A/T+/rL8s/y3QG3u0c2/YZgff3d6SuimKRIhcYnWg5fTfDMlz2E6seUW8Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/parser": "^7.29.2",
-        "@vue/compiler-core": "3.5.31",
-        "@vue/compiler-dom": "3.5.31",
-        "@vue/compiler-ssr": "3.5.31",
-        "@vue/shared": "3.5.31",
-        "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.21",
-        "postcss": "^8.5.8",
-        "source-map-js": "^1.2.1"
-      }
-    },
-    "node_modules/@vue/compiler-sfc/node_modules/magic-string": {
-      "version": "0.30.21",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
-      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.5"
-      }
-    },
-    "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.31.tgz",
-      "integrity": "sha512-h0xIMxrt/LHOvJKMri+vdYT92BrK3HFLtDqq9Pr/lVVfE4IyKZKvWf0vJFW10Yr6nX02OR4MkJwI0c1HDa1hog==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@vue/compiler-dom": "3.5.31",
-        "@vue/shared": "3.5.31"
-      }
-    },
-    "node_modules/@vue/shared": {
-      "version": "3.5.31",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.31.tgz",
-      "integrity": "sha512-nBxuiuS9Lj5bPkPbWogPUnjxxWpkRniX7e5UBQDWl6Fsf4roq9wwV+cR7ezQ4zXswNvPIlsdj1slcLB7XCsRAw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@xmldom/xmldom": {
       "version": "0.8.13",
       "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.13.tgz",
@@ -10071,9 +9957,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
-      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.18.0.tgz",
+      "integrity": "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -10101,6 +9987,26 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/acorn-jsx-walk": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-jsx-walk/-/acorn-jsx-walk-2.0.0.tgz",
+      "integrity": "sha512-uuo6iJj4D4ygkdzd6jPtcxs8vZgDX9YFIkqczGImoypX2fQ4dVImmu3UzA4ynixCIMTrEOWW+95M2HuBaCEOVA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/acorn-loose": {
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/acorn-loose/-/acorn-loose-8.5.2.tgz",
+      "integrity": "sha512-PPvV6g8UGMGgjrMu+n/f9E/tCSkNQ2Y97eFvuVdJfG11+xdIeDcLyNdC8SHcrHbRqkfwLASdplyR6B6sKM1U4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.15.0"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/acorn-walk": {
       "version": "8.3.5",
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz",
@@ -10225,13 +10131,6 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/apiconnect-wsdl": {
       "version": "2.0.36",
       "resolved": "https://registry.npmjs.org/apiconnect-wsdl/-/apiconnect-wsdl-2.0.36.tgz",
@@ -10475,13 +10374,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/app-module-path": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/app-module-path/-/app-module-path-2.2.0.tgz",
-      "integrity": "sha512-gkco+qxENJV+8vFcDiiFhuoSvRXb2a/QPqpSoWhVz829VNJfOTnELbBmPmNKFxf3xdNnw4DWCkzkDaavcX/1YQ==",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
     "node_modules/arg": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
@@ -10680,16 +10572,6 @@
         "node": "*"
       }
     },
-    "node_modules/ast-module-types": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-6.0.1.tgz",
-      "integrity": "sha512-WHw67kLXYbZuHTmcdbIrVArCq5wxo6NEuj3hiYAWr8mwJeC+C2mMCIBIWCiDoCye/OF/xelc+teJ1ERoWmnEIA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/ast-types": {
       "version": "0.14.2",
       "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz",
@@ -10889,43 +10771,6 @@
         "node": "*"
       }
     },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/bl/node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
     "node_modules/blakejs": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz",
@@ -11672,25 +11517,12 @@
         "node": ">=0.2.5"
       }
     },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/cli-spinners": {
       "version": "2.9.2",
       "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
       "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
-      "devOptional": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=6"
       },
@@ -12693,8 +12525,8 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "devOptional": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=4.0.0"
       }
@@ -12718,29 +12550,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/defaults": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "clone": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/defaults/node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/defer-to-connect": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
@@ -12810,6 +12619,67 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/dependency-cruiser": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/dependency-cruiser/-/dependency-cruiser-18.2.0.tgz",
+      "integrity": "sha512-xMDoLD0no6pDInR8/4rIIqZ4mERDnsjezk8PkNORYSfBLvjCOogUxaruepmi1uQtZQlYUgdT2u7G3jTlgKqNjw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "8.18.0",
+        "acorn-jsx": "5.3.2",
+        "acorn-jsx-walk": "2.0.0",
+        "acorn-loose": "8.5.2",
+        "acorn-walk": "8.3.5",
+        "commander": "15.0.0",
+        "enhanced-resolve": "5.24.5",
+        "ignore": "7.0.6",
+        "interpret": "3.1.1",
+        "is-installed-globally": "1.0.0",
+        "json5": "2.2.3",
+        "picomatch": "4.0.5",
+        "prompts": "2.4.2",
+        "rechoir": "0.8.0",
+        "safe-regex": "2.1.1",
+        "semver": "7.8.5",
+        "tsconfig-paths-webpack-plugin": "4.2.0",
+        "watskeburt": "6.0.0"
+      },
+      "bin": {
+        "depcruise": "bin/dependency-cruise.mjs",
+        "depcruise-baseline": "bin/depcruise-baseline.mjs",
+        "depcruise-fmt": "bin/depcruise-fmt.mjs",
+        "depcruise-wrap-stream-in-html": "bin/wrap-stream-in-html.mjs",
+        "dependency-cruise": "bin/dependency-cruise.mjs",
+        "dependency-cruiser": "bin/dependency-cruise.mjs"
+      },
+      "engines": {
+        "node": "^22||^24||>=26"
+      }
+    },
+    "node_modules/dependency-cruiser/node_modules/commander": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-15.0.0.tgz",
+      "integrity": "sha512-z67u4ZhzCL/Tydu1lJARtEZYWbWaN7oYLHbsuzocr6y4N6WZAagG3RQ4FW61V1/0+jImpj293XfrcYnd1qxtPg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=22.12.0"
+      }
+    },
+    "node_modules/dependency-cruiser/node_modules/semver": {
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/dependency-graph": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz",
@@ -12819,39 +12689,6 @@
         "node": ">= 0.6.0"
       }
     },
-    "node_modules/dependency-tree": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/dependency-tree/-/dependency-tree-11.4.0.tgz",
-      "integrity": "sha512-r4wZ1pfv8eQrnoWbIGdrJTVmlb0dkXdwBjKsotKO4gmfqrOsAMG+0+cfA5EZ3NO8umc85twXOl1eO27E5pjTzw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "commander": "^12.1.0",
-        "filing-cabinet": "^5.2.0",
-        "precinct": "^12.2.0",
-        "typescript": "^5.9.3"
-      },
-      "bin": {
-        "dependency-tree": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/dependency-tree/node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
     "node_modules/destroy": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
@@ -12879,147 +12716,6 @@
       "license": "MIT",
       "optional": true
     },
-    "node_modules/detective-amd": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/detective-amd/-/detective-amd-6.0.1.tgz",
-      "integrity": "sha512-TtyZ3OhwUoEEIhTFoc1C9IyJIud3y+xYkSRjmvCt65+ycQuc3VcBrPRTMWoO/AnuCyOB8T5gky+xf7Igxtjd3g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ast-module-types": "^6.0.1",
-        "escodegen": "^2.1.0",
-        "get-amd-module-type": "^6.0.1",
-        "node-source-walk": "^7.0.1"
-      },
-      "bin": {
-        "detective-amd": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/detective-cjs": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/detective-cjs/-/detective-cjs-6.1.0.tgz",
-      "integrity": "sha512-Qt3S4IddVNDb+71lm+jmt5NznIsgcKlibTnrw9Zr91rT9vRwKp+73+ImqLTNrQj4YuOxnzrC7GwIAVwF7136XQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ast-module-types": "^6.0.1",
-        "node-source-walk": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/detective-es6": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/detective-es6/-/detective-es6-5.0.1.tgz",
-      "integrity": "sha512-XusTPuewnSUdoxRSx8OOI6xIA/uld/wMQwYsouvFN2LAg7HgP06NF1lHRV3x6BZxyL2Kkoih4ewcq8hcbGtwew==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "node-source-walk": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/detective-postcss": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/detective-postcss/-/detective-postcss-7.0.1.tgz",
-      "integrity": "sha512-bEOVpHU9picRZux5XnwGsmCN4+8oZo7vSW0O0/Enq/TO5R2pIAP2279NsszpJR7ocnQt4WXU0+nnh/0JuK4KHQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-url": "^1.2.4",
-        "postcss-values-parser": "^6.0.2"
-      },
-      "engines": {
-        "node": "^14.0.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.47"
-      }
-    },
-    "node_modules/detective-sass": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/detective-sass/-/detective-sass-6.0.1.tgz",
-      "integrity": "sha512-jSGPO8QDy7K7pztUmGC6aiHkexBQT4GIH+mBAL9ZyBmnUIOFbkfZnO8wPRRJFP/QP83irObgsZHCoDHZ173tRw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "gonzales-pe": "^4.3.0",
-        "node-source-walk": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/detective-scss": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/detective-scss/-/detective-scss-5.0.1.tgz",
-      "integrity": "sha512-MAyPYRgS6DCiS6n6AoSBJXLGVOydsr9huwXORUlJ37K3YLyiN0vYHpzs3AdJOgHobBfispokoqrEon9rbmKacg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "gonzales-pe": "^4.3.0",
-        "node-source-walk": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/detective-stylus": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/detective-stylus/-/detective-stylus-5.0.1.tgz",
-      "integrity": "sha512-Dgn0bUqdGbE3oZJ+WCKf8Dmu7VWLcmRJGc6RCzBgG31DLIyai9WAoEhYRgIHpt/BCRMrnXLbGWGPQuBUrnF0TA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/detective-typescript": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-14.0.0.tgz",
-      "integrity": "sha512-pgN43/80MmWVSEi5LUuiVvO/0a9ss5V7fwVfrJ4QzAQRd3cwqU1SfWGXJFcNKUqoD5cS+uIovhw5t/0rSeC5Mw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "^8.23.0",
-        "ast-module-types": "^6.0.1",
-        "node-source-walk": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "typescript": "^5.4.4"
-      }
-    },
-    "node_modules/detective-vue2": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/detective-vue2/-/detective-vue2-2.2.0.tgz",
-      "integrity": "sha512-sVg/t6O2z1zna8a/UIV6xL5KUa2cMTQbdTIIvqNM0NIPswp52fe43Nwmbahzj3ww4D844u/vC2PYfiGLvD3zFA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@dependents/detective-less": "^5.0.1",
-        "@vue/compiler-sfc": "^3.5.13",
-        "detective-es6": "^5.0.1",
-        "detective-sass": "^6.0.1",
-        "detective-scss": "^5.0.1",
-        "detective-stylus": "^5.0.1",
-        "detective-typescript": "^14.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "typescript": "^5.4.4"
-      }
-    },
     "node_modules/diff": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz",
@@ -13677,14 +13373,14 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.20.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.20.1.tgz",
-      "integrity": "sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==",
+      "version": "5.24.5",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.24.5.tgz",
+      "integrity": "sha512-L1l8TNvomm6UVW5B253AGxQagSQr+vGwhMlrrfRS2qmhx46AMpMVJKQYLvWYbysTMY8VoicOvzHzoHMbyzB+4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
-        "tapable": "^2.3.0"
+        "tapable": "^2.3.3"
       },
       "engines": {
         "node": ">=10.13.0"
@@ -14105,28 +13801,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/escodegen": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
-      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
     "node_modules/eslint": {
       "version": "9.39.4",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.4.tgz",
@@ -14511,20 +14185,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/esquery": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz",
@@ -15133,67 +14793,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/filing-cabinet": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-5.2.0.tgz",
-      "integrity": "sha512-eNrCJGdYQY0tV+ACNesQ7vb2aMxD76NM7THayMn0Z5XBt1Tonr4vbVN+FbhHfekKGQG9O5UaciDDR7+dw8P9ZA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "app-module-path": "^2.2.0",
-        "commander": "^12.1.0",
-        "enhanced-resolve": "^5.20.0",
-        "module-definition": "^6.0.1",
-        "module-lookup-amd": "^9.1.1",
-        "resolve": "^1.22.11",
-        "resolve-dependency-path": "^4.0.1",
-        "sass-lookup": "^6.1.0",
-        "stylus-lookup": "^6.1.0",
-        "tsconfig-paths": "^4.2.0",
-        "typescript": "^5.9.3"
-      },
-      "bin": {
-        "filing-cabinet": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/filing-cabinet/node_modules/resolve": {
-      "version": "1.22.11",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
-      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-core-module": "^2.16.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/filing-cabinet/node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
     "node_modules/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -15574,20 +15173,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/get-amd-module-type": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-6.0.1.tgz",
-      "integrity": "sha512-MtjsmYiCXcYDDrGqtNbeIYdAl85n+5mSv2r3FbzER/YV3ZILw4HNNIw34HuV5pyl0jzs6GFYU1VHVEefhgcNHQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ast-module-types": "^6.0.1",
-        "node-source-walk": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -15803,6 +15388,32 @@
         "node": ">=10.0"
       }
     },
+    "node_modules/global-directory": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz",
+      "integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ini": "4.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/global-directory/node_modules/ini": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz",
+      "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/globals": {
       "version": "16.5.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-16.5.0.tgz",
@@ -15832,22 +15443,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/gonzales-pe": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
-      "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "gonzales": "bin/gonzales.js"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
     "node_modules/google-auth-library": {
       "version": "10.9.1",
       "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.9.1.tgz",
@@ -16640,9 +16235,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/ignore": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
-      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.6.tgz",
+      "integrity": "sha512-BAg6QkE8W+TuQLrrw0Ugr7HegXduRuuj8/ti2kSOc+jz1dmx8/WNcjr6XGnq5YpDWxFwwaavqD0+jIUOKelTsw==",
       "devOptional": true,
       "license": "MIT",
       "engines": {
@@ -16737,8 +16332,8 @@
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "devOptional": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/inline-style-prefixer": {
       "version": "7.0.1",
@@ -16799,6 +16394,16 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/interpret": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
+      "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/intl-messageformat": {
       "version": "10.7.18",
       "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.18.tgz",
@@ -17285,14 +16890,34 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-interactive": {
+    "node_modules/is-installed-globally": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-1.0.0.tgz",
+      "integrity": "sha512-K55T22lfpQ63N4KEN57jZUAaAYqYHEe8veb/TycJRk9DdSCLLcovXz/mL6mOnhQaZsQGwPhuFopdQIlqGSEjiQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "global-directory": "^4.0.1",
+        "is-path-inside": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-installed-globally/node_modules/is-path-inside": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz",
+      "integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-map": {
@@ -17538,26 +17163,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-url": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
-      "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/is-url-superb": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-url-superb/-/is-url-superb-4.0.0.tgz",
-      "integrity": "sha512-GI+WjezhPPcbM+tqE9LnmsY5qqjwHzTvjJ36wxYX5ujNXefSUJ/T17r5bqDV8yLhcgB59KTPNOc9O9cmHTPWsA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-weakmap": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
@@ -18443,6 +18048,16 @@
         "graceful-fs": "^4.1.11"
       }
     },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/koa": {
       "version": "2.16.4",
       "resolved": "https://registry.npmjs.org/koa/-/koa-2.16.4.tgz",
@@ -19151,55 +18766,6 @@
         "yallist": "^3.0.2"
       }
     },
-    "node_modules/madge": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/madge/-/madge-8.0.0.tgz",
-      "integrity": "sha512-9sSsi3TBPhmkTCIpVQF0SPiChj1L7Rq9kU2KDG1o6v2XH9cCw086MopjVCD+vuoL5v8S77DTbVopTO8OUiQpIw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "^4.1.2",
-        "commander": "^7.2.0",
-        "commondir": "^1.0.1",
-        "debug": "^4.3.4",
-        "dependency-tree": "^11.0.0",
-        "ora": "^5.4.1",
-        "pluralize": "^8.0.0",
-        "pretty-ms": "^7.0.1",
-        "rc": "^1.2.8",
-        "stream-to-array": "^2.3.0",
-        "ts-graphviz": "^2.1.2",
-        "walkdir": "^0.4.1"
-      },
-      "bin": {
-        "madge": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://www.paypal.me/pahen"
-      },
-      "peerDependencies": {
-        "typescript": "^5.4.4"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/madge/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/magic-string": {
       "version": "0.25.9",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
@@ -19259,6 +18825,23 @@
       "integrity": "sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ==",
       "license": "MIT"
     },
+    "node_modules/markdown-to-jsx": {
+      "version": "7.7.17",
+      "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.7.17.tgz",
+      "integrity": "sha512-7mG/1feQ0TX5I7YyMZVDgCC/y2I3CiEhIRQIhyov9nGBP5eoVrOXXHuL5ZP8GRfxVZKRiXWJgwXkb9It+nQZfQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      },
+      "peerDependencies": {
+        "react": ">= 0.14.0"
+      },
+      "peerDependenciesMeta": {
+        "react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/marked": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/marked/-/marked-5.1.2.tgz",
@@ -19734,47 +19317,12 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/module-definition": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/module-definition/-/module-definition-6.0.1.tgz",
-      "integrity": "sha512-FeVc50FTfVVQnolk/WQT8MX+2WVcDnTGiq6Wo+/+lJ2ET1bRVi3HG3YlJUfqagNMc/kUlFSoR96AJkxGpKz13g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ast-module-types": "^6.0.1",
-        "node-source-walk": "^7.0.1"
-      },
-      "bin": {
-        "module-definition": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/module-details-from-path": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.4.tgz",
       "integrity": "sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w==",
       "license": "MIT"
     },
-    "node_modules/module-lookup-amd": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/module-lookup-amd/-/module-lookup-amd-9.1.1.tgz",
-      "integrity": "sha512-JzXhQvud8K3yT9l24XTDMXMQ4/LD9a9oXBcbLP0ubdvBpVrGFsybm5+2PDIl0negUYP1l88fCgjQzoMMg247+Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "commander": "^12.1.0",
-        "requirejs": "^2.3.8",
-        "requirejs-config-file": "^4.0.0"
-      },
-      "bin": {
-        "lookup-amd": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/moment": {
       "version": "2.30.1",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
@@ -20604,19 +20152,6 @@
       "integrity": "sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==",
       "license": "MIT"
     },
-    "node_modules/node-source-walk": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-7.0.1.tgz",
-      "integrity": "sha512-3VW/8JpPqPvnJvseXowjZcirPisssnBuDikk6JIZ8jQzF7KJQX52iPFX4RYYxLycYH7IbMRSPUOga/esVjy5Yg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/parser": "^7.26.7"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/nopt": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz",
@@ -21271,30 +20806,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/own-keys": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
@@ -21426,16 +20937,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/parse-ms": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz",
-      "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/parse5": {
       "version": "7.3.0",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
@@ -21688,9 +21189,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
+      "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -21904,24 +21405,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/postcss-values-parser": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-6.0.2.tgz",
-      "integrity": "sha512-YLJpK0N1brcNJrs9WatuJFtHaV9q5aAOj+S4DI5S7jgHlRfm0PIbDCAFRYMQD5SHq7Fy6xsDhyutgS0QOAs0qw==",
-      "dev": true,
-      "license": "MPL-2.0",
-      "dependencies": {
-        "color-name": "^1.1.4",
-        "is-url-superb": "^4.0.0",
-        "quote-unquote": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.9"
-      }
-    },
     "node_modules/postcss/node_modules/nanoid": {
       "version": "3.3.11",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
@@ -22007,36 +21490,6 @@
         "node": "^12.20.0 || >=14"
       }
     },
-    "node_modules/precinct": {
-      "version": "12.2.0",
-      "resolved": "https://registry.npmjs.org/precinct/-/precinct-12.2.0.tgz",
-      "integrity": "sha512-NFBMuwIfaJ4SocE9YXPU/n4AcNSoFMVFjP72nvl3cx69j/ke61/hPOWFREVxLkFhhEGnA8ZuVfTqJBa+PK3b5w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@dependents/detective-less": "^5.0.1",
-        "commander": "^12.1.0",
-        "detective-amd": "^6.0.1",
-        "detective-cjs": "^6.0.1",
-        "detective-es6": "^5.0.1",
-        "detective-postcss": "^7.0.1",
-        "detective-sass": "^6.0.1",
-        "detective-scss": "^5.0.1",
-        "detective-stylus": "^5.0.1",
-        "detective-typescript": "^14.0.0",
-        "detective-vue2": "^2.2.0",
-        "module-definition": "^6.0.1",
-        "node-source-walk": "^7.0.1",
-        "postcss": "^8.5.1",
-        "typescript": "^5.7.3"
-      },
-      "bin": {
-        "precinct": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -22154,22 +21607,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/pretty-ms": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
-      "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "parse-ms": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/proc-log": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz",
@@ -22219,6 +21656,20 @@
         "node": ">= 4"
       }
     },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/prop-types": {
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
@@ -22437,13 +21888,6 @@
         "@jitl/quickjs-ffi-types": "0.32.0"
       }
     },
-    "node_modules/quote-unquote": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/quote-unquote/-/quote-unquote-1.0.0.tgz",
-      "integrity": "sha512-twwRO/ilhlG/FIgYeKGFqyHhoEhqgnKVkcmqMKi2r524gz3ZbDTcyFt38E9xjJI2vT+KbRNHVbnJ/e0I25Azwg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/random-bytes": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
@@ -22506,8 +21950,8 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "devOptional": true,
       "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+      "optional": true,
       "dependencies": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -22522,8 +21966,8 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-      "devOptional": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -22918,6 +22362,41 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
+    "node_modules/rechoir": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
+      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve": "^1.20.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/rechoir/node_modules/resolve": {
+      "version": "1.22.12",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
+      "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "is-core-module": "^2.16.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/reflect.getprototypeof": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
@@ -23044,34 +22523,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/requirejs": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.8.tgz",
-      "integrity": "sha512-7/cTSLOdYkNBNJcDMWf+luFvMriVm7eYxp4BcFCsAX0wF421Vyce5SXP17c+Jd5otXKGNehIonFlyQXSowL6Mw==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "r_js": "bin/r.js",
-        "r.js": "bin/r.js"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/requirejs-config-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/requirejs-config-file/-/requirejs-config-file-4.0.0.tgz",
-      "integrity": "sha512-jnIre8cbWOyvr8a5F2KuqBnY+SDA4NXr/hzEZJG79Mxm2WiFQz2dzhC8ibtPJS7zkmBEl1mxSwp5HhC1W4qpxw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "esprima": "^4.0.0",
-        "stringify-object": "^3.2.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -23141,16 +22592,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/resolve-dependency-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dependency-path/-/resolve-dependency-path-4.0.1.tgz",
-      "integrity": "sha512-YQftIIC4vzO9UMhO/sCgXukNyiwVRCVaxiWskCBy7Zpqkplm8kTAISZ8O1MoKW1ca6xzgLUBjZTcDgypXvXxiQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -23173,20 +22614,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/retry": {
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
@@ -23367,6 +22794,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/safe-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz",
+      "integrity": "sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "regexp-tree": "~0.1.1"
+      }
+    },
     "node_modules/safe-regex-test": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
@@ -23406,23 +22843,6 @@
         "truncate-utf8-bytes": "^1.0.0"
       }
     },
-    "node_modules/sass-lookup": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/sass-lookup/-/sass-lookup-6.1.1.tgz",
-      "integrity": "sha512-12dvZdQYTeKZ1ypjuiijZYuMZ1m0F+4+BkRX5yJi2WA9W3DBUrcdCt7bVuKlagHl11n8eYtalWDle+m98Ol2DA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "commander": "^12.1.0",
-        "enhanced-resolve": "^5.20.0"
-      },
-      "bin": {
-        "sass-lookup": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/sax": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz",
@@ -24033,6 +23453,13 @@
         "node": ">=10"
       }
     },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/slash": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -24508,16 +23935,6 @@
       "license": "MIT",
       "optional": true
     },
-    "node_modules/stream-to-array": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/stream-to-array/-/stream-to-array-2.3.0.tgz",
-      "integrity": "sha512-UsZtOYEn4tWU2RGLOXr/o/xjRBftZRlG3dEWoaHr8j4GuypJ3isitGbVyjQKAuMu+xbiop8q224TjiZWc4XTZA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "any-promise": "^1.1.0"
-      }
-    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -24785,22 +24202,6 @@
       "integrity": "sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==",
       "license": "MIT"
     },
-    "node_modules/stylus-lookup": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/stylus-lookup/-/stylus-lookup-6.1.0.tgz",
-      "integrity": "sha512-5QSwgxAzXPMN+yugy61C60PhoANdItfdjSEZR8siFwz7yL9jTmV0UBKDCfn3K8GkGB4g0Y9py7vTCX8rFu4/pQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "commander": "^12.1.0"
-      },
-      "bin": {
-        "stylus-lookup": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/sumchecker": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
@@ -24968,9 +24369,9 @@
       "license": "MIT"
     },
     "node_modules/tapable": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.2.tgz",
-      "integrity": "sha512-1MOpMXuhGzGL5TTCZFItxCc0AARf1EZFQkGqMm7ERKj8+Hgr5oLvJOVFcC+lRmR8hCe2S3jC4T5D7Vg/d7/fhA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz",
+      "integrity": "sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -25396,32 +24797,6 @@
       "integrity": "sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==",
       "license": "Unlicense"
     },
-    "node_modules/ts-graphviz": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/ts-graphviz/-/ts-graphviz-2.1.6.tgz",
-      "integrity": "sha512-XyLVuhBVvdJTJr2FJJV2L1pc4MwSjMhcunRVgDE9k4wbb2ee7ORYnPewxMWUav12vxyfUM686MSGsqnVRIInuw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ts-graphviz"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ts-graphviz"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "@ts-graphviz/adapter": "^2.0.6",
-        "@ts-graphviz/ast": "^2.0.7",
-        "@ts-graphviz/common": "^2.1.5",
-        "@ts-graphviz/core": "^2.0.7"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/tsconfig-paths": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
@@ -25437,6 +24812,22 @@
         "node": ">=6"
       }
     },
+    "node_modules/tsconfig-paths-webpack-plugin": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.2.0.tgz",
+      "integrity": "sha512-zbem3rfRS8BgeNK50Zz5SIQgXzLafiHjOwUAvk/38/o1jHn/V5QAgVUcz884or7WYcPaH3N2CIfUc2u0ul7UcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "enhanced-resolve": "^5.7.0",
+        "tapable": "^2.2.1",
+        "tsconfig-paths": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/tslib": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
@@ -26830,24 +26221,17 @@
         "node": ">=18"
       }
     },
-    "node_modules/walkdir": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.4.1.tgz",
-      "integrity": "sha512-3eBwRyEln6E1MSzcxcVpQIhRG8Q1jLvEqRmCZqS3dsfXEDR/AhOF4d+jHg1qvDCpYaVRZjENPQyrVxAkQqxPgQ==",
+    "node_modules/watskeburt": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/watskeburt/-/watskeburt-6.0.0.tgz",
+      "integrity": "sha512-jfiuDABaxSkC71T6oZ3vCS99roYkSHm/+As+G0Dz8taAHQb+SJBvLEm5RlsgG71XdfAj3rv7eudUBTgwcQUPlQ==",
       "dev": true,
       "license": "MIT",
+      "bin": {
+        "watskeburt": "dist/run-cli.js"
+      },
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "defaults": "^1.0.3"
+        "node": "^22.13||^24||>=26"
       }
     },
     "node_modules/web-streams-polyfill": {
@@ -27434,7 +26818,7 @@
       }
     },
     "packages/insomnia": {
-      "version": "13.2.0",
+      "version": "13.3.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@apideck/better-ajv-errors": "^0.3.6",
@@ -27456,9 +26840,9 @@
         "@react-router/fs-routes": "7.18.2",
         "@react-router/node": "7.18.2",
         "@react-router/serve": "7.18.2",
-        "@rjsf/core": "6.0.0-beta.15",
-        "@rjsf/utils": "6.0.0-beta.15",
-        "@rjsf/validator-ajv8": "6.0.0-beta.15",
+        "@rjsf/core": "6.0.0-beta.19",
+        "@rjsf/utils": "6.0.0-beta.19",
+        "@rjsf/validator-ajv8": "6.0.0-beta.19",
         "@sentry/electron": "^6.5.0",
         "@stoplight/spectral-core": "^1.22.0",
         "@stoplight/spectral-formats": "^1.8.2",
@@ -27611,25 +26995,25 @@
       },
       "optionalDependencies": {
         "@kong/insomnia-plugin-ai": "^1.0.11",
-        "@kong/insomnia-plugin-external-vault": "0.1.5-dev.20260806050036"
+        "@kong/insomnia-plugin-external-vault": "0.1.5"
       }
     },
     "packages/insomnia-analytics": {
-      "version": "13.2.0",
+      "version": "13.3.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@segment/analytics-node": "2.2.1"
       }
     },
     "packages/insomnia-api": {
-      "version": "13.2.0",
+      "version": "13.3.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@getinsomnia/insomnia-v3-fetch": "^1.0.27"
       }
     },
     "packages/insomnia-data": {
-      "version": "13.2.0",
+      "version": "13.3.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@seald-io/nedb": "^4.1.1",
@@ -27637,7 +27021,8 @@
         "deep-equal": "2.2.3",
         "fuzzysort": "^1.9.0",
         "graphql": "^16.10.0",
-        "uuid": "^11.1.1"
+        "uuid": "^11.1.1",
+        "zod": "^3.25.75"
       },
       "devDependencies": {
         "@getinsomnia/node-libcurl": "3.3.0",
@@ -27647,8 +27032,17 @@
         "type-fest": "^4.40.0"
       }
     },
+    "packages/insomnia-data/node_modules/zod": {
+      "version": "3.25.76",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
+      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
     "packages/insomnia-inso": {
-      "version": "13.2.0",
+      "version": "13.3.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@seald-io/nedb": "^4.1.1",
@@ -27663,6 +27057,7 @@
         "enquirer": "^2.4.1",
         "fast-string-width": "^3.0.2",
         "is-unicode-supported": "^2.1.0",
+        "papaparse": "^5.5.2",
         "picocolors": "^1.1.1",
         "string-argv": "^0.3.2",
         "yaml": "^2.7.1"
@@ -27671,13 +27066,14 @@
         "inso": "bin/inso"
       },
       "devDependencies": {
+        "@types/papaparse": "^5.3.15",
         "cross-env": "^10.1.0",
         "esbuild": "^0.25.10",
         "esbuild-runner": "^2.2.2",
         "shellwords": "^1.0.1"
       },
       "optionalDependencies": {
-        "@kong/insomnia-plugin-external-vault": "0.1.5-dev.20260806050036"
+        "@kong/insomnia-plugin-external-vault": "0.1.5"
       }
     },
     "packages/insomnia-inso/node_modules/@stoplight/types": {
@@ -27706,7 +27102,7 @@
       }
     },
     "packages/insomnia-scripting-environment": {
-      "version": "13.2.0",
+      "version": "13.3.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/deep-equal": "^1.0.4",
@@ -27727,7 +27123,7 @@
       }
     },
     "packages/insomnia-smoke-test": {
-      "version": "13.2.0",
+      "version": "13.3.0",
       "license": "Apache-2.0",
       "devDependencies": {
         "@playwright/test": "1.59.1",
@@ -28043,14 +27439,14 @@
       }
     },
     "packages/insomnia-testing": {
-      "version": "13.2.0",
+      "version": "13.3.0",
       "license": "Apache-2.0",
       "dependencies": {
         "chai-json-schema": "1.5.1"
       }
     },
     "packages/insomnia-vcs": {
-      "version": "13.1.0",
+      "version": "13.3.0",
       "license": "Apache-2.0",
       "dependencies": {
         "clone": "^2.1.2",
@@ -28060,80 +27456,6 @@
         "@types/node-forge": "^1.3.14"
       }
     },
-    "packages/insomnia/node_modules/@rjsf/core": {
-      "version": "6.0.0-beta.15",
-      "resolved": "https://registry.npmjs.org/@rjsf/core/-/core-6.0.0-beta.15.tgz",
-      "integrity": "sha512-VF6o/tetnYxgdv19qDgTdElkLQlPHH/2yn0Tyz7J8lUVucmYuPEctV6qo88NJUAtvts9EFLr7SYKaMQpfNJonQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "lodash": "^4.17.21",
-        "lodash-es": "^4.17.21",
-        "markdown-to-jsx": "^7.7.13",
-        "prop-types": "^15.8.1"
-      },
-      "engines": {
-        "node": ">=20"
-      },
-      "peerDependencies": {
-        "@rjsf/utils": "^6.0.0-beta.15",
-        "react": ">=18"
-      }
-    },
-    "packages/insomnia/node_modules/@rjsf/core/node_modules/markdown-to-jsx": {
-      "version": "7.7.17",
-      "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.7.17.tgz",
-      "integrity": "sha512-7mG/1feQ0TX5I7YyMZVDgCC/y2I3CiEhIRQIhyov9nGBP5eoVrOXXHuL5ZP8GRfxVZKRiXWJgwXkb9It+nQZfQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      },
-      "peerDependencies": {
-        "react": ">= 0.14.0"
-      },
-      "peerDependenciesMeta": {
-        "react": {
-          "optional": true
-        }
-      }
-    },
-    "packages/insomnia/node_modules/@rjsf/utils": {
-      "version": "6.0.0-beta.15",
-      "resolved": "https://registry.npmjs.org/@rjsf/utils/-/utils-6.0.0-beta.15.tgz",
-      "integrity": "sha512-AWF0/OVRpdkxNrp1JIrTL+ryzGGffm/IXSICq+c0Ju3HIdcV0kvRDrlQtmdgbIbjdcWogS1Gg97cFhk/DzgjhQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "fast-uri": "^3.0.6",
-        "json-schema-merge-allof": "^0.8.1",
-        "jsonpointer": "^5.0.1",
-        "lodash": "^4.17.21",
-        "lodash-es": "^4.17.21",
-        "react-is": "^18.3.1"
-      },
-      "engines": {
-        "node": ">=20"
-      },
-      "peerDependencies": {
-        "react": ">=18"
-      }
-    },
-    "packages/insomnia/node_modules/@rjsf/validator-ajv8": {
-      "version": "6.0.0-beta.15",
-      "resolved": "https://registry.npmjs.org/@rjsf/validator-ajv8/-/validator-ajv8-6.0.0-beta.15.tgz",
-      "integrity": "sha512-M40hmygBfR8NlaR3JEiBJIqs03Qli7F5DRS7ypFDBDsZLcSm1Kd6BWbjC3EM2IutYyTgxg6lvi1lQw95PqqcYw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "ajv": "^8.17.1",
-        "ajv-formats": "^2.1.1",
-        "lodash": "^4.17.21",
-        "lodash-es": "^4.17.21"
-      },
-      "engines": {
-        "node": ">=20"
-      },
-      "peerDependencies": {
-        "@rjsf/utils": "^6.0.0-beta.15"
-      }
-    },
     "packages/insomnia/node_modules/@testing-library/dom": {
       "version": "10.4.1",
       "dev": true,
@@ -28187,23 +27509,6 @@
         "node": ">=14.6"
       }
     },
-    "packages/insomnia/node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
     "packages/insomnia/node_modules/aria-query": {
       "version": "5.3.0",
       "dev": true,
diff --git a/package.json b/package.json
index 1c12696ae0..1422e27771 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,8 @@
     "test:crit:package": "npm run test:package -w insomnia-smoke-test -- --project=Critical",
     "test:crit:dev": "npm run test:dev -w insomnia-smoke-test -- --project=Critical",
     "postinstall": "patch-package && npm run verify-bundle-plugins -w insomnia && npm run install-libcurl-electron",
-    "check-cycle-references": "madge --circular --extensions ts,tsx packages"
+    "check-cycle-references": "node scripts/circular-references/check-cycle-references.mjs",
+    "check-cycle-references:baseline": "node scripts/circular-references/check-cycle-references.mjs --update-baseline"
   },
   "devDependencies": {
     "@develohpanda/fluent-builder": "^2.1.2",
@@ -56,6 +57,7 @@
     "@types/node": "^24.2.1",
     "@typescript-eslint/eslint-plugin": "^8.29.0",
     "@typescript-eslint/parser": "^8.29.0",
+    "dependency-cruiser": "^18.2.0",
     "esbuild": "^0.25.10",
     "esbuild-runner": "^2.2.2",
     "eslint": "^9.39.1",
@@ -66,7 +68,6 @@
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unicorn": "^62.0.0",
     "globals": "^16.5.0",
-    "madge": "^8.0.0",
     "patch-package": "^8.0.0",
     "prettier": "3.6.2",
     "prettier-plugin-tailwindcss": "^0.7.1",
diff --git a/packages/insomnia-analytics/package.json b/packages/insomnia-analytics/package.json
index df548057fd..9f20bffb00 100644
--- a/packages/insomnia-analytics/package.json
+++ b/packages/insomnia-analytics/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "insomnia-analytics",
   "license": "Apache-2.0",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "author": "Kong <office@konghq.com>",
   "description": "Shared analytics client for the Insomnia desktop app and CLI",
   "repository": {
diff --git a/packages/insomnia-api/package.json b/packages/insomnia-api/package.json
index ad30056d26..67f198d445 100644
--- a/packages/insomnia-api/package.json
+++ b/packages/insomnia-api/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "insomnia-api",
   "license": "Apache-2.0",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "author": "Kong <office@konghq.com>",
   "description": "Insomnia API functionalities",
   "repository": {
diff --git a/packages/insomnia-api/src/organizations.ts b/packages/insomnia-api/src/organizations.ts
index 117d6e4989..b533e19478 100644
--- a/packages/insomnia-api/src/organizations.ts
+++ b/packages/insomnia-api/src/organizations.ts
@@ -59,7 +59,6 @@ export interface FeatureList {
   aiMockServers: FeatureStatus;
   aiCommitMessages: FeatureStatus;
   aiMcpClient: FeatureStatus;
-  konnectSync: FeatureStatus;
 }
 
 export interface Billing {
@@ -182,4 +181,3 @@ export const getOrganizationMemberRoles = ({
     sessionId,
   });
 };
-
diff --git a/packages/insomnia-api/src/user.ts b/packages/insomnia-api/src/user.ts
index b9715f7330..2d7ea3ae9b 100644
--- a/packages/insomnia-api/src/user.ts
+++ b/packages/insomnia-api/src/user.ts
@@ -1,5 +1,8 @@
 import type { CurrentUserActionCreate, User, UserEncryptionKeys, UserOnboarding } from '@getinsomnia/insomnia-v3-fetch';
-import { CurrentUserActionCreateActionTypeEnum, UserOnboardingFirstRequestTreatmentEnum } from '@getinsomnia/insomnia-v3-fetch';
+import {
+  CurrentUserActionCreateActionTypeEnum,
+  UserOnboardingFirstRequestTreatmentEnum,
+} from '@getinsomnia/insomnia-v3-fetch';
 
 import { fetch } from './fetch';
 
@@ -102,6 +105,29 @@ export const getUserFiles = async ({ sessionId }: { sessionId: string }) => {
   });
 };
 
+// GET /v1/user/entitlements
+export interface Entitlement {
+  /** `${featureName}_${entitlementKey}`, e.g. `konnectControlPlanes_default`. */
+  featureKey: string;
+  type: 'metered';
+  hasAccess: boolean;
+  /** `null` means unlimited. */
+  allowance: number | null;
+}
+
+export const KONNECT_CONTROL_PLANES_FEATURE = 'konnectControlPlanes';
+export const KONNECT_CONTROL_PLANES_FEATURE_KEY = `${KONNECT_CONTROL_PLANES_FEATURE}_default`;
+
+/** An account without the feature gets `{ entitlements: [] }` rather than an entry with `hasAccess: false`. */
+export const getUserEntitlements = async ({ sessionId, feature }: { sessionId: string; feature?: string }) => {
+  const query = feature ? `?feature=${encodeURIComponent(feature)}` : '';
+  return fetch<{ entitlements: Entitlement[] }>({
+    method: 'GET',
+    path: `/v1/user/entitlements${query}`,
+    sessionId,
+  });
+};
+
 // GET learning feature
 export interface LearningFeature {
   active: boolean;
diff --git a/packages/insomnia-data/common-src/hotkeys.ts b/packages/insomnia-data/common-src/hotkeys.ts
index d05ab0a94f..aeabd2cc2a 100644
--- a/packages/insomnia-data/common-src/hotkeys.ts
+++ b/packages/insomnia-data/common-src/hotkeys.ts
@@ -8,7 +8,7 @@ import { strings } from './strings';
  * @IMPORTANT Not using dot, because NeDB prohibits field names to contain dots.
  */
 export const keyboardShortcutDescriptions: Record<KeyboardShortcut, string> = {
-  workspace_showSettings: `Show ${strings.document.singular} / ${strings.collection.singular} Settings`,
+  workspace_showSettings: `Show ${strings.collection.singular} Settings`,
   request_showSettings: 'Show Request Settings',
   preferences_showKeyboardShortcuts: 'Show Keyboard Shortcuts',
   preferences_showGeneral: 'Show App Preferences',
@@ -18,7 +18,8 @@ export const keyboardShortcutDescriptions: Record<KeyboardShortcut, string> = {
   request_send: 'Send Request',
   request_showOptions: 'Send Request (Options)',
   environment_showEditor: 'Show Environment Editor',
-  environment_showSwitchMenu: 'Switch Environments',
+  environment_showSwitchMenu: 'Switch Collection Environments',
+  environment_showSwitchProjectMenu: 'Switch Project Environments',
   request_toggleHttpMethodMenu: 'Change HTTP Method',
   request_toggleHistory: 'Show Request History',
   request_focusUrl: 'Focus URL',
@@ -99,6 +100,10 @@ const defaultRegistry: HotKeyRegistry = {
     macKeys: [{ shift: true, meta: true, keyCode: keyboardKeys.e.keyCode }],
     winLinuxKeys: [{ ctrl: true, shift: true, keyCode: keyboardKeys.e.keyCode }],
   },
+  environment_showSwitchProjectMenu: {
+    macKeys: [{ alt: true, meta: true, keyCode: keyboardKeys.e.keyCode }],
+    winLinuxKeys: [{ ctrl: true, alt: true, keyCode: keyboardKeys.e.keyCode }],
+  },
   request_toggleHttpMethodMenu: {
     macKeys: [{ shift: true, meta: true, keyCode: keyboardKeys.l.keyCode }],
     winLinuxKeys: [{ ctrl: true, shift: true, keyCode: keyboardKeys.l.keyCode }],
diff --git a/packages/insomnia-data/common-src/settings.ts b/packages/insomnia-data/common-src/settings.ts
index f48fc4a74c..0785a281ee 100644
--- a/packages/insomnia-data/common-src/settings.ts
+++ b/packages/insomnia-data/common-src/settings.ts
@@ -40,6 +40,7 @@ export type KeyboardShortcut =
   | 'request_showOptions'
   | 'environment_showEditor'
   | 'environment_showSwitchMenu'
+  | 'environment_showSwitchProjectMenu'
   | 'request_toggleHttpMethodMenu'
   | 'request_toggleHistory'
   | 'request_focusUrl'
@@ -204,4 +205,6 @@ export interface Settings {
   disabledBlockedRoots: string[];
   /** Custom npm registry URL for plugin installation (e.g., corporate mirror). Empty string uses the default https://registry.npmjs.org/. */
   npmRegistryUrl: string;
+  // Forces the test tab to show. Otherwise, only show it if the collection already has legacy tests.
+  enableLegacyUnitTests: boolean;
 }
diff --git a/packages/insomnia-data/common-src/strings.ts b/packages/insomnia-data/common-src/strings.ts
index 9a976500bb..b6b3a2a326 100644
--- a/packages/insomnia-data/common-src/strings.ts
+++ b/packages/insomnia-data/common-src/strings.ts
@@ -18,16 +18,16 @@ type StringId =
 
 export const strings: Record<StringId, StringInfo> = {
   collection: {
-    singular: 'Collection',
-    plural: 'Collections',
+    singular: 'API Collection',
+    plural: 'API Collections',
   },
   mock: {
     singular: 'Mock',
     plural: 'Mocks',
   },
   document: {
-    singular: 'Document',
-    plural: 'Documents',
+    singular: 'API Collection',
+    plural: 'API Collections',
   },
   organization: {
     singular: 'Organization',
diff --git a/packages/insomnia-data/node-src/database/database.test.ts b/packages/insomnia-data/node-src/database/database.test.ts
index 1180e10bdd..6fb483d437 100644
--- a/packages/insomnia-data/node-src/database/database.test.ts
+++ b/packages/insomnia-data/node-src/database/database.test.ts
@@ -441,11 +441,13 @@ describe('_repairDatabase()', async () => {
             id: '1',
             key: 'foo',
             value: '1',
+            source: 'manual',
           },
           {
             id: 'j1_1',
             key: 'j1',
             value: '1',
+            source: 'manual',
           },
         ],
       },
@@ -457,11 +459,13 @@ describe('_repairDatabase()', async () => {
             id: '1',
             key: 'foo',
             value: '2',
+            source: 'manual',
           },
           {
             id: 'j2_1',
             key: 'j2',
             value: '2',
+            source: 'manual',
           },
         ],
       },
@@ -488,16 +492,19 @@ describe('_repairDatabase()', async () => {
             id: '1',
             key: 'foo',
             value: '1',
+            source: 'manual',
           },
           {
             id: 'j1_1',
             key: 'j1',
             value: '1',
+            source: 'manual',
           },
           {
             id: 'j2_1',
             key: 'j2',
             value: '2',
+            source: 'manual',
           },
         ],
       },
@@ -529,7 +536,7 @@ describe('_repairDatabase()', async () => {
     });
     // Make sure we have everything
     expect((await services.apiSpec.getByParentId(w1._id))?.fileName).toBe('');
-    expect((await services.apiSpec.getByParentId(w2._id))?.fileName).toBe('New Document');
+    expect((await services.apiSpec.getByParentId(w2._id))?.fileName).toBe('New API Collection');
     expect((await services.apiSpec.getByParentId(w3._id))?.fileName).toBe('Unique name');
     // Run the fix algorithm
     await repairDatabase();
diff --git a/packages/insomnia-data/node-src/database/init-model/cookie-jar.test.ts b/packages/insomnia-data/node-src/database/init-model/cookie-jar.test.ts
new file mode 100644
index 0000000000..3198244f6c
--- /dev/null
+++ b/packages/insomnia-data/node-src/database/init-model/cookie-jar.test.ts
@@ -0,0 +1,48 @@
+import type { CookieJar } from 'insomnia-data';
+import { describe, expect, it } from 'vitest';
+
+import { migrate } from './cookie-jar';
+
+function makeCookieJar(cookies: Partial<CookieJar['cookies'][number]>[]): CookieJar {
+  return { cookies } as CookieJar;
+}
+
+describe('migrateCookieSource()', () => {
+  it('grandfathers a pre-existing cookie with no source field in as manual', () => {
+    const jar = makeCookieJar([{ id: 'c1', key: 'legacy', value: '{{ _.base_url }}' }]);
+    const result = migrate(jar);
+
+    expect(result.cookies[0].source).toBe('manual');
+  });
+
+  it('leaves a cookie that already has a source untouched', () => {
+    const jar = makeCookieJar([{ id: 'c1', key: 'fromServer', source: 'response' }]);
+    const result = migrate(jar);
+
+    expect(result.cookies[0].source).toBe('response');
+  });
+
+  it('is idempotent across repeated migrations', () => {
+    const jar = makeCookieJar([{ id: 'c1', key: 'legacy' }]);
+    const once = migrate(jar);
+    const twice = migrate(once);
+
+    expect(twice.cookies[0].source).toBe('manual');
+  });
+});
+
+describe('migrateCookieId()', () => {
+  it('assigns an id to a cookie missing one', () => {
+    const jar = makeCookieJar([{ key: 'noId' }]);
+    const result = migrate(jar);
+
+    expect(result.cookies[0].id).toBeTruthy();
+  });
+
+  it('keeps an existing id unchanged', () => {
+    const jar = makeCookieJar([{ id: 'keep-me', key: 'hasId' }]);
+    const result = migrate(jar);
+
+    expect(result.cookies[0].id).toBe('keep-me');
+  });
+});
diff --git a/packages/insomnia-data/node-src/database/init-model/cookie-jar.ts b/packages/insomnia-data/node-src/database/init-model/cookie-jar.ts
index 3b30ebce7a..5c8525e42f 100644
--- a/packages/insomnia-data/node-src/database/init-model/cookie-jar.ts
+++ b/packages/insomnia-data/node-src/database/init-model/cookie-jar.ts
@@ -12,9 +12,26 @@ function migrateCookieId(cookieJar: CookieJar) {
   return cookieJar;
 }
 
+/**
+ * Grandfather in cookies that predate the `source` field as 'manual', so cookies a user
+ * already relied on for template rendering keep working. Every write path introduced
+ * alongside `source` (network responses, imports, scripts) always sets it explicitly, so once
+ * a cookie has passed through this migration once, `source` should never go missing again.
+ */
+function migrateCookieSource(cookieJar: CookieJar) {
+  for (const cookie of cookieJar.cookies) {
+    if (!cookie.source) {
+      cookie.source = 'manual';
+    }
+  }
+
+  return cookieJar;
+}
+
 export function migrate(doc: CookieJar) {
   try {
     doc = migrateCookieId(doc);
+    doc = migrateCookieSource(doc);
     return doc;
   } catch (e) {
     console.log('[db] Error during cookie jar migration', e);
diff --git a/packages/insomnia-data/node-src/services/project.ts b/packages/insomnia-data/node-src/services/project.ts
index db9cae9cd7..3a0f268aee 100644
--- a/packages/insomnia-data/node-src/services/project.ts
+++ b/packages/insomnia-data/node-src/services/project.ts
@@ -150,10 +150,14 @@ export async function syncTeamProjects({
 }
 
 export async function syncProjects(organizationId: string) {
+  // Local-only organizations have no team projects to fetch, so bail out before the request.
+  if (models.organization.isLocalOrganizationId(organizationId)) {
+    return;
+  }
   const user = await userSessionService.get();
   const teamProjects = await getAllTeamProjects(organizationId);
   // ensure we don't sync projects in the wrong place
-  if (Array.isArray(teamProjects) && user.id && !models.organization.isScratchpadOrganizationId(organizationId)) {
+  if (Array.isArray(teamProjects) && user.id) {
     await syncTeamProjects({ teamProjects, organizationId });
   }
 }
diff --git a/packages/insomnia-data/node-src/services/unit-test-suite.ts b/packages/insomnia-data/node-src/services/unit-test-suite.ts
index b9d97c0d3d..28b22871e3 100644
--- a/packages/insomnia-data/node-src/services/unit-test-suite.ts
+++ b/packages/insomnia-data/node-src/services/unit-test-suite.ts
@@ -1,4 +1,4 @@
-import type { UnitTestSuite } from 'insomnia-data';
+import type { Query, UnitTestSuite } from 'insomnia-data';
 import { database as db, models } from 'insomnia-data';
 
 const { type } = models.unitTestSuite;
@@ -32,3 +32,7 @@ export const getById = (_id: string) => db.findOne<UnitTestSuite>(type, { _id })
 export function all() {
   return db.find<UnitTestSuite>(type);
 }
+
+export function count(query?: Query<UnitTestSuite>) {
+  return db.count(type, query);
+}
diff --git a/packages/insomnia-data/package.json b/packages/insomnia-data/package.json
index 813cc985a4..7f2e1b4e18 100644
--- a/packages/insomnia-data/package.json
+++ b/packages/insomnia-data/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "insomnia-data",
   "license": "Apache-2.0",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "author": "Kong <office@konghq.com>",
   "description": "Insomnia data functionalities",
   "repository": {
@@ -39,7 +39,8 @@
     "deep-equal": "2.2.3",
     "fuzzysort": "^1.9.0",
     "graphql": "^16.10.0",
-    "uuid": "^11.1.1"
+    "uuid": "^11.1.1",
+    "zod": "^3.25.75"
   },
   "devDependencies": {
     "@getinsomnia/node-libcurl": "3.3.0",
diff --git a/packages/insomnia-data/src/database/types.ts b/packages/insomnia-data/src/database/types.ts
index c509e71578..11afca4879 100644
--- a/packages/insomnia-data/src/database/types.ts
+++ b/packages/insomnia-data/src/database/types.ts
@@ -27,6 +27,8 @@ export interface SpecificQuery {
   $in?: (string | null)[];
   $nin?: string[];
   $ne?: string | null;
+  // NeDB's `$ne` also matches documents where the field is absent, so optional keys need this too.
+  $exists?: boolean;
 }
 
 export type Query<T extends BaseModel = BaseModel> = {
diff --git a/packages/insomnia-data/src/models/base-schemas.ts b/packages/insomnia-data/src/models/base-schemas.ts
new file mode 100644
index 0000000000..b1331ba8ab
--- /dev/null
+++ b/packages/insomnia-data/src/models/base-schemas.ts
@@ -0,0 +1,23 @@
+import { z } from 'zod/v4';
+
+import { type AllTypes, allTypesSchema, baseModelSchema } from './base-types';
+
+export function createModelSchema<TType extends AllTypes, TPrefix extends string>(type: TType, _prefix: TPrefix) {
+  return baseModelSchema.extend({
+    type: allTypesSchema.extract([type]),
+    isPrivate: baseModelSchema.shape.isPrivate.optional().default(false),
+    name: baseModelSchema.shape.name.optional().default(''),
+  });
+}
+
+// Basic literal types that can appear in JSON data
+export const LiteralSchema = z.union([z.string(), z.number(), z.boolean(), z.null()]);
+export const KeyLiteralSchema = z.union([z.string(), z.number()]);
+
+type Literal = z.infer<typeof LiteralSchema>;
+type Json = Literal | { [key: string]: Json } | Json[];
+
+// Recursive JSON schema that can handle nested objects and arrays
+export const JsonSchema: z.ZodType<Json> = z.lazy(() =>
+  z.union([LiteralSchema, z.array(JsonSchema), z.record(KeyLiteralSchema, JsonSchema)]),
+);
diff --git a/packages/insomnia-data/src/models/base-types.ts b/packages/insomnia-data/src/models/base-types.ts
index 732b194715..7d92e37fab 100644
--- a/packages/insomnia-data/src/models/base-types.ts
+++ b/packages/insomnia-data/src/models/base-types.ts
@@ -1,58 +1,65 @@
-export type AllTypes =
-  | 'ApiSpec'
-  | 'CaCertificate'
-  | 'ClientCertificate'
-  | 'CloudCredential'
-  | 'CookieJar'
-  | 'Environment'
-  | 'GitCredentials'
-  | 'GitRepository'
-  | 'GrpcRequest'
-  | 'GrpcRequestMeta'
-  | 'MockRoute'
-  | 'MockServer'
-  | 'OAuth2Token'
-  | 'PluginData'
-  | 'Project'
-  | 'ProjectLintRuleset'
-  | 'ProtoDirectory'
-  | 'ProtoFile'
-  | 'Request'
-  | 'RequestGroup'
-  | 'RequestGroupMeta'
-  | 'RequestMeta'
-  | 'RequestVersion'
-  | 'Response'
-  | 'RunnerTestResult'
-  | 'Settings'
-  | 'SocketIOPayload'
-  | 'SocketIORequest'
-  | 'SocketIOResponse'
-  | 'SocketIORequestMeta'
-  | 'Stats'
-  | 'UnitTest'
-  | 'UnitTestResult'
-  | 'UnitTestSuite'
-  | 'UserSession'
-  | 'WebSocketPayload'
-  | 'WebSocketRequest'
-  | 'WebSocketResponse'
-  | 'WebSocketRequestMeta'
-  | 'McpRequest'
-  | 'McpResponse'
-  | 'McpPayload'
-  | 'Workspace'
-  | 'WorkspaceMeta';
+import { z } from 'zod/v4';
 
-export interface BaseModel {
-  _id: string;
-  type: AllTypes;
+export const allTypesSchema = z.enum([
+  'ApiSpec',
+  'CaCertificate',
+  'ClientCertificate',
+  'CloudCredential',
+  'CookieJar',
+  'Environment',
+  'GitCredentials',
+  'GitRepository',
+  'GrpcRequest',
+  'GrpcRequestMeta',
+  'MockRoute',
+  'MockServer',
+  'OAuth2Token',
+  'PluginData',
+  'Project',
+  'ProjectLintRuleset',
+  'ProtoDirectory',
+  'ProtoFile',
+  'Request',
+  'RequestGroup',
+  'RequestGroupMeta',
+  'RequestMeta',
+  'RequestVersion',
+  'Response',
+  'RunnerTestResult',
+  'Settings',
+  'SocketIOPayload',
+  'SocketIORequest',
+  'SocketIOResponse',
+  'SocketIORequestMeta',
+  'Stats',
+  'UnitTest',
+  'UnitTestResult',
+  'UnitTestSuite',
+  'UserSession',
+  'WebSocketPayload',
+  'WebSocketRequest',
+  'WebSocketResponse',
+  'WebSocketRequestMeta',
+  'McpRequest',
+  'McpResponse',
+  'McpPayload',
+  'Workspace',
+  'WorkspaceMeta',
+]);
+
+export type AllTypes = z.infer<typeof allTypesSchema>;
+
+export const baseModelSchema = z.object({
+  _id: z.string(),
+  type: allTypesSchema,
   // TSCONVERSION -- parentId is always required for all models, except 4:
   //   - Stats, Settings, and Project, which never have a parentId
   //   - Workspace optionally has a parentId (which will be the id of a Project)
-  parentId: string; // or null
-  modified: number;
-  created: number;
-  isPrivate: boolean;
-  name: string;
-}
+  parentId: z.string(),
+  modified: z.number(),
+  created: z.number(),
+  isPrivate: z.boolean(),
+  name: z.string(),
+});
+
+export type BaseModel = z.infer<typeof baseModelSchema>;
diff --git a/packages/insomnia-data/src/models/cookie-jar.ts b/packages/insomnia-data/src/models/cookie-jar.ts
index a19c68d03e..12811242f4 100644
--- a/packages/insomnia-data/src/models/cookie-jar.ts
+++ b/packages/insomnia-data/src/models/cookie-jar.ts
@@ -25,6 +25,10 @@ export interface Cookie {
   hostOnly?: boolean;
   pathIsDefault?: boolean;
   lastAccessed?: Date;
+  // 'manual' cookies (added/edited via the Cookie Jar UI, or written by a script) may contain
+  // template syntax that gets rendered; 'response' cookies came from a server's Set-Cookie
+  // header (or an import) and are always rendered as plain literal text.
+  source?: 'manual' | 'response';
 }
 
 export interface BaseCookieJar {
diff --git a/packages/insomnia-data/src/models/environment.ts b/packages/insomnia-data/src/models/environment.ts
index 1e6638dc10..6d0901812a 100644
--- a/packages/insomnia-data/src/models/environment.ts
+++ b/packages/insomnia-data/src/models/environment.ts
@@ -1,3 +1,6 @@
+import { z } from 'zod/v4';
+
+import { createModelSchema } from './base-schemas';
 import type { BaseModel } from './base-types';
 
 export const name = 'Environment';
@@ -14,18 +17,6 @@ export const canSync = true;
 // for those keys do not need to add in model init method
 export const optionalKeys: (keyof BaseEnvironment)[] = ['kvPairData', 'environmentType', 'dataPropertyOrder'];
 
-export interface BaseEnvironment {
-  name: string;
-  data: Record<string, any>;
-  dataPropertyOrder?: Record<string, any> | null;
-  kvPairData?: EnvironmentKvPairData[];
-  color: string | null;
-  metaSortKey: number;
-  // For sync control
-  isPrivate: boolean;
-  environmentType?: EnvironmentType;
-}
-
 export enum EnvironmentType {
   JSON = 'json',
   KVPAIR = 'kv',
@@ -37,15 +28,32 @@ export enum EnvironmentKvPairDataType {
   SECRET = 'secret',
 }
 
-export interface EnvironmentKvPairData {
-  id: string;
-  name: string;
-  value: string;
-  type: EnvironmentKvPairDataType;
-  enabled?: boolean;
-}
+export const EnvironmentKvPairDataSchema = z.object({
+  id: z.string(),
+  name: z.string().optional().default(''),
+  value: z.string().optional().default(''),
+  type: z.enum([EnvironmentKvPairDataType.JSON, EnvironmentKvPairDataType.STRING, EnvironmentKvPairDataType.SECRET]),
+  enabled: z.boolean().optional(),
+});
+export type EnvironmentKvPairData = z.infer<typeof EnvironmentKvPairDataSchema>;
 
-export type Environment = BaseModel & BaseEnvironment;
+export const environmentTypeSchema = z.enum([EnvironmentType.JSON, EnvironmentType.KVPAIR]);
+export const baseEnvironmentSchema = z.object({
+  name: z.string().optional().default(''),
+  data: z.record(z.string(), z.any()).optional().default({}),
+  color: z.string().optional().nullable(),
+  dataPropertyOrder: z.record(z.string(), z.any()).nullable().optional(),
+  kvPairData: z.array(EnvironmentKvPairDataSchema).optional(),
+  metaSortKey: z
+    .number()
+    .optional()
+    .default(() => Date.now()),
+  environmentType: environmentTypeSchema.optional(),
+});
+export type BaseEnvironment = z.infer<typeof baseEnvironmentSchema>;
+
+export const schema = createModelSchema(type, prefix).extend(baseEnvironmentSchema.shape);
+export type Environment = z.infer<typeof schema>;
 
 // This is a representation of the data taken from a csv or json file AKA iterationData
 export type UserUploadEnvironment = Pick<Environment, 'data' | 'dataPropertyOrder' | 'name'>;
diff --git a/packages/insomnia-data/src/models/organization.ts b/packages/insomnia-data/src/models/organization.ts
index 332002b96e..202a4b4c89 100644
--- a/packages/insomnia-data/src/models/organization.ts
+++ b/packages/insomnia-data/src/models/organization.ts
@@ -1,8 +1,35 @@
-import type { PersonalPlanType } from 'insomnia-api';
+import type { Organization, PersonalPlanType } from 'insomnia-api';
 
 export const SCRATCHPAD_ORGANIZATION_ID = 'org_scratchpad';
 export const isScratchpadOrganizationId = (organizationId: string) => organizationId === SCRATCHPAD_ORGANIZATION_ID;
 
+export const KONNECT_ORGANIZATION_ID_PREFIX = 'org_konnect_';
+export const KONNECT_ORGANIZATION_NAME = 'Control Planes';
+
+// The Konnect organization is local-only, but the database is not partitioned per user, so the
+// account id is baked into the id to keep one account's Konnect data out of another's.
+export const getKonnectOrganizationId = (accountId: string) => `${KONNECT_ORGANIZATION_ID_PREFIX}${accountId}`;
+export const isKonnectOrganizationId = (organizationId: string) =>
+  organizationId.startsWith(KONNECT_ORGANIZATION_ID_PREFIX);
+
+/** Organizations that exist only on this machine and must never be used for organization-scoped API calls. */
+export const isLocalOrganizationId = (organizationId: string) =>
+  isScratchpadOrganizationId(organizationId) || isKonnectOrganizationId(organizationId);
+
+export const buildKonnectOrganization = (accountId: string): Organization => ({
+  id: getKonnectOrganizationId(accountId),
+  name: KONNECT_ORGANIZATION_NAME,
+  picture: null,
+  owner_first_name: null,
+  owner_last_name: null,
+  owner_email: null,
+  total_members: 1,
+  total_invites: 0,
+  total_admins: 1,
+  is_owner: true,
+  can_leave: false,
+});
+
 export const formatCurrentPlanType = (type: PersonalPlanType) => {
   switch (type) {
     case 'free': {
diff --git a/packages/insomnia-data/src/models/request-meta.ts b/packages/insomnia-data/src/models/request-meta.ts
index c5ba0e60c6..b5e17534d6 100644
--- a/packages/insomnia-data/src/models/request-meta.ts
+++ b/packages/insomnia-data/src/models/request-meta.ts
@@ -22,6 +22,8 @@ export interface BaseRequestMeta {
   downloadPath: string | null;
   expandedAccordionKeys: Partial<Record<RequestAccordionKeys, boolean>>;
   activeMcpPrimitive?: string | null;
+  streamSummaryPath: string | null;
+  streamSummaryRenderMarkdown: boolean;
 }
 
 export type RequestMeta = BaseModel & BaseRequestMeta;
@@ -41,5 +43,7 @@ export function init() {
     downloadPath: null,
     expandedAccordionKeys: {},
     activeMcpPrimitive: null,
+    streamSummaryPath: null,
+    streamSummaryRenderMarkdown: false,
   };
 }
diff --git a/packages/insomnia-data/src/models/settings.ts b/packages/insomnia-data/src/models/settings.ts
index 0e845a2076..7b23cf5c41 100644
--- a/packages/insomnia-data/src/models/settings.ts
+++ b/packages/insomnia-data/src/models/settings.ts
@@ -94,5 +94,6 @@ export function init(): BaseSettings {
     disabledBlockedProperties: [],
     disabledBlockedRoots: [],
     npmRegistryUrl: '',
+    enableLegacyUnitTests: false,
   };
 }
diff --git a/packages/insomnia-data/src/models/workspace.ts b/packages/insomnia-data/src/models/workspace.ts
index 0223f374a5..5c8fd2a2f0 100644
--- a/packages/insomnia-data/src/models/workspace.ts
+++ b/packages/insomnia-data/src/models/workspace.ts
@@ -62,7 +62,8 @@ export const scopeToActivity = (scope: WorkspaceScope) => {
       return 'debug';
     }
     case WorkspaceScopeKeys.design: {
-      return 'spec';
+      // Legacy spec workspace route has been merged into the debug route, so we return debug here as well.
+      return 'debug';
     }
     case WorkspaceScopeKeys.mockServer: {
       return 'mock-server';
diff --git a/packages/insomnia-inso/package.json b/packages/insomnia-inso/package.json
index c525a408ff..f66248d75c 100644
--- a/packages/insomnia-inso/package.json
+++ b/packages/insomnia-inso/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "insomnia-inso",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "homepage": "https://insomnia.rest",
   "description": "A CLI for Insomnia - The Collaborative API Design Tool",
   "author": "Kong <office@konghq.com>",
@@ -45,6 +45,7 @@
     "artifacts": "esr src/scripts/artifacts.ts"
   },
   "devDependencies": {
+    "@types/papaparse": "^5.3.15",
     "cross-env": "^10.1.0",
     "esbuild": "^0.25.10",
     "esbuild-runner": "^2.2.2",
@@ -59,15 +60,16 @@
     "@stoplight/types": "^14.1.1",
     "commander": "^12.1.0",
     "consola": "^3.4.2",
-    "fast-string-width": "^3.0.2",
-    "is-unicode-supported": "^2.1.0",
     "cosmiconfig": "^9.0.0",
     "enquirer": "^2.4.1",
+    "fast-string-width": "^3.0.2",
+    "is-unicode-supported": "^2.1.0",
+    "papaparse": "^5.5.2",
     "picocolors": "^1.1.1",
     "string-argv": "^0.3.2",
     "yaml": "^2.7.1"
   },
   "optionalDependencies": {
-    "@kong/insomnia-plugin-external-vault": "0.1.5-dev.20260806050036"
+    "@kong/insomnia-plugin-external-vault": "0.1.5"
   }
 }
diff --git a/packages/insomnia-inso/src/cli.ts b/packages/insomnia-inso/src/cli.ts
index b6804bdf4c..095bc0b8b1 100644
--- a/packages/insomnia-inso/src/cli.ts
+++ b/packages/insomnia-inso/src/cli.ts
@@ -29,6 +29,7 @@ import { servicesNodeImpl } from 'insomnia-data/node';
 import { generate } from 'insomnia-testing/src/generate/generate';
 import { runTestsCli } from 'insomnia-testing/src/run/run';
 import orderedJSON from 'json-order';
+import Papa from 'papaparse';
 import { parseArgsStringToArgv } from 'string-argv';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -215,7 +216,7 @@ const pathToIterationData = async (pathOrUrl: string, env: string[]): Promise<Us
   const list = getListFromFileOrUrl(content, fileType).map(data => ({ ...data, ...envAsObject }));
   return transformIterationDataToEnvironmentList(list);
 };
-const getListFromFileOrUrl = (content: string, fileType?: string): Record<string, string>[] => {
+export const getListFromFileOrUrl = (content: string, fileType?: string): Record<string, string>[] => {
   if (fileType === 'json') {
     try {
       const jsonDataContent = JSON.parse(content);
@@ -229,12 +230,8 @@ const getListFromFileOrUrl = (content: string, fileType?: string): Record<string
       throw new Error('Upload JSON file can not be parsed');
     }
   } else if (fileType === 'csv') {
-    // Replace CRLF (Windows line break) and CR (Mac link break) with \n, then split into csv arrays
-    const csvRows = content
-      .replace(/\r\n|\r/g, '\n')
-      .split('\n')
-      .map(row => row.split(','));
-    // at least 2 rows required for csv
+    const csvRows = Papa.parse<string[]>(content, { skipEmptyLines: true, delimiter: ',' }).data;
+    // at least 2 rows required for csv, first row as variable names
     if (csvRows.length > 1) {
       const csvHeaders = csvRows[0];
       const csvContentRows = csvRows.slice(1);
diff --git a/packages/insomnia-inso/src/db/adapters/git-adapter.test.ts b/packages/insomnia-inso/src/db/adapters/git-adapter.test.ts
index a101fdf635..80978380db 100644
--- a/packages/insomnia-inso/src/db/adapters/git-adapter.test.ts
+++ b/packages/insomnia-inso/src/db/adapters/git-adapter.test.ts
@@ -1,6 +1,9 @@
+import fs from 'node:fs';
+import os from 'node:os';
 import path from 'node:path';
 
-import { describe, expect, it } from 'vitest';
+import { afterEach, describe, expect, it } from 'vitest';
+import YAML from 'yaml';
 
 import gitAdapter from './git-adapter';
 
@@ -36,4 +39,104 @@ describe('gitAdapter()', () => {
     const db = await gitAdapter(workingDir);
     expect(db).toBe(null);
   });
+
+  describe('type restriction', () => {
+    let workingDir: string;
+
+    afterEach(() => {
+      if (workingDir) {
+        fs.rmSync(workingDir, { recursive: true, force: true });
+      }
+    });
+
+    it('does not read a Settings folder, since Settings.canSync is false', async () => {
+      // gitAdapter() only reads folders for types where models.canSync() is
+      // true, so a 'Settings' folder is never opened even when it sits
+      // alongside a normal Workspace folder with well-formed content.
+      workingDir = fs.mkdtempSync(path.join(os.tmpdir(), 'git-adapter-'));
+      const insomniaDir = path.join(workingDir, '.insomnia');
+
+      fs.mkdirSync(path.join(insomniaDir, 'Workspace'), { recursive: true });
+      fs.writeFileSync(
+        path.join(insomniaDir, 'Workspace', 'wrk_new.yml'),
+        YAML.stringify({
+          _id: 'wrk_new',
+          type: 'Workspace',
+          name: 'New workspace',
+          parentId: null,
+          scope: 'collection',
+        }),
+      );
+
+      fs.mkdirSync(path.join(insomniaDir, 'Settings'), { recursive: true });
+      const settingsData = {
+        _id: 'set_new',
+        type: 'Settings',
+        validateSSL: false,
+        proxyEnabled: true,
+        httpProxy: 'http://example.com:8080',
+        httpsProxy: 'http://example.com:8080',
+      };
+      fs.writeFileSync(
+        path.join(insomniaDir, 'Settings', 'set_new.yml'),
+        YAML.stringify(settingsData),
+      );
+
+      const db = await gitAdapter(workingDir);
+
+      expect(db?.Settings).toHaveLength(0);
+      expect(db?.Workspace).toHaveLength(1);
+    });
+
+    // gitAdapter() only ever reads folders named after one of the Database
+    // keys (see packages/insomnia-inso/src/db/types.ts), so this is the full
+    // set of syncable types reachable through the inso CLI import path today.
+    const syncableTypes = ['ApiSpec', 'Environment', 'Request', 'RequestGroup', 'Workspace', 'UnitTestSuite', 'UnitTest'] as const;
+    // Non-syncable Database keys: these folders exist in legacy .insomnia
+    // directories but must never be merged in, since canSync is false.
+    const nonSyncableTypes = ['WorkspaceMeta', 'ClientCertificate', 'CaCertificate', 'CookieJar', 'CloudCredential', 'Settings'] as const;
+
+    const writeMinimalDoc = (insomniaDir: string, type: string) => {
+      const typeDir = path.join(insomniaDir, type);
+      fs.mkdirSync(typeDir, { recursive: true });
+      const doc = { _id: `${type.toLowerCase()}_new`, type, name: `New ${type}`, parentId: null };
+      fs.writeFileSync(path.join(typeDir, `${doc._id}.yml`), YAML.stringify(doc));
+    };
+
+    it.each(syncableTypes)('reads a %s folder, since canSync is true', async type => {
+      workingDir = fs.mkdtempSync(path.join(os.tmpdir(), 'git-adapter-'));
+      const insomniaDir = path.join(workingDir, '.insomnia');
+      writeMinimalDoc(insomniaDir, type);
+
+      const db = await gitAdapter(workingDir);
+
+      expect(db?.[type as keyof typeof db]).toHaveLength(1);
+    });
+
+    it.each(nonSyncableTypes)('does not read a %s folder, since canSync is false', async type => {
+      workingDir = fs.mkdtempSync(path.join(os.tmpdir(), 'git-adapter-'));
+      const insomniaDir = path.join(workingDir, '.insomnia');
+      writeMinimalDoc(insomniaDir, type);
+      // Include a syncable folder alongside it so we confirm the whole read didn't just fail
+      writeMinimalDoc(insomniaDir, 'Workspace');
+
+      const db = await gitAdapter(workingDir);
+
+      expect(db?.[type as keyof typeof db]).toHaveLength(0);
+      expect(db?.Workspace).toHaveLength(1);
+    });
+
+    it.each(nonSyncableTypes)('ignores a document whose own type is %s even when filed under a syncable folder', async otherType => {
+      workingDir = fs.mkdtempSync(path.join(os.tmpdir(), 'git-adapter-'));
+      const insomniaDir = path.join(workingDir, '.insomnia');
+      const typeDir = path.join(insomniaDir, 'Workspace');
+      fs.mkdirSync(typeDir, { recursive: true });
+      const doc = { _id: 'wrk_mismatched', type: otherType, name: 'Mismatched doc', parentId: null };
+      fs.writeFileSync(path.join(typeDir, `${doc._id}.yml`), YAML.stringify(doc));
+
+      const db = await gitAdapter(workingDir);
+
+      expect(db?.Workspace).toHaveLength(0);
+    });
+  });
 });
diff --git a/packages/insomnia-inso/src/db/adapters/git-adapter.ts b/packages/insomnia-inso/src/db/adapters/git-adapter.ts
index f640e96640..985eae9ba4 100644
--- a/packages/insomnia-inso/src/db/adapters/git-adapter.ts
+++ b/packages/insomnia-inso/src/db/adapters/git-adapter.ts
@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 
+import { models } from 'insomnia-data';
 import YAML from 'yaml';
 
 import type { Database, DbAdapter } from '../types';
@@ -35,10 +36,20 @@ const gitAdapter: DbAdapter = async (dir, filterTypes) => {
       return;
     }
     const obj = YAML.parse(contents);
+
+    // Document's own type must match the folder it was read from.
+    if (obj?.type !== type) {
+      console.error(`Ignoring "${fileName}": document type "${obj?.type}" does not match folder type "${type}"`);
+      return;
+    }
+
     (db[type] as {}[]).push(obj);
   };
 
-  const types = filterTypes?.length ? filterTypes : (Object.keys(db) as (keyof Database)[]);
+  // Only ever read folders for types explicitly marked as syncable. A folder
+  // named after a non-syncable/global-singleton type (e.g. Settings) is skipped.
+  const requestedTypes = filterTypes?.length ? filterTypes : (Object.keys(db) as (keyof Database)[]);
+  const types = requestedTypes.filter(t => models.getModel(t)?.canSync);
   await Promise.all(
     types.map(async t => {
       // Get all files in type dir
diff --git a/packages/insomnia-inso/src/db/adapters/insomnia-adapter.ts b/packages/insomnia-inso/src/db/adapters/insomnia-adapter.ts
index 6311e3859c..98a9d49a09 100644
--- a/packages/insomnia-inso/src/db/adapters/insomnia-adapter.ts
+++ b/packages/insomnia-inso/src/db/adapters/insomnia-adapter.ts
@@ -127,7 +127,7 @@ const insomniaAdapter: DbAdapter = async (filePath, filterTypes) => {
       const obj = parseRaw(model);
 
       // Store it, only if the key value exists
-      (db[obj.type] as {}[])?.push(obj);
+      (db[obj.type as keyof typeof db] as {}[])?.push(obj);
     }
   });
 
diff --git a/packages/insomnia-inso/src/db/models/types.ts b/packages/insomnia-inso/src/db/models/types.ts
index 56fc7659fb..0737dea8e5 100644
--- a/packages/insomnia-inso/src/db/models/types.ts
+++ b/packages/insomnia-inso/src/db/models/types.ts
@@ -1,10 +1,10 @@
 // Simplified and extracted from insomnia/src/models/*
-import type { Database } from '../types';
+import type { AllTypes } from 'insomnia-data';
 
 export interface BaseModel {
   _id: string;
   name: string;
-  type: keyof Database;
+  type: AllTypes;
   parentId: string;
 }
 
diff --git a/packages/insomnia-inso/src/iteration-data.test.ts b/packages/insomnia-inso/src/iteration-data.test.ts
new file mode 100644
index 0000000000..568349d44d
--- /dev/null
+++ b/packages/insomnia-inso/src/iteration-data.test.ts
@@ -0,0 +1,46 @@
+import { describe, expect, it } from 'vitest';
+
+import { getListFromFileOrUrl } from './cli';
+
+describe('getListFromFileOrUrl()', () => {
+  it('parses simple csv', () => {
+    expect(getListFromFileOrUrl('a,b\n1,2\n3,4', 'csv')).toEqual([
+      { a: '1', b: '2' },
+      { a: '3', b: '4' },
+    ]);
+  });
+
+  it('keeps commas inside quoted fields', () => {
+    expect(getListFromFileOrUrl('origin,destination\n"New York, NY","Boston, MA"\n', 'csv')).toEqual([
+      { origin: 'New York, NY', destination: 'Boston, MA' },
+    ]);
+  });
+
+  it('unescapes doubled quotes inside quoted fields', () => {
+    expect(getListFromFileOrUrl('name,quote\n"John ""JJ"" Smith",hello', 'csv')).toEqual([
+      { name: 'John "JJ" Smith', quote: 'hello' },
+    ]);
+  });
+
+  it('handles CRLF line breaks', () => {
+    expect(getListFromFileOrUrl('a,b\r\n1,2\r\n', 'csv')).toEqual([{ a: '1', b: '2' }]);
+  });
+
+  it('handles newlines inside quoted fields', () => {
+    expect(getListFromFileOrUrl('a,b\n"line1\nline2",2', 'csv')).toEqual([{ a: 'line1\nline2', b: '2' }]);
+  });
+
+  it('defaults missing trailing cells to empty string', () => {
+    expect(getListFromFileOrUrl('a,b,c\n1,2', 'csv')).toEqual([{ a: '1', b: '2', c: '' }]);
+  });
+
+  it('throws when there are fewer than two rows', () => {
+    expect(() => getListFromFileOrUrl('a,b', 'csv')).toThrow(
+      'CSV file must contain at least two rows with first row as variable names',
+    );
+  });
+
+  it('throws for unsupported file types', () => {
+    expect(() => getListFromFileOrUrl('anything', 'yaml')).toThrow('Uploaded file is unsupported yaml');
+  });
+});
diff --git a/packages/insomnia-scripting-environment/package.json b/packages/insomnia-scripting-environment/package.json
index d138d69f8f..43896fd055 100644
--- a/packages/insomnia-scripting-environment/package.json
+++ b/packages/insomnia-scripting-environment/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "insomnia-scripting-environment",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "description": "",
   "main": "src/objects/index.ts",
   "types": "src/objects/index.ts",
diff --git a/packages/insomnia-scripting-environment/src/objects/__tests__/environments.test.ts b/packages/insomnia-scripting-environment/src/objects/__tests__/environments.test.ts
index 2bdad304c3..dba7e73efd 100644
--- a/packages/insomnia-scripting-environment/src/objects/__tests__/environments.test.ts
+++ b/packages/insomnia-scripting-environment/src/objects/__tests__/environments.test.ts
@@ -7,7 +7,7 @@ import { Folder, ParentFolders } from '../folders';
 import { Url } from '../urls';
 
 describe('test Variables object', () => {
-  it('test basic operations', async () => {
+  it('test basic operations', () => {
     const variables = new Variables({
       baseGlobalVars: new Environment('baseGlobals', { value: 'baseValue' }),
       globalVars: new Environment('globals', { value: 'xyz' }),
@@ -18,17 +18,17 @@ describe('test Variables object', () => {
       localVars: new Environment('local', {}),
     });
 
-    const uuidAndXyz = await variables.replaceIn('{{    $randomUUID }}{{value  }}');
+    const uuidAndXyz = variables.replaceIn('{{    $randomUUID }}{{value  }}');
     expect(validate(uuidAndXyz.replace('xyz', ''))).toBeTruthy();
 
-    const uuidAndBrackets1 = await variables.replaceIn('{{    $randomUUID }}}}');
+    const uuidAndBrackets1 = variables.replaceIn('{{    $randomUUID }}}}');
     expect(validate(uuidAndBrackets1.replace('}}', ''))).toBeTruthy();
 
-    const uuidAndBrackets2 = await variables.replaceIn('}}{{    $randomUUID }}');
+    const uuidAndBrackets2 = variables.replaceIn('}}{{    $randomUUID }}');
     expect(validate(uuidAndBrackets2.replace('}}', ''))).toBeTruthy();
   });
 
-  it('test environment overriding', async () => {
+  it('test environment overriding', () => {
     const baseGlobalVariables = new Variables({
       baseGlobalVars: new Environment('baseGlobals', { scope: 'baseGlobals', value: 'baseGlobals-value' }),
       globalVars: new Environment('globals', {}),
@@ -94,10 +94,10 @@ describe('test Variables object', () => {
     expect(variablesWithFolderLevelData.get('value')).toEqual('folderLevel2-value');
     expect(variablesWithLocalData.get('value')).toEqual('local-value');
 
-    expect(await variablesWithFolderLevelData.replaceIn('{{ value}}')).toEqual('folderLevel2-value');
+    expect(variablesWithFolderLevelData.replaceIn('{{ value}}')).toEqual('folderLevel2-value');
 
     const urlObj = new Url('http://x/{{ value }}');
-    expect(await variablesWithFolderLevelData.replaceIn(urlObj)).toEqual('http://x/folderLevel2-value');
+    expect(variablesWithFolderLevelData.replaceIn(urlObj)).toEqual('http://x/folderLevel2-value');
   });
 
   it('variables operations', () => {
diff --git a/packages/insomnia-scripting-environment/src/objects/__tests__/properties.test.ts b/packages/insomnia-scripting-environment/src/objects/__tests__/properties.test.ts
index ef991f2081..e798ad8448 100644
--- a/packages/insomnia-scripting-environment/src/objects/__tests__/properties.test.ts
+++ b/packages/insomnia-scripting-environment/src/objects/__tests__/properties.test.ts
@@ -14,7 +14,7 @@ describe('test Property objects', () => {
     });
   });
 
-  it('Property: basic operations', async () => {
+  it('Property: basic operations', () => {
     const prop = new Property('id', 'name', false, { id: 'real_id', name: 'real_name' });
 
     expect(prop.toJSON()).toEqual({
@@ -23,9 +23,9 @@ describe('test Property objects', () => {
       name: 'real_name',
     });
 
-    expect(await Property.replaceSubstitutions('{{ hehe }}', { hehe: 777 })).toEqual('777');
+    expect(Property.replaceSubstitutions('{{ hehe }}', { hehe: 777 })).toEqual('777');
     expect(
-      await Property.replaceSubstitutionsIn(
+      Property.replaceSubstitutionsIn(
         {
           value: '{{ hehe }}',
         },
diff --git a/packages/insomnia-scripting-environment/src/objects/environments.ts b/packages/insomnia-scripting-environment/src/objects/environments.ts
index 8b1572a9c8..9c3dde8b05 100644
--- a/packages/insomnia-scripting-environment/src/objects/environments.ts
+++ b/packages/insomnia-scripting-environment/src/objects/environments.ts
@@ -124,7 +124,7 @@ export class Environment {
    * 
    * @throws Will throw an error if template is not a string or object.
    */
-  replaceIn = async (template: string | object) => {
+  replaceIn = (template: string | object) => {
     if (typeof template === 'object') {
       template = template.toString();
     } else if (typeof template !== 'string') {
@@ -327,7 +327,7 @@ export class Variables {
    * 
    * @throws Will throw an error if template is not a string or object.
    */
-  replaceIn = async (template: string | object) => {
+  replaceIn = (template: string | object) => {
     if (typeof template === 'object') {
       template = template.toString();
     } else if (typeof template !== 'string') {
diff --git a/packages/insomnia-scripting-environment/src/objects/interpolator.ts b/packages/insomnia-scripting-environment/src/objects/interpolator.ts
index 636cbc3685..7f149d9f88 100644
--- a/packages/insomnia-scripting-environment/src/objects/interpolator.ts
+++ b/packages/insomnia-scripting-environment/src/objects/interpolator.ts
@@ -17,9 +17,9 @@ class Interpolator {
     });
   }
 
-  render = async (template: string, context: object): Promise<string> => {
+  render = (template: string, context: object): string => {
     // TODO: support plugins
-    return this.engine.parseAndRender(this.renderWithFaker(template), context);
+    return this.engine.parseAndRenderSync(this.renderWithFaker(template), context);
   };
 
   renderWithFaker = (template: string) => {
diff --git a/packages/insomnia-scripting-environment/src/objects/properties.ts b/packages/insomnia-scripting-environment/src/objects/properties.ts
index 06c729f311..a6f9bf763c 100644
--- a/packages/insomnia-scripting-environment/src/objects/properties.ts
+++ b/packages/insomnia-scripting-environment/src/objects/properties.ts
@@ -147,7 +147,7 @@ export class Property extends PropertyBase {
 
   static _index = 'id';
 
-  static async replaceSubstitutions(content: string, ...variables: object[]): Promise<string> {
+  static replaceSubstitutions(content: string, ...variables: object[]): string {
     if (!Array.isArray(variables) || typeof content !== 'string') {
       throw new TypeError(
         "replaceSubstitutions: the first param's type is not string or other parameters are not an array",
@@ -161,7 +161,7 @@ export class Property extends PropertyBase {
     return getInterpolator().render(content, context);
   }
 
-  static async replaceSubstitutionsIn(obj: object, ...variables: object[]): Promise<object> {
+  static replaceSubstitutionsIn(obj: object, ...variables: object[]): object {
     if (!Array.isArray(variables) || typeof obj !== 'object') {
       throw new TypeError(
         "replaceSubstitutions: the first param's type is not object or other parameters are not an array",
@@ -177,7 +177,7 @@ export class Property extends PropertyBase {
         context = { ...context, ...variable };
       });
 
-      const rendered = await getInterpolator().render(content, context);
+      const rendered = getInterpolator().render(content, context);
       return JSON.parse(rendered);
     } catch (e: any) {
       throw new Error(`replaceSubstitutionsIn: ${e.toString()}`);
diff --git a/packages/insomnia-smoke-test/.gitignore b/packages/insomnia-smoke-test/.gitignore
index dc0a9c6e15..06f03d4b8d 100644
--- a/packages/insomnia-smoke-test/.gitignore
+++ b/packages/insomnia-smoke-test/.gitignore
@@ -20,3 +20,6 @@ fixtures/inso-nedb/insomnia.OAuth2Token.db
 fixtures/inso-nedb/insomnia.PluginData.db
 fixtures/inso-nedb/insomnia.CaCertificate.db
 fixtures/inso-nedb/insomnia.CloudCredential.db
+
+# Playwright junit/xml run artifacts
+test-results.xml
diff --git a/packages/insomnia-smoke-test/package.json b/packages/insomnia-smoke-test/package.json
index a969ab43d6..c12844171e 100644
--- a/packages/insomnia-smoke-test/package.json
+++ b/packages/insomnia-smoke-test/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/kong/insomnia/issues"
   },
-  "version": "13.2.0",
+  "version": "13.3.0",
   "scripts": {
     "test:dev": "xvfb-maybe cross-env BUNDLE=dev playwright test",
     "test:build": "xvfb-maybe cross-env BUNDLE=build playwright test",
diff --git a/packages/insomnia-smoke-test/playwright.config.ts b/packages/insomnia-smoke-test/playwright.config.ts
index b99920a7a5..c5db75a33b 100644
--- a/packages/insomnia-smoke-test/playwright.config.ts
+++ b/packages/insomnia-smoke-test/playwright.config.ts
@@ -33,8 +33,11 @@ const viteServer: PlaywrightTestConfig['webServer'] = {
   stdout: 'pipe',
   stderr: 'pipe',
   wait: {
-    stdout: /VITE\s+ready in/,
+    stdout: /VITE.+ready in/,
   },
+  // Without this, Playwright SIGKILLs the process group on teardown, which the
+  // .vite-port cleanup in vite.config.ts can't intercept, leaving a stale port file.
+  gracefulShutdown: isWindows ? undefined : { signal: 'SIGTERM', timeout: 2000 },
 };
 const onlyStartWebServerInDev = !process.env.BUNDLE || process.env.BUNDLE === 'dev';
 const config: PlaywrightTestConfig = {
diff --git a/packages/insomnia-smoke-test/playwright/pages/components/export-modal.ts b/packages/insomnia-smoke-test/playwright/pages/components/export-modal.ts
index 961368cf5c..629b0a248f 100644
--- a/packages/insomnia-smoke-test/playwright/pages/components/export-modal.ts
+++ b/packages/insomnia-smoke-test/playwright/pages/components/export-modal.ts
@@ -11,7 +11,7 @@ export class ExportModal {
    * Handles the export type selection modal (Insomnia v5 or HAR).
    * @param format - The format to select ('yaml' for Insomnia v5, 'har' for HAR)
    */
-  async selectExportFormat(format: 'yaml' | 'har'): Promise<void> {
+  async selectExportFormat(format: 'yaml' | 'har' | 'json'): Promise<void> {
     await this.page.getByText('Which format would you like to export as?').waitFor({ state: 'visible' });
 
     // The modal uses a <select> element, so we need to use selectOption
diff --git a/packages/insomnia-smoke-test/playwright/pages/components/navigation-sidebar.ts b/packages/insomnia-smoke-test/playwright/pages/components/navigation-sidebar.ts
index 406eac1735..6ff09892f8 100644
--- a/packages/insomnia-smoke-test/playwright/pages/components/navigation-sidebar.ts
+++ b/packages/insomnia-smoke-test/playwright/pages/components/navigation-sidebar.ts
@@ -15,15 +15,16 @@ export class NavigationSidebar {
   }
 
   // ===========================================================================
-  // Tab controls
+  // Organization switching
   // ===========================================================================
 
-  async clickProjectsTab(): Promise<void> {
-    await this.root.getByTestId('sidebar-tab-projects').click();
+  async selectOrganization(name: string): Promise<void> {
+    await this.page.getByRole('button', { name: 'Organizations' }).click();
+    await this.page.getByRole('option', { name }).click();
   }
 
-  async clickKonnectTab(): Promise<void> {
-    await this.root.getByTestId('sidebar-tab-konnect').click();
+  async openControlPlanesOrganization(): Promise<void> {
+    await this.selectOrganization('Control Planes');
   }
 
   // ===========================================================================
@@ -94,10 +95,15 @@ export class NavigationSidebar {
     return this.navigationTree.getByRole('row', { name: workspaceName });
   }
 
-  // When collection focus mode narrows the sidebar to one collection, that collection's tree
-  // row is replaced by the back-arrow header (same `workspace-node-*` testid, no ARIA "row").
-  async isWorkspaceFocused(workspaceName: string): Promise<boolean> {
-    return (await this.workspaceRow(workspaceName).getByLabel('Back to all projects').count()) > 0;
+  // Focus mode swaps the collection's tree row for a header at the top of the sidebar carrying the
+  // back arrow and the collection's name — that header is the only title the sidebar shows for the
+  // active collection. Waiting for it also absorbs the window right after navigating in, where the
+  // tree is still rendered and the swap hasn't happened yet. Both assertions re-query on every
+  // retry, so the swap unmounting the tree row can't wedge them, as a single locator query would
+  // (it keeps waiting for its selector to match again, which never happens once focus mode is in).
+  async expectWorkspaceActive(workspaceName: string): Promise<void> {
+    await expect(this.root.getByLabel('Back to all projects')).toBeVisible();
+    await expect(this.root.getByTestId(`workspace-node-${workspaceName}`)).toContainText(workspaceName);
   }
 
   // Exits collection focus mode if currently focused; no-op otherwise. Needed before
@@ -110,30 +116,6 @@ export class NavigationSidebar {
     }
   }
 
-  async expectWorkspaceActive(workspaceName: string): Promise<void> {
-    await expect.soft(this.workspaceRow(workspaceName)).toBeVisible();
-    // In focus mode there's no grid row to check aria-selected on for this workspace — being
-    // shown as the focused header already proves it's the active one. Poll for either outcome
-    // rather than deciding up front: right after navigating in, there's a brief window where
-    // neither is true yet (focus mode hasn't finished swapping the row for the header), and a
-    // one-shot check can catch that transient state and commit to the wrong branch.
-    await expect
-      .poll(
-        async () => {
-          if (await this.isWorkspaceFocused(workspaceName)) {
-            return true;
-          }
-          const gridItem = this.workspaceGridListItem(workspaceName);
-          if ((await gridItem.count()) === 0) {
-            return false;
-          }
-          return (await gridItem.getAttribute('aria-selected')) === 'true';
-        },
-        { timeout: 25_000 },
-      )
-      .toBe(true);
-  }
-
   async selectWorkspace(workspaceName: string): Promise<void> {
     await this.workspaceRow(workspaceName).click();
   }
@@ -163,7 +145,7 @@ export class NavigationSidebar {
     workspaceName: string;
   }): Promise<void> {
     await this.openWorkspaceActionsDropdown(workspaceName);
-    await this.page.getByRole('menuitemradio', { name: actionName }).click();
+    await this.page.getByRole('menuitemradio', { name: actionName, exact: true }).click();
   }
 
   async expandWorkspace(workspaceName: string): Promise<void> {
diff --git a/packages/insomnia-smoke-test/playwright/pages/project/index.ts b/packages/insomnia-smoke-test/playwright/pages/project/index.ts
index 1fe14e786a..338af852af 100644
--- a/packages/insomnia-smoke-test/playwright/pages/project/index.ts
+++ b/packages/insomnia-smoke-test/playwright/pages/project/index.ts
@@ -103,9 +103,9 @@ export class ProjectPage extends BasePage {
   }
 
   async createCollection(name = 'My Collection'): Promise<void> {
-    await this.selectCreateInProjectType('Collection');
+    await this.selectCreateInProjectType('API Collection');
     await this.page.getByRole('dialog').waitFor({ state: 'visible' });
-    const nameInput = this.page.getByRole('dialog').getByPlaceholder('Enter a name for your Request Collection');
+    const nameInput = this.page.getByRole('dialog').getByPlaceholder('Enter a name for your API Collection');
     await nameInput.waitFor({ state: 'visible' });
     await nameInput.fill(name);
     await this.page.getByRole('dialog').getByRole('button', { name: 'Create' }).click();
@@ -175,7 +175,10 @@ export class ProjectPage extends BasePage {
     // mid-click. Tolerate that here; the waitFor below is the real assertion that the modal is gone.
     const discardConfirmDialog = this.page.getByRole('dialog', { name: 'Unsaved changes' });
     if (await discardConfirmDialog.isVisible().catch(() => false)) {
-      await discardConfirmDialog.getByRole('button', { name: 'Yes' }).click({ timeout: 5000 }).catch(() => {});
+      await discardConfirmDialog
+        .getByRole('button', { name: 'Yes' })
+        .click({ timeout: 5000 })
+        .catch(() => {});
     }
 
     await dialog.waitFor({ state: 'hidden' });
@@ -271,7 +274,10 @@ export class ProjectPage extends BasePage {
       // mid-click. Tolerate that here; the waitFor below is the real assertion that the modal is gone.
       const discardConfirmDialog = this.page.getByRole('dialog', { name: 'Unsaved changes' });
       if (await discardConfirmDialog.isVisible().catch(() => false)) {
-        await discardConfirmDialog.getByRole('button', { name: 'Yes' }).click({ timeout: 5000 }).catch(() => {});
+        await discardConfirmDialog
+          .getByRole('button', { name: 'Yes' })
+          .click({ timeout: 5000 })
+          .catch(() => {});
       }
     }
     // The modal's backdrop still intercepts clicks for a moment after closing
@@ -357,7 +363,7 @@ export class ProjectPage extends BasePage {
     await this.workspaceList.openWorkspaceCardDropdown(workspaceName);
 
     // Click Export option
-    await this.page.getByRole('menuitem', { name: 'Export' }).click();
+    await this.page.getByRole('menuitem', { name: 'Export', exact: true }).click();
 
     // Click Export button in the export requests modal (all requests selected by default)
     await this.page.getByRole('dialog').getByRole('button', { name: 'Export' }).click();
diff --git a/packages/insomnia-smoke-test/server/index.ts b/packages/insomnia-smoke-test/server/index.ts
index 99f643cc8d..8eddb4699b 100644
--- a/packages/insomnia-smoke-test/server/index.ts
+++ b/packages/insomnia-smoke-test/server/index.ts
@@ -54,6 +54,19 @@ app.get('/pets/:id', (req, res) => {
   res.status(200).send({ id: req.params.id });
 });
 
+// Server-sent events: writes a couple of events and closes, so a test can assert the event-stream
+// response pane without holding a connection open for the rest of the run.
+app.get('/sse', (_req, res) => {
+  res.writeHead(200, {
+    'Content-Type': 'text/event-stream',
+    'Cache-Control': 'no-cache',
+    'Connection': 'keep-alive',
+  });
+  res.write('data: hello-from-sse-1\n\n');
+  res.write('data: hello-from-sse-2\n\n');
+  res.end();
+});
+
 app.get('/large-json', (_req, res) => {
   const items = Array.from({ length: 100_000 }, (_, i) => ({
     id: i,
diff --git a/packages/insomnia-smoke-test/server/insomnia-api.ts b/packages/insomnia-smoke-test/server/insomnia-api.ts
index 27b01cf6fd..a7257cc049 100644
--- a/packages/insomnia-smoke-test/server/insomnia-api.ts
+++ b/packages/insomnia-smoke-test/server/insomnia-api.ts
@@ -121,15 +121,25 @@ const defaultOrganizationFeatures = {
   bulkImport: {
     enabled: true,
   },
-  konnectSync: {
-    enabled: true,
-  },
 };
 
 let organizationFeatures = {
   features: { ...defaultOrganizationFeatures },
 };
 
+interface Entitlement {
+  featureKey: string;
+  type: 'metered';
+  hasAccess: boolean;
+  allowance: number | null;
+}
+
+const defaultEntitlements: Entitlement[] = [
+  { featureKey: 'konnectControlPlanes_default', type: 'metered', hasAccess: true, allowance: null },
+];
+
+let entitlements: Entitlement[] = [...defaultEntitlements];
+
 const v3User = {
   id: 'acct_64a477e6b59d43a5a607f84b4f73e3ce',
   email: 'insomnia-user@konghq.com',
@@ -520,6 +530,20 @@ export default function setup(app: Application) {
     res.status(200).send();
   });
 
+  // An account without the feature gets an empty list rather than `hasAccess: false`.
+  app.get('/v1/user/entitlements', (req, res) => {
+    const feature = typeof req.query.feature === 'string' ? req.query.feature : undefined;
+    res.status(200).send({
+      entitlements: feature ? entitlements.filter(e => e.featureKey.startsWith(`${feature}_`)) : entitlements,
+    });
+  });
+
+  // Test Utility Endpoint - Allows altering entitlements at runtime.
+  app.post('/v1/test-utils/user/entitlements', json(), (req, res) => {
+    entitlements = Array.isArray(req.body?.entitlements) ? req.body.entitlements : [...defaultEntitlements];
+    res.status(200).send();
+  });
+
   // Projects
   app.get('/v1/organizations/:orgId/team-projects', (_req, res) => {
     res.status(200).send({
diff --git a/packages/insomnia-smoke-test/tests/migration/local-to-cloud-projects.test.ts b/packages/insomnia-smoke-test/tests/migration/local-to-cloud-projects.test.ts
index 16421a455c..fc9fca5ed8 100644
--- a/packages/insomnia-smoke-test/tests/migration/local-to-cloud-projects.test.ts
+++ b/packages/insomnia-smoke-test/tests/migration/local-to-cloud-projects.test.ts
@@ -30,7 +30,7 @@ testWithLegacyDatabase('Run data migration to version 8', async ({ page, userCon
 
   // Open migrated local migrated collection that should have Git Sync
   await page.getByLabel('Local Collection').click();
-  await page.getByRole('button', { name: 'Manage Environments' }).click();
+  await page.getByLabel('Select an API Collection Environment').click();
   await page.getByLabel('Select a Collection').getByRole('option', { name: 'Mars' }).press('Enter');
   await page.locator('body').click();
   // The collection is moved to a local project
diff --git a/packages/insomnia-smoke-test/tests/smoke/after-response-script-features.test.ts b/packages/insomnia-smoke-test/tests/smoke/after-response-script-features.test.ts
index 58c4aae309..8eb97dc31c 100644
--- a/packages/insomnia-smoke-test/tests/smoke/after-response-script-features.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/after-response-script-features.test.ts
@@ -6,7 +6,11 @@ import { test } from '../../playwright/test';
 test.describe('after-response script features tests', () => {
   test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
 
-  test('after-response scripts: transient vars, assertions, and environment/global persistence', async ({ page, app, insomnia }) => {
+  test('after-response scripts: transient vars, assertions, and environment/global persistence', async ({
+    page,
+    app,
+    insomnia,
+  }) => {
     // import global environment
     const globalEnvText = await loadFixture('script-global-environment.yaml');
     await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), globalEnvText);
@@ -81,8 +85,8 @@ test.describe('after-response script features tests', () => {
     await expect.soft(statusTag1).toContainText('200 OK');
 
     // verify persisted environment
-    await page.getByRole('button', { name: 'Manage Environments' }).click();
-    await page.getByRole('button', { name: 'Manage collection environments' }).click();
+    await page.getByLabel('Select an API Collection Environment').click();
+    await page.getByRole('button', { name: 'Manage API collection environments' }).click();
     const responseBody = page.getByRole('dialog').getByTestId('CodeEditor').locator('.CodeMirror-line');
     const rows1 = await responseBody.allInnerTexts();
     const bodyJson = JSON.parse(rows1.join(' '));
@@ -100,9 +104,7 @@ test.describe('after-response script features tests', () => {
     await page.locator('body').click();
     await insomnia.navigationSidebar.clickRequestOrFolder('persist global environment');
     // activate global sub environment
-    await page.getByLabel('Manage Environments').click();
-    await page.getByPlaceholder('Choose a project environment').click();
-    await page.getByRole('option', { name: 'Script Environment' }).click();
+    await page.getByLabel('Select a Project Environment').click();
     await page.getByRole('option', { name: 'Sub Script Env' }).click();
     await page.locator('body').click();
     // send
@@ -119,8 +121,9 @@ test.describe('after-response script features tests', () => {
     await page.getByText('log: globals sub').click();
     await page.getByText('log: baseGlobals base').click();
     // view sub environment has been updated
-    await page.getByLabel('Manage Environments').click();
-    await page.getByLabel('Manage project environment').click();
+    await page.getByLabel('Select a Project Environment').click();
+    await page.getByRole('option', { name: 'Script Environment', exact: true }).hover();
+    await page.getByLabel('Edit Script Environment').click();
     await page.getByLabel('Environment name').getByText('Sub Script Env').first().click();
     let globalSubEditor = page.getByTestId('CodeEditor').locator('.CodeMirror-line');
     let globalSubRows = await globalSubEditor.allInnerTexts();
@@ -141,7 +144,11 @@ test.describe('after-response script features tests', () => {
     });
   });
 
-  test('insomnia.expect covers each matcher (equal/property/lengthOf/include/within/keys) and test.skip is reported', async ({ page, app, insomnia }) => {
+  test('insomnia.expect covers each matcher (equal/property/lengthOf/include/within/keys) and test.skip is reported', async ({
+    page,
+    app,
+    insomnia,
+  }) => {
     const text = await loadFixture('after-response-collection.yaml');
     await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
diff --git a/packages/insomnia-smoke-test/tests/smoke/app.test.ts b/packages/insomnia-smoke-test/tests/smoke/app.test.ts
index 8756a4ce10..5f9afedac7 100644
--- a/packages/insomnia-smoke-test/tests/smoke/app.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/app.test.ts
@@ -12,14 +12,17 @@ test('can send requests', async ({ page, insomnia }) => {
   await insomnia.projectPage.importFixture('smoke-test-collection.yaml');
 
   await insomnia.navigationSidebar.openWorkspaceActionsDropdown('Smoke tests');
-  await page.getByRole('menuitemradio', { name: 'Export' }).click();
+  await page.getByRole('menuitemradio', { name: 'Export', exact: true }).click();
   await page.getByRole('button', { name: 'Export' }).click();
   await page.getByText('Which format would you like to export as?').click();
   await insomnia.pressEscape();
 
   await insomnia.navigationSidebar.openWorkspaceActionsDropdown('Smoke tests');
   await page.getByRole('menuitemradio', { name: 'From Curl' }).click();
-  await page.locator('.CodeMirror textarea').fill('curl --request GET --url http://127.0.0.1:4010/echo');
+  await page
+    .getByRole('dialog')
+    .locator('.CodeMirror textarea')
+    .fill('curl --request GET --url http://127.0.0.1:4010/echo');
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
 
   await expect
diff --git a/packages/insomnia-smoke-test/tests/smoke/cloud-sync.test.ts b/packages/insomnia-smoke-test/tests/smoke/cloud-sync.test.ts
index 0fed8cabd7..6dd2a6aca4 100644
--- a/packages/insomnia-smoke-test/tests/smoke/cloud-sync.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/cloud-sync.test.ts
@@ -160,7 +160,7 @@ test.describe('Cloud Sync', () => {
 
     // delete workspace locally
     await page.getByLabel('My Collection R1').getByTestId('DropdownButton').click();
-    await page.getByRole('button', { name: 'Delete' }).click();
+    await page.getByRole('menuitem', { name: 'Delete', exact: true }).click();
     await page.getByText('Remove Local Copy').click();
     await page.getByRole('button', { name: 'Delete Workspace' }).click();
     // check workspace is deleted locally
@@ -174,10 +174,76 @@ test.describe('Cloud Sync', () => {
 
     // delete workspace both locally and remotely
     await page.getByTestId('workspace-grid').getByLabel('My Collection R1').getByTestId('DropdownButton').click();
-    await page.getByRole('button', { name: 'Delete' }).click();
+    await page.getByRole('menuitem', { name: 'Delete', exact: true }).click();
     await page.getByRole('button', { name: 'Delete Workspace' }).click();
     // check workspace is deleted remotely
     await expect.soft(insomnia.navigationSidebar.unsyncedWorkspaceRow('My Collection R1')).toBeHidden();
     await expect.soft(insomnia.navigationSidebar.workspaceRow('My Collection R1')).toBeHidden();
   });
+
+  test('Delete an unsynced remote file from the project dashboard', async ({ page, insomnia }) => {
+    // "Design Project" is only ever remote in this suite, so it is never pulled locally first.
+    const unsyncedCard = page.getByTestId('workspace-grid').getByLabel('Design Project');
+    await expect.soft(unsyncedCard).toBeVisible();
+    await expect.soft(insomnia.navigationSidebar.unsyncedWorkspaceRow('Design Project')).toBeVisible();
+
+    await unsyncedCard.hover();
+    await unsyncedCard.getByLabel('Delete unsynced file').click();
+
+    await expect.soft(page.getByRole('heading', { name: 'Delete file' })).toBeVisible();
+    await page.getByRole('button', { name: 'Delete unsynced file permanently' }).click();
+
+    await expect.soft(unsyncedCard).toBeHidden();
+    await expect.soft(insomnia.navigationSidebar.unsyncedWorkspaceRow('Design Project')).toBeHidden();
+    await expect.soft(insomnia.navigationSidebar.workspaceRow('Design Project')).toBeHidden();
+
+    // The other remote files must be untouched.
+    await expect.soft(insomnia.navigationSidebar.unsyncedWorkspaceRow('My Collection R1')).toBeVisible();
+  });
+
+  // Regression test for the main-process VCS singleton mutable-state bug: a single `_backendProject`
+  // field shared across every workspace meant that activating one workspace's backend project while
+  // another workspace's activation was still in flight could make the second call "win" for both,
+  // so the loser ended up reading/writing the wrong workspace's local sync data. Each workspace now
+  // gets its own VCS instance, so concurrently activating two different workspaces must never let
+  // one clobber the other's active backend project. Uses synthetic workspace ids (not part of the
+  // mock server's fixtures) since this only exercises local VCS state, no network calls involved.
+  test('keeps concurrently-activated workspaces on their own backend project', async ({ page }) => {
+    const workspaceA = { id: 'wrk_concurrency_test_a', name: 'Concurrency Test A' };
+    const workspaceB = { id: 'wrk_concurrency_test_b', name: 'Concurrency Test B' };
+
+    const result = await page.evaluate(
+      async ({ a, b }) => {
+        const sync = (window as any).main.sync;
+        // Fire both workspaces' activation concurrently, the way two open workspaces being
+        // synced around the same time would on the main process side.
+        await Promise.all([
+          sync.switchAndCreateBackendProjectIfNotExist(a.id, a.id, a.name),
+          sync.switchAndCreateBackendProjectIfNotExist(b.id, b.id, b.name),
+        ]);
+
+        const [activeA, activeB] = await Promise.all([
+          sync.getActiveBackendProject(a.id),
+          sync.getActiveBackendProject(b.id),
+        ]);
+
+        return { activeA, activeB };
+      },
+      { a: workspaceA, b: workspaceB },
+    );
+
+    expect.soft(result.activeA?.rootDocumentId).toBe(workspaceA.id);
+    expect.soft(result.activeB?.rootDocumentId).toBe(workspaceB.id);
+    expect.soft(result.activeA?.id).not.toBe(result.activeB?.id);
+
+    // Clean up the local backend projects created for this test's synthetic workspace ids.
+    await page.evaluate(
+      async ({ a, b }) => {
+        const sync = (window as any).main.sync;
+        await sync.removeBackendProjectsForRoot(a.id);
+        await sync.removeBackendProjectsForRoot(b.id);
+      },
+      { a: workspaceA, b: workspaceB },
+    );
+  });
 });
diff --git a/packages/insomnia-smoke-test/tests/smoke/custom-lint-rules.test.ts b/packages/insomnia-smoke-test/tests/smoke/custom-lint-rules.test.ts
index 809dc7dc0f..8affe76e9b 100644
--- a/packages/insomnia-smoke-test/tests/smoke/custom-lint-rules.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/custom-lint-rules.test.ts
@@ -115,7 +115,7 @@ async function addAccessTokenGitCredential(insomnia: InsomniaApp) {
 
 async function createGitDesignDocument(insomnia: InsomniaApp, page: Page, projectName: string) {
   await insomnia.navigationSidebar.selectProjectDropdownOption({
-    actionName: 'Document',
+    actionName: 'API Collection',
     projectName,
   });
   await page.getByRole('textbox', { name: 'Name', exact: true }).fill('Lint Test Spec');
@@ -215,8 +215,8 @@ test.describe('Custom Spectral Lint Rules', () => {
     await insomnia.relaunch();
 
     // Re-navigate to the same design document after relaunch. The workspace is
-    // created with the default name 'My Design Document'.
-    await insomnia.page.getByLabel('My Design Document').first().click();
+    // created with the default name 'My API Collection'.
+    await insomnia.page.getByLabel('My API Collection').first().click();
 
     await expect
       .soft(insomnia.page.getByRole('button', { name: 'View selected ruleset content' }))
@@ -243,7 +243,7 @@ test.describe('Custom Spectral Lint Rules', () => {
     await expect.soft(insomnia.page.getByText('No lint problems')).toBeVisible({ timeout: 15_000 });
 
     await insomnia.relaunch();
-    await insomnia.page.getByLabel('My Design Document').first().click();
+    await insomnia.page.getByLabel('My API Collection').first().click();
 
     await expect.soft(insomnia.page.getByText('Default OAS Ruleset')).toBeVisible({ timeout: 15_000 });
     await expect.soft(insomnia.page.getByText(new RegExp(RULESET_RULE_NAME))).toBeHidden();
@@ -264,7 +264,7 @@ test.describe('Custom Spectral Lint Rules', () => {
     await expect.soft(insomnia.page.getByText('Invalid Spectral Ruleset', { exact: true })).toBeVisible({
       timeout: 10_000,
     });
-    await insomnia.page.getByRole('button', { name: 'Ok' }).click();
+    await insomnia.page.getByRole('dialog', { name: 'Modal' }).getByRole('button', { name: 'Ok' }).click();
 
     // Default ruleset should still be active; no custom upload button state change.
     await expect.soft(insomnia.page.getByText('Default OAS Ruleset')).toBeVisible();
@@ -298,7 +298,7 @@ test.describe('Custom Spectral Lint Rules', () => {
 
     test('upload custom ruleset in a synced design project', async ({ page, insomnia }) => {
       await page.getByTestId('workspace-grid').getByLabel('Design Project').click();
-      await page.waitForURL(/\/workspace\/.+\/spec/, { timeout: 30_000 });
+      await page.waitForURL(/\/workspace\/.+\/debug/, { timeout: 30_000 });
 
       await uploadRuleset(insomnia, page);
 
@@ -330,14 +330,14 @@ test.describe('Custom Spectral Lint Rules', () => {
 
       // Machine A: upload and push.
       await page.getByTestId('workspace-grid').getByLabel('Design Project').click();
-      await page.waitForURL(/\/workspace\/.+\/spec/, { timeout: 30_000 });
+      await page.waitForURL(/\/workspace\/.+\/debug/, { timeout: 30_000 });
       await uploadRuleset(insomnia, page);
       await commitAndPush(page, 'Add custom lint ruleset');
 
       // Machine B: fresh data path (simulates a different machine), pull, and verify.
       const machineB = await insomnia.launchClone(randomDataPath());
       await machineB.page.getByTestId('workspace-grid').getByLabel('Design Project').click();
-      await machineB.page.waitForURL(/\/workspace\/.+\/spec/, { timeout: 30_000 });
+      await machineB.page.waitForURL(/\/workspace\/.+\/debug/, { timeout: 30_000 });
       await expect
         .soft(machineB.page.getByRole('button', { name: 'View selected ruleset content' }))
         .toBeVisible({ timeout: 15_000 });
@@ -366,7 +366,7 @@ test.describe('Custom Spectral Lint Rules', () => {
 
       // User A: upload and push.
       await page.getByTestId('workspace-grid').getByLabel('Design Project').click();
-      await page.waitForURL(/\/workspace\/.+\/spec/, { timeout: 30_000 });
+      await page.waitForURL(/\/workspace\/.+\/debug/, { timeout: 30_000 });
       await uploadRuleset(insomnia, page);
       await commitAndPush(page, 'User A: add custom lint ruleset');
 
@@ -376,7 +376,7 @@ test.describe('Custom Spectral Lint Rules', () => {
       });
 
       await userB.page.getByTestId('workspace-grid').getByLabel('Design Project').click();
-      await userB.page.waitForURL(/\/workspace\/.+\/spec/, { timeout: 30_000 });
+      await userB.page.waitForURL(/\/workspace\/.+\/debug/, { timeout: 30_000 });
 
       await expect
         .soft(userB.page.getByRole('button', { name: 'View selected ruleset content' }))
diff --git a/packages/insomnia-smoke-test/tests/smoke/dashboard-interactions.test.ts b/packages/insomnia-smoke-test/tests/smoke/dashboard-interactions.test.ts
index cbdf2b38ab..533b506e2a 100644
--- a/packages/insomnia-smoke-test/tests/smoke/dashboard-interactions.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/dashboard-interactions.test.ts
@@ -42,7 +42,7 @@ test.describe('Dashboard', () => {
     // After deleting project, return to default Insomnia Dashboard
     await expect.soft(page.locator('.app')).toContainText('Personal Workspace');
     await expect.soft(page.locator('.app')).not.toContainText('My Project123');
-    await expect.soft(page.locator('.app')).toContainText('Create document');
+    await expect.soft(page.locator('.app')).toContainText('Enter API Spec');
     await expect.soft(page.locator('.app')).not.toContainText('Setup Git Sync');
 
     // Documents
@@ -56,9 +56,9 @@ test.describe('Dashboard', () => {
     await page.getByTestId('workspace-breadcrumb-level-0').click();
 
     // Rename document
-    await page.getByLabel('Files').getByLabel('My Design Document').getByRole('button').click();
+    await page.getByLabel('Files').getByLabel('My API Collection').getByRole('button').click();
     await page.getByRole('menuitem', { name: 'Rename' }).click();
-    await page.locator('text=Rename DocumentName Rename >> input[type="text"]').fill('test123');
+    await page.locator('text=Rename API CollectionName Rename >> input[type="text"]').fill('test123');
     await page.getByRole('button', { name: 'Rename' }).click();
     await expect.soft(page.locator('.app')).toContainText('test123');
 
@@ -74,14 +74,14 @@ test.describe('Dashboard', () => {
 
     // Create new collection
     await page.getByLabel('Create in project').click();
-    await page.getByRole('menuitemradio', { name: 'Collection' }).click();
+    await page.getByRole('menuitemradio', { name: 'API Collection' }).click();
     await page.getByRole('button', { name: 'Create', exact: true }).click();
     await page.getByTestId('workspace-breadcrumb-level-0').click();
 
     // Rename collection
-    await page.click('text=CollectionMy Collectionjust now >> button');
+    await page.click('text=API CollectionMy API Collectionjust now >> button');
     await page.getByRole('menuitem', { name: 'Rename' }).click();
-    await page.locator('text=Rename CollectionName Rename >> input[type="text"]').fill('collection123');
+    await page.locator('text=Rename API CollectionName Rename >> input[type="text"]').fill('collection123');
     await page.getByRole('button', { name: 'Rename' }).click();
     await expect.soft(page.locator('.app')).toContainText('collection123');
 
diff --git a/packages/insomnia-smoke-test/tests/smoke/design-document-naming.test.ts b/packages/insomnia-smoke-test/tests/smoke/design-document-naming.test.ts
index b3c4ccf95f..8421c396d5 100644
--- a/packages/insomnia-smoke-test/tests/smoke/design-document-naming.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/design-document-naming.test.ts
@@ -4,17 +4,21 @@ test.describe('design document operations', () => {
   test('can name design documents', async ({ page }) => {
     await page.getByRole('button', { name: 'Create document' }).click();
     await page.locator('body').click();
-    await page.getByPlaceholder('Enter a name for your Design Document').fill('jurassic park');
-    await page.getByPlaceholder('Enter a name for your Design Document').press('Enter');
+    await page.getByPlaceholder('Enter a name for your API Collection').fill('jurassic park');
+    await page.getByPlaceholder('Enter a name for your API Collection').press('Enter');
     await page.getByTestId('workspace-breadcrumb-level-0').click();
     await page.getByLabel('Files').getByLabel('jurassic park').click();
   });
 
-  test('can delete a test suite with confirmation modal', async ({ page }) => {
+  test('can delete a test suite with confirmation modal', async ({ page, insomnia }) => {
     await page.getByRole('button', { name: 'Create document' }).click();
-    await page.getByPlaceholder('Enter a name for your Design Document').fill('jurassic park');
-    await page.getByPlaceholder('Enter a name for your Design Document').press('Enter');
-    await page.getByTestId('workspace-test').click();
+    await page.getByPlaceholder('Enter a name for your API Collection').fill('jurassic park');
+    await page.getByPlaceholder('Enter a name for your API Collection').press('Enter');
+    // Show test suite in settings
+    await insomnia.statusbar.openPreferences();
+    await page.locator('input[name="enableLegacyUnitTests"]').click();
+    await insomnia.preferencesPage.closePreferences();
+    await page.getByTestId('api-collection-tab-tests').click();
     await page.getByText('New test suite').click();
     await page.getByLabel('Test Suites').getByLabel('Unit Test Actions').click();
     await page.getByRole('menuitemradio', { name: 'Delete suite' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/design-interactions.test.ts b/packages/insomnia-smoke-test/tests/smoke/design-interactions.test.ts
index c42df169ea..19d4d9c965 100644
--- a/packages/insomnia-smoke-test/tests/smoke/design-interactions.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/design-interactions.test.ts
@@ -6,7 +6,7 @@ import { test } from '../../playwright/test';
 test.describe('Design interactions', () => {
   test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
 
-  test('Unit Test interactions', async ({ app, page }) => {
+  test('Unit Test interactions', async ({ app, page, insomnia }) => {
     // Setup
     const text = await loadFixture('unit-test.yaml');
     await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
@@ -14,8 +14,12 @@ test.describe('Design interactions', () => {
     await page.locator('[data-test-id="import-from-clipboard"]').click();
     await page.getByRole('button', { name: 'Scan' }).click();
     await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
+    // Show test suite in settings
+    await insomnia.statusbar.openPreferences();
+    await page.locator('input[name="enableLegacyUnitTests"]').click();
+    await insomnia.preferencesPage.closePreferences();
     // Switch to Test tab
-    await page.click('a:has-text("Test")');
+    await page.getByTestId('api-collection-tab-tests').click();
 
     // Run tests and check results
     await page.getByLabel('Run all tests').click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/disable-git-sync.test.ts b/packages/insomnia-smoke-test/tests/smoke/disable-git-sync.test.ts
index b121e2d0ba..258c45f5d7 100644
--- a/packages/insomnia-smoke-test/tests/smoke/disable-git-sync.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/disable-git-sync.test.ts
@@ -19,9 +19,6 @@ test.describe('Git Sync', () => {
             gitSync: {
               enabled: false,
             },
-            konnectSync: {
-              enabled: true,
-            },
           },
         },
       });
@@ -35,9 +32,6 @@ test.describe('Git Sync', () => {
             gitSync: {
               enabled: true,
             },
-            konnectSync: {
-              enabled: true,
-            },
           },
         },
       });
diff --git a/packages/insomnia-smoke-test/tests/smoke/environment-cascade.test.ts b/packages/insomnia-smoke-test/tests/smoke/environment-cascade.test.ts
index c1375e79db..aa5a85b56e 100644
--- a/packages/insomnia-smoke-test/tests/smoke/environment-cascade.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/environment-cascade.test.ts
@@ -41,7 +41,7 @@ test.describe('environment cascade / override', () => {
   };
 
   const selectEnvironment = async (page: Page, insomnia: any, environmentName: string, requestName: string) => {
-    await page.getByRole('button', { name: 'Manage Environments' }).click();
+    await page.getByLabel('Select an API Collection Environment').click();
     // wait for the Manage Environments dialog to close before interacting with the picker
     await page.getByRole('heading', { name: 'Manage Environments' }).waitFor({ state: 'hidden' });
 
diff --git a/packages/insomnia-smoke-test/tests/smoke/environment-editor-interactions.test.ts b/packages/insomnia-smoke-test/tests/smoke/environment-editor-interactions.test.ts
index a3fecfe446..a22fdf0581 100644
--- a/packages/insomnia-smoke-test/tests/smoke/environment-editor-interactions.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/environment-editor-interactions.test.ts
@@ -16,16 +16,15 @@ test.describe('Environment Editor', () => {
     await page.getByRole('dialog').waitFor({ state: 'hidden' });
 
     // create a new shared environment (becomes active on creation)
-    await page.getByRole('button', { name: 'Manage Environments' }).click();
-    await page.getByRole('button', { name: 'Manage collection environments' }).click();
-    await page.getByTestId('CreateEnvironmentDropdown').click();
-    await page.getByRole('menuitemradio', { name: 'Shared Environment' }).press('Enter');
+    await page.getByLabel('Select an API Collection Environment').click();
+    await page.getByRole('button', { name: 'Manage API collection environments' }).click();
+    await page.getByTestId('AddSubEnvironment').click();
 
     // wait for the new row to appear before clicking it
     await page.getByRole('row', { name: 'New Environment' }).waitFor({ state: 'visible' });
     await page.getByRole('row', { name: 'New Environment' }).click();
     await page.getByRole('dialog').getByRole('button', { name: 'Close' }).click();
-    
+
     // wait for the Manage Environments dialog to close before interacting with the picker
     await page.getByRole('heading', { name: 'Manage Environments' }).waitFor({ state: 'hidden' });
 
@@ -36,7 +35,7 @@ test.describe('Environment Editor', () => {
     // send request: verify variables fall back to base env (new env is empty)
     await insomnia.navigationSidebar.clickRequestOrFolder('New Request');
     await page.getByRole('button', { name: 'Send' }).click();
-    
+
     // wait for a response before switching to console
     await page.locator('[data-testid="response-status-tag"]:visible').waitFor({ state: 'visible', timeout: 25_000 });
     await page.getByRole('tab', { name: 'Console' }).click();
@@ -44,8 +43,8 @@ test.describe('Environment Editor', () => {
     await expect.soft(page.getByText('baseenv1')).toBeVisible();
 
     // duplicate ExampleA and rename the copy to Gandalf
-    await page.getByRole('button', { name: 'Manage Environments' }).click();
-    await page.getByRole('button', { name: 'Manage collection environments' }).click();
+    await page.getByLabel('Select an API Collection Environment').click();
+    await page.getByRole('button', { name: 'Manage API collection environments' }).click();
     await page.getByRole('row', { name: 'ExampleA' }).getByLabel('Environment Actions').click();
     await page.getByText('Duplicate').click();
 
@@ -81,8 +80,8 @@ test.describe('Environment Editor', () => {
     await expect.soft(page.getByText('subenvB1')).toBeVisible();
 
     // add new variables to Gandalf via JSON editor
-    await page.getByRole('button', { name: 'Manage Environments' }).click();
-    await page.getByRole('button', { name: 'Manage collection environments' }).click();
+    await page.getByLabel('Select an API Collection Environment').click();
+    await page.getByRole('button', { name: 'Manage API collection environments' }).click();
     await page.locator('pre').filter({ hasText: '"exampleNumber": 2222,' }).click();
     const dialog = page.getByRole('dialog');
     await dialog.getByTestId('CodeEditor').getByRole('textbox').press('Enter');
@@ -92,16 +91,16 @@ test.describe('Environment Editor', () => {
 
     // blur the editor before closing so the debounce flush is triggered by the button's mousedown
     await dialog.getByRole('button', { name: 'Close' }).click();
-    
+
     // wait for the Manage Environments dialog to fully close before navigating
     await page.getByRole('heading', { name: 'Manage Environments' }).waitFor({ state: 'hidden' });
-    await page.getByLabel('Manage collection environments').press('Escape');
+    await page.getByLabel('Manage API collection environments').press('Escape');
 
     await insomnia.navigationSidebar.clickRequestOrFolder('New Request');
 
     // switch to table view and edit Gandalf environment
-    await page.getByRole('button', { name: 'Manage Environments' }).click();
-    await page.getByRole('button', { name: 'Manage collection environments' }).click();
+    await page.getByLabel('Select an API Collection Environment').click();
+    await page.getByRole('button', { name: 'Manage API collection environments' }).click();
 
     // explicitly select Gandalf so table edits target the correct sub-environment
     await page.getByLabel('Environments', { exact: true }).getByText('Gandalf').click();
@@ -167,14 +166,14 @@ test.describe('Environment Editor', () => {
     await page.getByRole('menuitemradio', { name: 'JSON' }).click();
     await waitForSync();
     await secondRow.getByRole('button', { name: 'Edit JSON' }).click();
-    
+
     // wait for the JSON modal before typing
     await page.getByRole('dialog').getByTestId('CodeEditor').waitFor({ state: 'visible' });
     const bodyEditor = page.getByRole('dialog').getByTestId('CodeEditor').getByRole('textbox');
     await bodyEditor.focus();
     await page.keyboard.press('ControlOrMeta+a');
     await page.keyboard.type('{"anotherString":"kvAnotherStr","anotherNumber": 12345}');
-    
+
     // submit and wait for the JSON modal to fully close before proceeding
     await page.getByRole('button', { name: 'Modal Submit' }).click();
     await page.getByRole('dialog', { name: 'Modal' }).waitFor({ state: 'hidden' });
@@ -187,7 +186,9 @@ test.describe('Environment Editor', () => {
     // dismiss the environment picker dropdown if it appeared
     await page.locator('body').click();
     try {
-      await page.getByRole('listbox', { name: 'Select a Collection Environment' }).waitFor({ state: 'hidden', timeout: 3000 });
+      await page
+        .getByRole('listbox', { name: 'Select an API Collection Environment' })
+        .waitFor({ state: 'hidden', timeout: 3000 });
     } catch {
       await page.keyboard.press('Escape');
     }
@@ -217,7 +218,7 @@ test.describe('Environment Editor', () => {
     await page.getByRole('dialog').waitFor({ state: 'hidden' });
 
     // activate ExampleA environment
-    await page.getByRole('button', { name: 'Manage Environments' }).click();
+    await page.getByLabel('Select an API Collection Environment').click();
     await page.getByRole('option', { name: 'ExampleA' }).press('Enter');
     await page.getByRole('option', { name: 'ExampleA' }).press('Escape');
 
@@ -230,8 +231,8 @@ test.describe('Environment Editor', () => {
     await expect.soft(page.getByText('subenvA0')).toBeVisible();
 
     // open env editor, select ExampleA, switch to table view, disable exampleString
-    await page.getByRole('button', { name: 'Manage Environments' }).click();
-    await page.getByRole('button', { name: 'Manage collection environments' }).click();
+    await page.getByLabel('Select an API Collection Environment').click();
+    await page.getByRole('button', { name: 'Manage API collection environments' }).click();
     await page.getByLabel('Environments', { exact: true }).getByText('ExampleA').click();
     await page.getByRole('button', { name: 'Table Edit' }).click();
     const kvTable = page.getByRole('listbox', { name: 'Environment Key Value Pair' });
@@ -246,7 +247,9 @@ test.describe('Environment Editor', () => {
     // dismiss the environment picker dropdown if it appeared
     await page.locator('body').click();
     try {
-      await page.getByRole('listbox', { name: 'Select a Collection Environment' }).waitFor({ state: 'hidden', timeout: 3000 });
+      await page
+        .getByRole('listbox', { name: 'Select an API Collection Environment' })
+        .waitFor({ state: 'hidden', timeout: 3000 });
     } catch {
       await page.keyboard.press('Escape');
     }
@@ -261,4 +264,124 @@ test.describe('Environment Editor', () => {
     await expect.soft(page.getByText('baseenv0')).toBeVisible();
     await expect.soft(page.getByText('subenvA0')).toBeHidden();
   });
+
+  test('project and collection environment dropdowns open and close independently', async ({ page }) => {
+    await page.getByRole('button', { name: 'Create request collection', exact: true }).click();
+
+    const projectListbox = page.getByRole('listbox', { name: 'Select a Project Environment' });
+    const collectionListbox = page.getByRole('listbox', { name: 'Select an API Collection Environment' });
+
+    // opening the collection dropdown does not open the project dropdown
+    await page.getByLabel('Select an API Collection Environment').click();
+    await expect.soft(collectionListbox).toBeVisible();
+    await expect.soft(projectListbox).toBeHidden();
+    await page.keyboard.press('Escape');
+    await expect.soft(collectionListbox).toBeHidden();
+
+    // opening the project dropdown does not open the collection dropdown
+    await page.getByLabel('Select a Project Environment').click();
+    await expect.soft(projectListbox).toBeVisible();
+    await expect.soft(collectionListbox).toBeHidden();
+    await page.keyboard.press('Escape');
+    await expect.soft(projectListbox).toBeHidden();
+  });
+
+  test('Add Project Environment creates a project environment without activating it', async ({ page, insomnia }) => {
+    await page.getByRole('button', { name: 'Create request collection', exact: true }).click();
+
+    // the "+" button in the project dropdown header opens the create-workspace modal
+    await page.getByLabel('Select a Project Environment').click();
+    await page.getByLabel('Add Project Environment').click();
+    await page.getByPlaceholder('Enter a name for your Environment').fill('My New Project Env');
+    await page.getByRole('button', { name: 'Create', exact: true }).click();
+    await page.getByRole('dialog', { name: 'Create or update dialog' }).waitFor({ state: 'hidden' });
+    await insomnia.pressEscape();
+
+    // creating navigates into the new environment's own page; go back to the collection
+    await insomnia.navigationSidebar.selectWorkspace('My first collection');
+
+    // the new environment shows up in the project dropdown's list, but is not auto-selected
+    await expect.soft(page.getByLabel('Select a Project Environment')).toContainText('No Project Environment');
+    await page.getByLabel('Select a Project Environment').click();
+    await expect.soft(page.getByRole('option', { name: 'My New Project Env' })).toBeVisible();
+  });
+
+  test('Add Sub Environment and Add Private Sub Environment create environments with the correct privacy', async ({
+    page,
+  }) => {
+    await page.getByRole('button', { name: 'Create request collection', exact: true }).click();
+
+    await page.getByLabel('Select an API Collection Environment').click();
+    await page.getByRole('button', { name: 'Manage API collection environments' }).click();
+
+    // create the shared sub-environment and rename it so it can be told apart from the private one
+    await page.getByTestId('AddSubEnvironment').click();
+    const sharedRow = page.getByRole('row', { name: 'New Environment' });
+    await sharedRow.waitFor({ state: 'visible' });
+    await sharedRow.locator('[data-editable=true]').dblclick();
+    await sharedRow.locator('input').fill('Shared Sub Env');
+    await sharedRow.locator('input').press('Enter');
+    await page.getByRole('row', { name: 'Shared Sub Env' }).waitFor({ state: 'visible' });
+    await expect.soft(page.getByRole('row', { name: 'Shared Sub Env' }).locator('.fa-lock')).toHaveCount(0);
+
+    // create the private sub-environment
+    await page.getByTestId('AddPrivateSubEnvironment').click();
+    const privateRow = page.getByRole('row', { name: 'New Environment' });
+    await privateRow.waitFor({ state: 'visible' });
+    await expect.soft(privateRow.locator('.fa-lock')).toBeVisible();
+  });
+
+  test('clearing the JSON editor reports a JSON error instead of keeping stale table values', async ({ page, app }) => {
+    const text = await loadFixture('environments.yaml');
+    await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
+    await page.getByLabel('Import').click();
+    await page.locator('[data-test-id="import-from-clipboard"]').click();
+    await page.getByRole('button', { name: 'Scan' }).click();
+    await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
+
+    // wait for import dialog to close before proceeding
+    await page.getByRole('dialog').waitFor({ state: 'hidden' });
+
+    // open the JSON environment in the environment editor
+    await page.getByLabel('Select an API Collection Environment').click();
+    await page.getByRole('button', { name: 'Manage API collection environments' }).click();
+    const environmentDialog = page.getByRole('dialog', { name: 'Manage Environments' });
+    await environmentDialog.getByLabel('Environments', { exact: true }).getByText('ExampleA').click();
+
+    // delete all JSON content
+    const jsonEditor = environmentDialog.getByTestId('CodeEditor').getByRole('textbox');
+    await jsonEditor.focus();
+    await page.keyboard.press('ControlOrMeta+a');
+    await page.keyboard.press('Delete');
+
+    /* Empty content must be reported like any other parse error, not silently dropped. */
+    await expect.soft(environmentDialog.getByText('Unexpected end of JSON input')).toBeVisible();
+
+    /* The existing JSON error dialog blocks the switch, so the table can never show values that no
+    longer match the editor content. */
+    await page.getByRole('button', { name: 'Table Edit' }).click();
+    await expect
+      .soft(page.getByText('Please modify and fix the JSON string error before switch to Table view'))
+      .toBeVisible();
+    await expect.soft(page.getByRole('listbox', { name: 'Environment Key Value Pair' })).toBeHidden();
+    await page.getByRole('button', { name: 'Ok', exact: true }).click();
+
+    /* Reopening remounts the editor and restores the unsaved empty content from its cache: the error
+    must survive, otherwise the document is empty but still switchable. */
+    await page.getByRole('button', { name: 'Close', exact: true }).click();
+    await page.getByRole('heading', { name: 'Manage Environments' }).waitFor({ state: 'hidden' });
+    // the picker popover can still be open; this click dismisses it, then reopen the editor
+    await page.locator('body').click();
+    await page.getByRole('button', { name: 'Select an API Collection Environment' }).click();
+    await page.getByRole('button', { name: 'Manage API collection environments' }).click();
+    await page.getByRole('dialog', { name: 'Manage Environments' }).waitFor({ state: 'visible' });
+    await environmentDialog.getByLabel('Environments', { exact: true }).getByText('ExampleA').click();
+
+    await expect.soft(environmentDialog.getByText('Unexpected end of JSON input')).toBeVisible();
+    await page.getByRole('button', { name: 'Table Edit' }).click();
+    await expect
+      .soft(page.getByText('Please modify and fix the JSON string error before switch to Table view'))
+      .toBeVisible();
+    await expect.soft(page.getByRole('listbox', { name: 'Environment Key Value Pair' })).toBeHidden();
+  });
 });
diff --git a/packages/insomnia-smoke-test/tests/smoke/event-stream-response-pane.test.ts b/packages/insomnia-smoke-test/tests/smoke/event-stream-response-pane.test.ts
new file mode 100644
index 0000000000..75a587d184
--- /dev/null
+++ b/packages/insomnia-smoke-test/tests/smoke/event-stream-response-pane.test.ts
@@ -0,0 +1,74 @@
+import { expect } from '@playwright/test';
+
+import { test } from '../../playwright/test';
+
+// An Event Stream (SSE) response stores its NDJSON event log in `bodyPath`, exactly where a plain
+// HTTP response keeps its raw body, so what counts as an event has to come from the content. Flipping
+// `Accept` to text/event-stream after sending used to feed that HTTP body to the events table, which
+// threw `Could not determine key for item` and blanked the whole response pane.
+test('Event Stream: an HTTP response is not re-read as an event log after flipping the Accept header', async ({
+  page,
+  insomnia,
+}) => {
+  test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
+
+  const responsePane = page.getByTestId('response-pane').first();
+  const responseBody = responsePane.locator('[data-testid="CodeEditor"]:visible');
+  const requestPane = page.getByTestId('request-pane');
+
+  // Compact single-line JSON: a pretty-printed body would fail to parse line by line, hiding the bug.
+  await page.getByRole('button', { name: 'Create request collection', exact: true }).click();
+  await insomnia.navigationSidebar.openWorkspaceActionsDropdown('My first collection');
+  await page.getByRole('menuitemradio', { name: 'From Curl' }).click();
+  await page.getByRole('dialog').locator('.CodeMirror textarea').fill('curl --url http://127.0.0.1:4010/pets/1');
+  await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
+  await expect.soft(requestPane.getByTestId('OneLineEditor').getByText('http://127.0.0.1:4010/pets/1')).toBeVisible();
+
+  await requestPane.getByRole('button', { name: 'Send' }).click();
+  await expect.soft(responsePane.getByTestId('response-status-tag')).toContainText('200', { timeout: 10_000 });
+  await expect.soft(responseBody).toContainText('"id"');
+
+  // Flip the request to an Event Stream by adding its Accept header.
+  await requestPane.getByRole('tab', { name: 'Headers' }).click();
+  const listbox = requestPane.getByRole('listbox', { name: 'Key-value pairs', exact: true });
+  await listbox.getByRole('option').last().getByTestId('OneLineEditor').first().locator('.CodeMirror').click();
+  await page.keyboard.type('Accept');
+  // The tab badge counts persisted headers plus the read-only rows (3), so 4 means the commit landed.
+  await expect.soft(requestPane.getByRole('tab', { name: 'Headers 4' })).toBeVisible();
+  const acceptRow = listbox.getByRole('option').filter({ hasText: 'Accept' }).first();
+  await acceptRow.getByTestId('OneLineEditor').nth(1).locator('.CodeMirror').click();
+  await page.keyboard.type('text/event-stream');
+  await expect.soft(requestPane.getByRole('button', { name: 'Connect' })).toBeVisible({ timeout: 5000 });
+
+  // The request is an Event Stream now: its response is rendered by the stream pane, and the stored
+  // HTTP body is not turned into events (only event shaped lines are). This used to throw in the
+  // events table and blank the whole pane.
+  await expect.soft(responsePane.getByRole('tab', { name: 'Events' })).toBeVisible();
+  await expect.soft(responsePane.getByTestId('response-status-tag')).toContainText('200');
+});
+
+test('Event Stream: connecting shows the received events in the events view', async ({ page, insomnia }) => {
+  test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
+
+  const requestPane = page.getByTestId('request-pane');
+
+  await page.getByRole('button', { name: 'Create request collection', exact: true }).click();
+  await insomnia.navigationSidebar.openWorkspaceActionsDropdown('My first collection');
+  await page.getByRole('menuitemradio', { name: 'From Curl' }).click();
+  await page
+    .getByRole('dialog')
+    .locator('.CodeMirror textarea')
+    .fill(`curl --url http://127.0.0.1:4010/sse -H 'Accept: text/event-stream'`);
+  await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
+  await expect.soft(requestPane.getByTestId('OneLineEditor').getByText('http://127.0.0.1:4010/sse')).toBeVisible();
+
+  await requestPane.getByRole('button', { name: 'Connect' }).click();
+
+  const responsePane = page.getByTestId('response-pane').first();
+  await expect.soft(responsePane.getByTestId('response-status-tag')).toContainText('200', { timeout: 10_000 });
+  // The events view is what renders a stream response - the raw body would only show the NDJSON log.
+  await expect.soft(responsePane.getByRole('tab', { name: 'Events' })).toBeVisible();
+  await expect.soft(responsePane.getByRole('columnheader', { name: 'Data' })).toBeVisible();
+  await expect.soft(responsePane.getByText('hello-from-sse-1')).toBeVisible();
+  await expect.soft(responsePane.getByText('hello-from-sse-2')).toBeVisible();
+});
diff --git a/packages/insomnia-smoke-test/tests/smoke/export-openapi-spec.test.ts b/packages/insomnia-smoke-test/tests/smoke/export-openapi-spec.test.ts
new file mode 100644
index 0000000000..d7ca1f3d93
--- /dev/null
+++ b/packages/insomnia-smoke-test/tests/smoke/export-openapi-spec.test.ts
@@ -0,0 +1,120 @@
+import path from 'node:path';
+
+import { expect, type Page } from '@playwright/test';
+
+import { test } from '../../playwright/test';
+import {
+  cleanupExportDir,
+  createTempExportDir,
+  mockSaveDialogForFile,
+  readExportedFile,
+  waitForExportFiles,
+} from '../../playwright/utils';
+
+test.describe('Export OpenAPI Spec', () => {
+  test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
+
+  // Creates an API collection and fills its spec with the Pet Store example
+  const createApiCollectionWithPetStoreSpec = async (page: Page) => {
+    await page.getByRole('button', { name: 'Create document' }).click();
+    await page.getByRole('dialog').getByRole('button', { name: 'Create' }).click();
+    await page.click('text=Use example');
+    await page.click('text=Pet Store');
+    await expect.soft(page.locator('.pane-one').getByTestId('CodeEditor')).toContainText('openapi: 3.0.4');
+  };
+
+  test('exports the spec of an API collection as YAML from the sidebar dropdown', async ({ page, app, insomnia }) => {
+    await createApiCollectionWithPetStoreSpec(page);
+
+    const tempDir = createTempExportDir();
+    try {
+      const exportPath = path.join(tempDir, 'spec-export.yaml');
+      await mockSaveDialogForFile(app, exportPath);
+
+      await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
+        actionName: 'Export OpenAPI Spec',
+        workspaceName: 'My API Collection',
+      });
+
+      // The format modal defaults to YAML
+      await insomnia.exportModal.selectExportFormat('yaml');
+
+      await waitForExportFiles(tempDir, 1);
+      const contents = readExportedFile(exportPath);
+      expect.soft(contents).toContain('openapi: 3.0.4');
+      expect.soft(contents).toContain('Pet Store');
+    } finally {
+      cleanupExportDir(tempDir);
+    }
+  });
+
+  test('exports the spec of an API collection as JSON from the sidebar dropdown', async ({ page, app, insomnia }) => {
+    await createApiCollectionWithPetStoreSpec(page);
+
+    const tempDir = createTempExportDir();
+    try {
+      const exportPath = path.join(tempDir, 'spec-export.json');
+      await mockSaveDialogForFile(app, exportPath);
+
+      await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
+        actionName: 'Export OpenAPI Spec',
+        workspaceName: 'My API Collection',
+      });
+      await insomnia.exportModal.selectExportFormat('json');
+
+      await waitForExportFiles(tempDir, 1);
+      const contents = JSON.parse(readExportedFile(exportPath));
+      expect.soft(contents).toMatchObject({ openapi: '3.0.4' });
+      expect.soft(contents.info.title).toContain('Pet');
+    } finally {
+      cleanupExportDir(tempDir);
+    }
+  });
+
+  test('offers Export OpenAPI Spec when the API collection is opened via right-click', async ({ page, insomnia }) => {
+    await createApiCollectionWithPetStoreSpec(page);
+
+    // Right-click opens the dropdown via the controlled isOpen prop, not the trigger
+    await insomnia.navigationSidebar.workspaceRow('My API Collection').click({ button: 'right' });
+    await expect.soft(page.getByRole('menuitemradio', { name: 'Export OpenAPI Spec' })).toBeVisible();
+    await page.keyboard.press('Escape');
+  });
+
+  test('prompts an error while the spec is empty, then exports once it is filled in', async ({
+    page,
+    app,
+    insomnia,
+  }) => {
+    await page.getByRole('button', { name: 'Create document' }).click();
+    await page.getByRole('dialog').getByRole('button', { name: 'Create' }).click();
+
+    // Empty spec: the item is offered, but clicking it explains there is nothing to export
+    // instead of writing an empty file.
+    await insomnia.navigationSidebar.openWorkspaceActionsDropdown('My API Collection');
+    await page.getByRole('menuitemradio', { name: 'Export OpenAPI Spec' }).click();
+    await expect.soft(page.getByText('does not contain an OpenAPI specification to export')).toBeVisible();
+    await page.getByRole('button', { name: 'Modal Close Button' }).click();
+
+    // Fill the spec in: the same entry point now exports the file
+    const tempDir = createTempExportDir();
+    try {
+      const exportPath = path.join(tempDir, 'spec-export.yaml');
+      await mockSaveDialogForFile(app, exportPath);
+
+      await page.click('text=Use example');
+      await page.click('text=Pet Store');
+      await expect.soft(page.locator('.pane-one').getByTestId('CodeEditor')).toContainText('openapi: 3.0.4');
+
+      await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
+        actionName: 'Export OpenAPI Spec',
+        workspaceName: 'My API Collection',
+      });
+      await insomnia.exportModal.selectExportFormat('yaml');
+
+      await waitForExportFiles(tempDir, 1);
+      expect.soft(readExportedFile(exportPath)).toContain('openapi: 3.0.4');
+    } finally {
+      cleanupExportDir(tempDir);
+    }
+  });
+});
diff --git a/packages/insomnia-smoke-test/tests/smoke/focus-and-keyboard.test.ts b/packages/insomnia-smoke-test/tests/smoke/focus-and-keyboard.test.ts
index 3a3ed33403..eeb6152922 100644
--- a/packages/insomnia-smoke-test/tests/smoke/focus-and-keyboard.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/focus-and-keyboard.test.ts
@@ -52,10 +52,9 @@ test.describe('Focus and keyboard navigation', () => {
   test('the KV environment editor focuses the blank row Name', async ({ page }) => {
     await page.getByRole('button', { name: 'Create request collection', exact: true }).click();
 
-    await page.getByRole('button', { name: 'Manage Environments' }).click();
-    await page.getByRole('button', { name: 'Manage collection environments' }).click();
-    await page.getByTestId('CreateEnvironmentDropdown').click();
-    await page.getByRole('menuitemradio', { name: 'Shared Environment' }).press('Enter');
+    await page.getByLabel('Select an API Collection Environment').click();
+    await page.getByRole('button', { name: 'Manage API collection environments' }).click();
+    await page.getByTestId('AddSubEnvironment').click();
 
     // New environments default to KV mode, so selecting the new (empty) environment renders the KV
     // editor whose trailing blank row's Name should be focused.
diff --git a/packages/insomnia-smoke-test/tests/smoke/git-sync.test.ts b/packages/insomnia-smoke-test/tests/smoke/git-sync.test.ts
index 10c2fca4e8..c2bc283581 100644
--- a/packages/insomnia-smoke-test/tests/smoke/git-sync.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/git-sync.test.ts
@@ -83,7 +83,7 @@ test.describe('Git Sync', () => {
     await page.getByRole('textbox', { name: 'File name' }).press('ControlOrMeta+a');
     await page.getByRole('textbox', { name: 'File name' }).fill('collection_1');
     await page.getByRole('button', { name: 'Create', exact: true }).click();
-    await page.getByText('Create a new Request Collection').waitFor({ state: 'hidden' });
+    await page.getByText('Create a new API Collection').waitFor({ state: 'hidden' });
     // Creating the collection focused the sidebar on it; back out before selecting the project.
     await insomnia.navigationSidebar.backToAllProjects();
     await insomnia.navigationSidebar.selectProject(GIT_PROJECT_NAME);
@@ -170,7 +170,7 @@ test.describe('Git Sync', () => {
     await page.getByRole('textbox', { name: 'File name' }).press('ControlOrMeta+a');
     await page.getByRole('textbox', { name: 'File name' }).fill('discard_test_collection');
     await page.getByRole('button', { name: 'Create', exact: true }).click();
-    await page.getByText('Create a new Request Collection').waitFor({ state: 'hidden' });
+    await page.getByText('Create a new API Collection').waitFor({ state: 'hidden' });
 
     await page.getByTestId('git-dropdown').click();
     await page.getByRole('menuitemradio', { name: 'Commit' }).click();
@@ -201,7 +201,7 @@ test.describe('Git Sync', () => {
     // Only Name was touched. Pre-fix, the auto-mirrored File name field also counted
     // as changed, pushing changedFieldCount to 2 and wrongly triggering this prompt.
     await page.keyboard.press('Escape');
-    await page.getByText('Create a new Request Collection').waitFor({ state: 'hidden' });
+    await page.getByText('Create a new API Collection').waitFor({ state: 'hidden' });
     await expect.soft(page.getByRole('heading', { name: 'Unsaved changes' })).toBeHidden();
 
     await insomnia.navigationSidebar.selectProjectDropdownOption({
@@ -222,7 +222,7 @@ test.describe('Git Sync', () => {
     await page.getByRole('button', { name: 'No' }).click();
     await page.keyboard.press('Escape');
     await page.getByRole('button', { name: 'Yes' }).click();
-    await page.getByText('Create a new Request Collection').waitFor({ state: 'hidden' });
+    await page.getByText('Create a new API Collection').waitFor({ state: 'hidden' });
   });
 });
 
diff --git a/packages/insomnia-smoke-test/tests/smoke/global-environments.test.ts b/packages/insomnia-smoke-test/tests/smoke/global-environments.test.ts
index e66d8e0ee1..71f3b50169 100644
--- a/packages/insomnia-smoke-test/tests/smoke/global-environments.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/global-environments.test.ts
@@ -29,8 +29,7 @@ test.describe('Global Environments', () => {
     await page.getByRole('button', { name: 'Send' }).click();
     await page.getByRole('heading', { name: '2 environment variables are' }).click();
     await page.getByRole('button', { name: 'Cancel' }).click();
-    await page.getByLabel('Manage Environments').click();
-    await page.getByPlaceholder('Choose a project environment').click();
+    await page.getByLabel('Select a Project Environment').click();
     await page.getByRole('option', { name: 'global-environment' }).click();
     await page.getByText('New Environment').click();
     await page.locator('body').click();
@@ -49,8 +48,7 @@ test.describe('Global Environments', () => {
     await page.getByLabel('Create in project').click();
     await page.getByLabel('Create', { exact: true }).getByText('Environment').click();
     await page.getByRole('button', { name: 'Create', exact: true }).click();
-    await page.getByTestId('CreateEnvironmentDropdown').click();
-    await page.getByText('Private environment').click();
+    await page.getByTestId('AddPrivateSubEnvironment').click();
     await page.getByLabel('New Environment').click();
     await page.getByLabel('New Environment').getByLabel('Project Actions').click();
     await page.getByText('Duplicate').click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/import-deep-link.test.ts b/packages/insomnia-smoke-test/tests/smoke/import-deep-link.test.ts
new file mode 100644
index 0000000000..cd5812cf73
--- /dev/null
+++ b/packages/insomnia-smoke-test/tests/smoke/import-deep-link.test.ts
@@ -0,0 +1,65 @@
+import type { ElectronApplication } from '@playwright/test';
+import { expect } from '@playwright/test';
+
+import { test } from '../../playwright/test';
+
+// OS-level deep links can't be tested in CI: protocol registration is
+// machine-global and macOS delivery needs a packaged, protocol-registered
+// build. Instead, tests send the `shell:open` IPC directly to the app's
+// windows — the same channel the main process uses for real deep links —
+// exercising the renderer deep-link handler in root.tsx → ImportModal with
+// zero production-code changes. The main-process protocol hop is covered by
+// manual testing.
+const sendDeepLink = (app: ElectronApplication, url: string) =>
+  app.evaluate(({ BrowserWindow }, deepLinkUrl) => {
+    // Send outside evaluate()'s synchronous context. Only the main window has
+    // a `shell:open` listener; sending to the others is a harmless no-op.
+    setImmediate(() => {
+      BrowserWindow.getAllWindows().forEach(window => {
+        window.webContents.send('shell:open', deepLinkUrl);
+      });
+    });
+  }, url);
+
+test.describe('import deep links', () => {
+  test.beforeEach(async ({ insomnia }) => {
+    // `webContents.send` drops the event if the renderer's `shell:open`
+    // listener (registered in Root) isn't up yet, so wait for the app shell.
+    await insomnia.page.getByRole('banner').waitFor();
+  });
+
+  test('bare clipboard param opens the Import modal on the Clipboard tab', async ({ app, insomnia }) => {
+    await sendDeepLink(app, 'insomnia://app/import?clipboard');
+
+    await expect.soft(insomnia.page.getByLabel('Import from')).toBeVisible();
+    // The app uses the non-standard `data-test-id` attribute (see playwright/pages).
+    await expect.soft(insomnia.page.locator('[data-test-id="import-from-clipboard"]')).toBeVisible();
+    await expect.soft(insomnia.page.locator('input[name="source"][value="clipboard"]')).toBeChecked();
+  });
+
+  test('bare curl param selects the cURL tab with an empty input and no error', async ({ app, insomnia }) => {
+    // Param names are case-insensitive.
+    await sendDeepLink(app, 'insomnia://app/import?CuRl');
+
+    await expect.soft(insomnia.page.getByLabel('Import from')).toBeVisible();
+    const curlInput = insomnia.page.locator('textarea[name="curl"]');
+    await expect.soft(curlInput).toBeVisible();
+    await expect.soft(curlInput).toHaveValue('');
+    // Empty pre-populated value must not surface the invalid-curl error.
+    await expect.soft(insomnia.page.getByText('Invalid cURL request')).toHaveCount(0);
+  });
+
+  test('value-bearing curl param auto-scans and shows the detected request', async ({ app, insomnia }) => {
+    const curlCommand = 'curl --request GET --url http://insomnia.rest/';
+    await sendDeepLink(app, `insomnia://app/import?curl=${encodeURIComponent(curlCommand)}`);
+
+    await expect.soft(insomnia.page.getByRole('dialog')).toBeVisible();
+    // A value-bearing param auto-scans: the modal skips the source picker and
+    // shows the detected resources ready to import. The scan completes within
+    // milliseconds of the modal opening, so assert on the stable post-scan
+    // state — the pre-scan form (whose textarea value contains the URL) is
+    // replaced as soon as the scan result lands.
+    await expect.soft(insomnia.page.getByText('cURL resources to be imported:')).toBeVisible();
+    await expect.soft(insomnia.page.getByText('1 Request')).toBeVisible();
+  });
+});
diff --git a/packages/insomnia-smoke-test/tests/smoke/insomnia-vault.test.ts b/packages/insomnia-smoke-test/tests/smoke/insomnia-vault.test.ts
index 5eb96073e5..732517d8b3 100644
--- a/packages/insomnia-smoke-test/tests/smoke/insomnia-vault.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/insomnia-vault.test.ts
@@ -96,8 +96,7 @@ test.describe('Check vault used in environment', () => {
     await page.getByLabel('Create', { exact: true }).getByText('Environment').click();
     await page.getByPlaceholder('Enter a name for your Environment').fill('New Global Vault Environment');
     await page.getByRole('button', { name: 'Create', exact: true }).click();
-    await page.getByTestId('CreateEnvironmentDropdown').click();
-    await page.getByText('Private environment').click();
+    await page.getByTestId('AddPrivateSubEnvironment').click();
     // activate created private environment
     await page.getByRole('grid', { name: 'Environments' }).getByText('New Environment').click();
 
@@ -153,10 +152,10 @@ test.describe('Check vault used in environment', () => {
     await page.getByRole('button', { name: 'Scan' }).click();
     await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
     // activate existing global private vault environment from import
-    await page.getByLabel('Manage Environments').click();
-    await page.getByPlaceholder('Choose a project environment').click();
-    await page.getByRole('option', { name: 'New Global Vault Environment' }).click();
+    await page.getByLabel('Select a Project Environment').click();
     await page.getByRole('option', { name: 'New Environment' }).click();
+    await page.keyboard.press('Escape');
+    await page.getByLabel('Select an API Collection Environment').click();
     await page.getByText('Base Environment1').click();
     await page.locator('body').click();
 
@@ -176,12 +175,12 @@ test.describe('Check vault used in environment', () => {
     await page.locator('.app').press('Escape');
 
     // activate global private vault environment from import
-    await page.getByLabel('Manage Environments').click();
-    await page.getByPlaceholder('Choose a project environment').click();
-    await page.getByRole('option', { name: 'Global env workspace with secret vault' }).click();
+    await page.getByLabel('Select a Project Environment').click();
     await page.getByText('global vault env with secret').click();
+    await page.keyboard.press('Escape');
 
     // activate legacy array vault environment
+    await page.getByLabel('Select an API Collection Environment').click();
     await page.getByText('legacy vault value array').click();
     await page.locator('body').click();
     // activate request
@@ -201,7 +200,7 @@ test.describe('Check vault used in environment', () => {
     await page.getByText('vault_array_b').click();
 
     // activate legacy object vault environment
-    await page.getByLabel('Manage Environments').click();
+    await page.getByLabel('Select an API Collection Environment').click();
     await page.getByText('legacy vault value object').click();
     await page.locator('body').click();
     // activate request
@@ -219,7 +218,7 @@ test.describe('Check vault used in environment', () => {
     await page.getByText('world').click();
 
     // activate invalid vault environment
-    await page.getByLabel('Manage Environments').click();
+    await page.getByLabel('Select an API Collection Environment').click();
     await page.getByText('base with vault').click();
     await page.locator('body').click();
     // activate request
diff --git a/packages/insomnia-smoke-test/tests/smoke/key-value-editor-blank-row.test.ts b/packages/insomnia-smoke-test/tests/smoke/key-value-editor-blank-row.test.ts
index 159199f53a..af16b75842 100644
--- a/packages/insomnia-smoke-test/tests/smoke/key-value-editor-blank-row.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/key-value-editor-blank-row.test.ts
@@ -9,7 +9,9 @@ import { test } from '../../playwright/test';
 // empty). Typing commits it as a real pair and a fresh blank row takes its place.
 
 test.describe('Key-value editor blank row', () => {
-  test('request headers: blank row is always shown, is not persisted while empty, and commits on typing', async ({ page }) => {
+  test('request headers: blank row is always shown, is not persisted while empty, and commits on typing', async ({
+    page,
+  }) => {
     await page.getByRole('button', { name: 'Create request collection', exact: true }).click();
     await page.getByRole('tab', { name: 'Headers' }).click();
 
@@ -66,8 +68,8 @@ test.describe('Key-value editor blank row', () => {
     await page.getByRole('dialog').waitFor({ state: 'hidden' });
 
     // Open the table editor for the ExampleA sub-environment.
-    await page.getByRole('button', { name: 'Manage Environments' }).click();
-    await page.getByRole('button', { name: 'Manage collection environments' }).click();
+    await page.getByLabel('Select an API Collection Environment').click();
+    await page.getByRole('button', { name: 'Manage API collection environments' }).click();
     await page.getByLabel('Environments', { exact: true }).getByText('ExampleA').click();
     await page.getByRole('button', { name: 'Table Edit' }).click();
 
@@ -86,7 +88,10 @@ test.describe('Key-value editor blank row', () => {
     await expect.soft(kvTable).toContainText('blankRowKey');
   });
 
-  test('environment table editor: deleting a committed row does not leave stale text on the blank row', async ({ page, app }) => {
+  test('environment table editor: deleting a committed row does not leave stale text on the blank row', async ({
+    page,
+    app,
+  }) => {
     const text = await loadFixture('environments.yaml');
     await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
     await page.getByLabel('Import').click();
@@ -95,8 +100,8 @@ test.describe('Key-value editor blank row', () => {
     await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
     await page.getByRole('dialog').waitFor({ state: 'hidden' });
 
-    await page.getByRole('button', { name: 'Manage Environments' }).click();
-    await page.getByRole('button', { name: 'Manage collection environments' }).click();
+    await page.getByLabel('Select an API Collection Environment').click();
+    await page.getByRole('button', { name: 'Manage API collection environments' }).click();
     await page.getByLabel('Environments', { exact: true }).getByText('ExampleA').click();
     await page.getByRole('button', { name: 'Table Edit' }).click();
 
diff --git a/packages/insomnia-smoke-test/tests/smoke/key-value-editor-space-typing.test.ts b/packages/insomnia-smoke-test/tests/smoke/key-value-editor-space-typing.test.ts
new file mode 100644
index 0000000000..1c5d7d41f9
--- /dev/null
+++ b/packages/insomnia-smoke-test/tests/smoke/key-value-editor-space-typing.test.ts
@@ -0,0 +1,88 @@
+import { expect } from '@playwright/test';
+
+import { test } from '../../playwright/test';
+
+// Regression tests for the table views swallowing the space key: the react-aria
+// ListBox typeahead intercepts a space keydown (capture phase, preventDefault +
+// stopPropagation) whenever its search buffer is non-empty, i.e. within 1s of the
+// previous printable key. A name like "My key" could only be typed as "Mykey" plus
+// manual arrow-key insertion. `disallowTypeAhead` on the ListBoxes lets every
+// keystroke reach the cell's OneLineEditor (CodeMirror).
+// Human-like typing delay (~120ms) keeps the typeahead buffer warm between keys, so
+// a swallowed space reproduces deterministically; delay:0 bursts do not.
+// Exact-text assertions read `.CodeMirror-code`: the textContent of `.CodeMirror`
+// includes CodeMirror's internal measure node, which always contains "xxxxxxxxxx".
+const humanTypingDelay = 120;
+
+test.describe('Key-value editor space typing', () => {
+  test('environment table: spaces can be typed directly into names and values', async ({ page, insomnia }) => {
+    await insomnia.projectPage.importFixture('environments.yaml');
+
+    await page.getByLabel('Select an API Collection Environment').click();
+    await page.getByRole('button', { name: 'Manage API collection environments' }).click();
+    await page.getByLabel('Environments', { exact: true }).getByText('ExampleA').click();
+    await page.getByRole('button', { name: 'Table Edit' }).click();
+
+    const kvTable = page.getByRole('listbox', { name: 'Environment Key Value Pair' });
+    await expect.soft(kvTable).toContainText('exampleString');
+    const optionsBefore = await kvTable.getByRole('option').count();
+
+    // Type a name containing a space without pausing; the space must land in the editor.
+    // Both call sites share this locator, kept in lockstep on purpose.
+    const blankRowEditor = () => kvTable.getByRole('option').last().getByTestId('OneLineEditor').first().locator('.CodeMirror');
+    await blankRowEditor().click();
+    await page.keyboard.type('My key', { delay: humanTypingDelay });
+    await expect.soft(kvTable.getByRole('option')).toHaveCount(optionsBefore + 1);
+    await expect.soft(kvTable).toContainText('My key');
+
+    // Multiple consecutive spaces must all be inserted. The exact-text poll bypasses
+    // toHaveText/toContainText's whitespace normalization, which would hide a
+    // partially swallowed space. Pin the row by index: after the commit a fresh blank
+    // row takes over .last().
+    await blankRowEditor().click();
+    await page.keyboard.type('val1  val2', { delay: humanTypingDelay });
+    await expect.soft(kvTable.getByRole('option')).toHaveCount(optionsBefore + 2);
+    const committedRow = kvTable.getByRole('option').nth(optionsBefore);
+    await expect.poll(() => committedRow.locator('.CodeMirror-code').first().evaluate(el => el.textContent ?? '')).toBe('val1  val2');
+  });
+
+  test('request headers: spaces can be typed directly into names and values', async ({ page }) => {
+    await page.getByRole('button', { name: 'Create request collection', exact: true }).click();
+    await page.getByRole('tab', { name: 'Headers' }).click();
+
+    const listbox = page.getByRole('listbox', { name: 'Key-value pairs', exact: true });
+
+    // Create a real row via Add instead of typing into the trailing blank row: the
+    // blank-row commit round-trip drops DOM focus mid-word (separate, pre-existing
+    // concern). An added row is stable, so slow typing here guards the space fix.
+    await page.getByRole('button', { name: 'Add', exact: true }).click();
+    await expect.soft(listbox.getByRole('option')).toHaveCount(2);
+
+    await listbox.getByRole('option').first().getByTestId('OneLineEditor').first().locator('.CodeMirror').click();
+    await page.keyboard.type('My Header', { delay: humanTypingDelay });
+    await expect.soft(listbox).toContainText('My Header');
+
+    // Spaces in the value editor must survive too, including consecutive ones.
+    const headerValueEditor = listbox.getByRole('option').first().getByTestId('OneLineEditor').nth(1).locator('.CodeMirror-code');
+    await headerValueEditor.click();
+    await page.keyboard.type('val1  val2', { delay: humanTypingDelay });
+    await expect.poll(() => headerValueEditor.evaluate(el => el.textContent ?? '')).toBe('val1  val2');
+  });
+
+  test('query params: spaces can be typed directly into names', async ({ page }) => {
+    await page.getByRole('button', { name: 'Create request collection', exact: true }).click();
+    await page.getByRole('tab', { name: 'Params' }).click();
+
+    const listbox = page.getByRole('listbox', { name: 'Key-value pairs', exact: true });
+
+    // Same bypass as the headers test above: add a stable row instead of typing into
+    // the trailing blank row, whose commit round-trip drops DOM focus mid-word.
+    await page.getByRole('button', { name: 'Add', exact: true }).click();
+    await expect.soft(listbox.getByRole('option')).toHaveCount(2);
+
+    // The Add flow autofocuses the new row's name editor (pendingFocusLastRowId),
+    // so type directly; clicking the editor races the resizable-panel layout here.
+    await page.keyboard.type('My Param', { delay: humanTypingDelay });
+    await expect.soft(listbox).toContainText('My Param');
+  });
+});
diff --git a/packages/insomnia-smoke-test/tests/smoke/konnect.test.ts b/packages/insomnia-smoke-test/tests/smoke/konnect.test.ts
index ae8a185790..d074795b61 100644
--- a/packages/insomnia-smoke-test/tests/smoke/konnect.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/konnect.test.ts
@@ -2,9 +2,10 @@ import { expect } from '@playwright/test';
 
 import { test } from '../../playwright/test';
 
-test.describe('Konnect sidebar tab', () => {
-  test('shows intro card without a PAT, configure it, then sync', async ({ page, insomnia }) => {
-    await page.getByTestId('sidebar-tab-konnect').click();
+test.describe('Control Planes organization', () => {
+  test('shows intro card without a PAT, configure it, then sync', async ({ page }) => {
+    await page.getByRole('button', { name: 'Organizations' }).click();
+    await page.getByRole('option', { name: 'Control Planes' }).click();
     await expect.soft(page.getByText('Auto-sync your gateway service routes')).toBeVisible();
 
     await page.getByRole('button', { name: 'Configure' }).click();
@@ -12,28 +13,28 @@ test.describe('Konnect sidebar tab', () => {
     await page.getByRole('button', { name: 'Connect & Sync' }).click();
     await expect.soft(page.getByRole('heading', { name: 'Kong Konnect settings' })).toBeHidden();
 
+    // The Sync button and settings gear are both available even with zero projects synced yet.
     await expect.soft(page.getByRole('button', { name: 'Sync Konnect' })).toBeVisible();
-
-    await page.getByTestId('sidebar-tab-projects').click();
-    await expect.soft(page.getByRole('button', { name: 'Create new Project' })).toBeVisible();
+    await expect.soft(page.getByRole('button', { name: 'Konnect settings' })).toBeVisible();
+    // The Konnect organization never offers manual project creation.
+    await expect.soft(page.getByRole('button', { name: 'Create new Project' })).toBeHidden();
   });
 
-  test.describe('with konnectSync feature flag disabled', () => {
+  test.describe('without the Konnect control planes entitlement', () => {
     test.beforeEach(async ({ request }) => {
-      await request.post('http://127.0.0.1:4010/v1/test-utils/organizations/features', {
-        data: { features: { gitSync: { enabled: true }, konnectSync: { enabled: false } } },
+      await request.post('http://127.0.0.1:4010/v1/test-utils/user/entitlements', {
+        data: { entitlements: [] },
       });
     });
 
     test.afterEach(async ({ request }) => {
-      await request.post('http://127.0.0.1:4010/v1/test-utils/organizations/features', {
-        data: { features: { gitSync: { enabled: true }, konnectSync: { enabled: true } } },
-      });
+      await request.post('http://127.0.0.1:4010/v1/test-utils/user/entitlements', { data: {} });
     });
 
-    test('hides the Konnect tab', async ({ page }) => {
+    test('hides the Control Planes organization', async ({ page }) => {
       await page.reload({ waitUntil: 'networkidle' });
-      await expect.soft(page.getByTestId('sidebar-tab-konnect')).toBeHidden();
+      await page.getByRole('button', { name: 'Organizations' }).click();
+      await expect.soft(page.getByRole('option', { name: 'Control Planes' })).toBeHidden();
     });
   });
 });
diff --git a/packages/insomnia-smoke-test/tests/smoke/mtls.test.ts b/packages/insomnia-smoke-test/tests/smoke/mtls.test.ts
index 6d48cfefa9..e7bca7e930 100644
--- a/packages/insomnia-smoke-test/tests/smoke/mtls.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/mtls.test.ts
@@ -18,12 +18,10 @@ test('can use client certificate for mTLS', async ({ app, page, insomnia }) => {
   const certsDialog = page.getByRole('dialog');
 
   await page.getByTestId('settings-button').click();
-  await page.getByTestId('dataFolders').fill(getFixturePath(path.join('certificates', 'client')));
+  const certificatesFixturePath = getFixturePath('certificates');
+  await page.getByTestId('dataFolders').fill(certificatesFixturePath);
   await page.getByTestId('dataFolders-btn').click();
-  await expect.soft(page.getByText('client')).toBeVisible({ timeout: UI_TIMEOUT });
-  await page.getByTestId('dataFolders').fill(getFixturePath(path.join('certificates', 'rootCA.pem')));
-  await page.getByTestId('dataFolders-btn').click();
-  await expect.soft(page.getByText('rootCA.pem')).toBeVisible({ timeout: UI_TIMEOUT });
+  await expect.soft(page.getByText(certificatesFixturePath, { exact: true })).toBeVisible({ timeout: UI_TIMEOUT });
   await page.locator('.app').press('Escape');
   // wait for settings dialog to fully close before continuing
   await page.getByTestId('settings-button').waitFor({ state: 'visible', timeout: UI_TIMEOUT });
diff --git a/packages/insomnia-smoke-test/tests/smoke/pre-request-script-features.test.ts b/packages/insomnia-smoke-test/tests/smoke/pre-request-script-features.test.ts
index 169a96ab39..b9d880df0b 100644
--- a/packages/insomnia-smoke-test/tests/smoke/pre-request-script-features.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/pre-request-script-features.test.ts
@@ -402,18 +402,21 @@ test.describe('pre-request features tests', () => {
     await expect.soft(responsePane).toContainText('Trying 127.0.0.1:8888'); // updated proxy
   });
 
-  test('update clientCertificate if request url contains tag', async ({ page, insomnia }) => {
+  test('update clientCertificate if request url contains tag', async ({ app, page, insomnia }) => {
     const responsePane = page.getByTestId('response-pane');
     const fixturePath = getFixturePath('certificates');
+    // the pre-request script references its cert/key by a path relative to the app's cwd,
+    // so allow-list that directory rather than the file's own (non-existent) name
+    const appCwd = await app.evaluate(() => process.cwd());
 
     await page.getByTestId('settings-button').click();
     await page.getByTestId('dataFolders').fill(getFixturePath('fake.pfx'));
     await page.getByTestId('dataFolders-btn').click();
     await expect.soft(page.getByText('fake.pfx')).toBeVisible();
 
-    await page.getByTestId('dataFolders').fill('invalid');
+    await page.getByTestId('dataFolders').fill(appCwd);
     await page.getByTestId('dataFolders-btn').click();
-    await expect.soft(page.getByText('invalid')).toBeVisible();
+    await expect.soft(page.getByText(appCwd)).toBeVisible();
 
     await page.locator('.app').press('Escape');
 
@@ -439,14 +442,17 @@ test.describe('pre-request features tests', () => {
     await expect.soft(responsePane).toContainText('Adding SSL KEY certificate');
   });
 
-  test('insomnia.request / update clientCertificate', async ({ page, insomnia }) => {
+  test('insomnia.request / update clientCertificate', async ({ app, page, insomnia }) => {
     const responsePane = page.getByTestId('response-pane');
     await insomnia.navigationSidebar.clickRequestOrFolder('test certificate manipulation');
 
+    // the pre-request script references its cert/key by a path relative to the app's cwd,
+    // so allow-list that directory rather than the file's own (non-existent) name
+    const appCwd = await app.evaluate(() => process.cwd());
     await page.getByTestId('settings-button').click();
-    await page.getByTestId('dataFolders').fill('invalid');
+    await page.getByTestId('dataFolders').fill(appCwd);
     await page.getByTestId('dataFolders-btn').click();
-    await expect.soft(page.getByText('invalid')).toBeVisible();
+    await expect.soft(page.getByText(appCwd)).toBeVisible();
     await page.locator('.app').press('Escape');
 
     // send
@@ -486,8 +492,9 @@ test.describe('pre-request features tests', () => {
     await expect.soft(statusTag).toContainText('200 OK');
 
     // verify persisted environment
-    await page.getByRole('button', { name: 'Manage Environments' }).click();
-    await page.getByRole('button', { name: 'Manage collection environments' }).click();
+    await page.getByLabel('Select an API Collection Environment').click();
+    await page.getByRole('button', { name: 'Manage API collection environments' }).click();
+
     const responseBody = page.getByRole('dialog').getByTestId('CodeEditor').locator('.CodeMirror-line');
     const rows = await responseBody.allInnerTexts();
     const bodyJson = JSON.parse(rows.join(' '));
@@ -528,10 +535,8 @@ test.describe('pre-request features tests', () => {
     });
 
     // activate global environment
-    await page.getByLabel('Manage Environments').click();
-    await page.getByPlaceholder('Choose a project environment').click();
-    await page.getByRole('option', { name: 'Script Environment' }).click();
-    await page.getByRole('option', { name: 'Base Script Env' }).click();
+    await page.getByLabel('Select a Project Environment').click();
+    await page.getByRole('option', { name: 'Script Environment', exact: true }).click();
     await page.locator('body').click();
     // send
     await page.getByTestId('request-pane').getByRole('button', { name: 'Send' }).click();
@@ -540,8 +545,9 @@ test.describe('pre-request features tests', () => {
     await page.getByText('log: globals base').click();
     await page.getByText('log: baseGlobals base').click();
     // view base environment has been updated
-    await page.getByLabel('Manage Environments').click();
-    await page.getByLabel('Manage project environment').click();
+    await page.getByLabel('Select a Project Environment').click();
+    await page.getByRole('option', { name: 'Script Environment', exact: true }).hover();
+    await page.getByLabel('Edit Script Environment').click();
     await page.getByLabel('Environment name').getByText('Base Script Env').click();
     const globalBaseEditor = page.getByTestId('CodeEditor').locator('.CodeMirror-line');
     const globalBaseRows = await globalBaseEditor.allInnerTexts();
@@ -556,7 +562,7 @@ test.describe('pre-request features tests', () => {
     // switch back to request collection tab
     await page.getByLabel('Insomnia Tabs').getByLabel('persist global environment').first().click();
     // activate global sub environment
-    await page.getByLabel('Manage Environments').click();
+    await page.getByLabel('Select a Project Environment').click();
     await page.getByRole('option', { name: 'Sub Script Env' }).click();
     await page.locator('body').click();
     // send
@@ -566,8 +572,9 @@ test.describe('pre-request features tests', () => {
     await page.getByText('log: globals sub').click();
     await page.getByText('log: baseGlobals base').click();
     // view sub environment has been updated
-    await page.getByLabel('Manage Environments').click();
-    await page.getByLabel('Manage project environment').click();
+    await page.getByLabel('Select a Project Environment').click();
+    await page.getByRole('option', { name: 'Script Environment', exact: true }).hover();
+    await page.getByLabel('Edit Script Environment').click();
     await page.getByLabel('Environment name').getByText('Sub Script Env').first().click();
     const globalSubEditor = page.getByTestId('CodeEditor').locator('.CodeMirror-line');
     const globalSubRows = await globalSubEditor.allInnerTexts();
@@ -583,8 +590,8 @@ test.describe('pre-request features tests', () => {
     const statusTag = page.locator('[data-testid="response-status-tag"]:visible');
     await insomnia.navigationSidebar.clickRequestOrFolder('update kv pair environment');
     // switch to table view environment
-    await page.getByLabel('Manage Environments').click();
-    const manageBtn = page.getByRole('button', { name: 'Manage collection environments' });
+    await page.getByLabel('Select an API Collection Environment').click();
+    const manageBtn = page.getByRole('button', { name: 'Manage API collection environments' });
     await expect.soft(manageBtn).toBeEnabled();
     await manageBtn.click();
     const tableEditBtn = page.getByLabel('Table Edit');
@@ -604,10 +611,10 @@ test.describe('pre-request features tests', () => {
     await expect.soft(statusTag).toContainText('200 OK');
 
     // verify table environments have been updated
-    const verifyManageBtn = page.getByRole('button', { name: 'Manage Environments' });
+    const verifyManageBtn = page.getByLabel('Select an API Collection Environment');
     await expect.soft(verifyManageBtn).toBeEnabled();
     await verifyManageBtn.click();
-    const verifyCollectionBtn = page.getByRole('button', { name: 'Manage collection environments' });
+    const verifyCollectionBtn = page.getByRole('button', { name: 'Manage API collection environments' });
     await expect.soft(verifyCollectionBtn).toBeEnabled();
     await verifyCollectionBtn.click();
     await page.getByText('__environment_type').click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/pre-request-script-window.test.ts b/packages/insomnia-smoke-test/tests/smoke/pre-request-script-window.test.ts
index b2a5e05ffa..d9814674d9 100644
--- a/packages/insomnia-smoke-test/tests/smoke/pre-request-script-window.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/pre-request-script-window.test.ts
@@ -26,7 +26,7 @@ test.describe('test hidden window handling', () => {
     await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
 
     await insomnia.navigationSidebar.openWorkspaceActionsDropdown('Pre-request Scripts');
-    await page.getByRole('menuitemradio', { name: 'Export' }).click();
+    await page.getByRole('menuitemradio', { name: 'Export', exact: true }).click();
     await page.getByRole('button', { name: 'Export' }).click();
     await page.getByText('Which format would you like to export as?').click();
     await page.locator('.app').press('Escape');
diff --git a/packages/insomnia-smoke-test/tests/smoke/quickjs-script-sandbox.test.ts b/packages/insomnia-smoke-test/tests/smoke/quickjs-script-sandbox.test.ts
index 1c5b750adb..db0b1de303 100644
--- a/packages/insomnia-smoke-test/tests/smoke/quickjs-script-sandbox.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/quickjs-script-sandbox.test.ts
@@ -19,7 +19,8 @@ import { test } from '../../playwright/test';
 // script that calls an API this minimal engine doesn't bridge, turning an otherwise-successful send
 // into a displayed "Error" status. Asserting via the Console tab (console.log output) instead of an
 // echoed response body sidesteps template-rendering entirely.
-test.describe('QuickJS script sandbox', () => {
+// TODO(INS-3890): re-enable once the QuickJS sandbox setting is un-hidden in scripting-settings.tsx.
+test.describe.skip('QuickJS script sandbox', () => {
   test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
 
   test.beforeEach(async ({ app, page }) => {
diff --git a/packages/insomnia-smoke-test/tests/smoke/quickjs-sendrequest-bridge.test.ts b/packages/insomnia-smoke-test/tests/smoke/quickjs-sendrequest-bridge.test.ts
index 08856f7f79..cffe380d5e 100644
--- a/packages/insomnia-smoke-test/tests/smoke/quickjs-sendrequest-bridge.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/quickjs-sendrequest-bridge.test.ts
@@ -12,7 +12,8 @@ import { test } from '../../playwright/test';
 // `packages/insomnia/src/scripting/quickjs-script-engine.test.ts`'s "sendRequest bridge teardown"
 // block, which reproduces the `gc_obj_list` abort in vitest by settling the mocked fetch on a later
 // macrotask.
-test.describe('QuickJS sendRequest bridge', () => {
+// TODO(INS-3890): re-enable once the QuickJS sandbox setting is un-hidden in scripting-settings.tsx.
+test.describe.skip('QuickJS sendRequest bridge', () => {
   test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
 
   test.beforeEach(async ({ app, page }) => {
diff --git a/packages/insomnia-smoke-test/tests/smoke/runner.test.ts b/packages/insomnia-smoke-test/tests/smoke/runner.test.ts
index a3b1028714..be2bc63061 100644
--- a/packages/insomnia-smoke-test/tests/smoke/runner.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/runner.test.ts
@@ -61,7 +61,7 @@ test.describe('runner features tests', () => {
 
   test('run collection runner', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
 
@@ -104,7 +104,7 @@ test.describe('runner features tests', () => {
 
   test('shows live progress and cancels an in-progress run', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
 
@@ -126,7 +126,7 @@ test.describe('runner features tests', () => {
 
   test('skips the in-flight request and continues to the next', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
 
@@ -145,7 +145,7 @@ test.describe('runner features tests', () => {
 
   test('run collection runner with data upload', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
     // upload data
@@ -186,7 +186,7 @@ test.describe('runner features tests', () => {
 
   test('run req4 3 times with setNextRequest the pre-request script', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
     await selectRunnerRequests(page, 'req4');
@@ -204,7 +204,7 @@ test.describe('runner features tests', () => {
 
   test('await test works', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
     await selectRunnerRequests(page, 'await-test');
@@ -222,7 +222,7 @@ test.describe('runner features tests', () => {
 
   test('run req5 3 times with setNextRequest in the after-response script', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
     await selectRunnerRequests(page, 'req5');
@@ -240,7 +240,7 @@ test.describe('runner features tests', () => {
 
   test('skip req01 with setNextRequest', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
     await selectRunnerRequests(page, 'req0', 'req01', 'req02');
@@ -263,7 +263,7 @@ test.describe('runner features tests', () => {
 
   test('can read variables during whole execution', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
 
@@ -282,7 +282,7 @@ test.describe('runner features tests', () => {
 
   test('can detect sync and async test failure', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
 
@@ -301,7 +301,7 @@ test.describe('runner features tests', () => {
 
   test('delay input can be cleared to enter a new value', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
 
@@ -321,7 +321,7 @@ test.describe('runner features tests', () => {
 
   test('running with cleared delay input uses last valid value', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
 
@@ -342,7 +342,7 @@ test.describe('runner features tests', () => {
 
   test('iterations input can be cleared to enter a new value', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
 
@@ -362,7 +362,7 @@ test.describe('runner features tests', () => {
 
   test('running with cleared iterations input uses last valid value', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
 
@@ -387,7 +387,7 @@ test.describe('runner features tests', () => {
 
   test('can turn off logs via settings', async ({ page, insomnia }) => {
     await insomnia.navigationSidebar.selectWorkspaceDropdownOption({
-      actionName: 'Run Collection',
+      actionName: 'Run API Collection',
       workspaceName: 'Runner',
     });
 
diff --git a/packages/insomnia-smoke-test/tests/smoke/spec-toolbar.test.ts b/packages/insomnia-smoke-test/tests/smoke/spec-toolbar.test.ts
index 22354b0654..5e034797ce 100644
--- a/packages/insomnia-smoke-test/tests/smoke/spec-toolbar.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/spec-toolbar.test.ts
@@ -20,7 +20,7 @@ test.describe('Spec editor toolbar', () => {
 
     // The Generate dropdown exposes the Collection option
     await page.getByRole('button', { name: 'Generate' }).click();
-    await expect.soft(page.getByRole('menuitemradio', { name: 'Collection' })).toBeVisible();
+    await expect.soft(page.getByRole('menuitemradio', { name: 'Requests' })).toBeVisible();
     await page.keyboard.press('Escape');
 
     // The format dropdown converts the spec between YAML and JSON
@@ -56,11 +56,13 @@ test.describe('Spec editor toolbar', () => {
     await expect.soft(page.getByRole('button', { name: /error/ })).toBeVisible();
 
     await page.getByRole('button', { name: 'Generate' }).click();
-    const collectionItem = page.getByRole('menuitemradio', { name: 'Collection' });
+    const collectionItem = page.getByRole('menuitemradio', { name: 'Requests' });
     await expect.soft(collectionItem).toBeDisabled();
     await collectionItem.hover();
     await expect
       .soft(page.getByRole('tooltip'))
-      .toHaveText('You cannot generate a collection when spec errors exist. Fix the errors or change the ruleset first.');
+      .toHaveText(
+        'You cannot generate an API collection when spec errors exist. Fix the errors or change the ruleset first.',
+      );
   });
 });
diff --git a/packages/insomnia-smoke-test/tests/smoke/url-bar-undo.test.ts b/packages/insomnia-smoke-test/tests/smoke/url-bar-undo.test.ts
index 1f0c3021c0..e578483d97 100644
--- a/packages/insomnia-smoke-test/tests/smoke/url-bar-undo.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/url-bar-undo.test.ts
@@ -131,13 +131,13 @@ test('URL bar: switching environment refreshes the rendered preview', async ({ p
   const tag = page.locator(TAG_SEL).first();
 
   // ExampleA -> subenvA0
-  await page.getByRole('button', { name: 'Manage Environments' }).click();
+  await page.getByLabel('Select an API Collection Environment').click();
   await page.getByRole('option', { name: 'ExampleA' }).press('Enter');
   await page.getByRole('option', { name: 'ExampleA' }).press('Escape');
   await expect.soft(tag).toHaveAttribute('title', /subenvA0/);
 
   // ExampleB -> subenvB0 (preview must refresh on switch)
-  await page.getByRole('button', { name: 'Manage Environments' }).click();
+  await page.getByLabel('Select an API Collection Environment').click();
   await page.getByRole('option', { name: 'ExampleB' }).press('Enter');
   await page.getByRole('option', { name: 'ExampleB' }).press('Escape');
   await expect.soft(tag).toHaveAttribute('title', /subenvB0/);
diff --git a/packages/insomnia-testing/package.json b/packages/insomnia-testing/package.json
index 0c9eb07d19..5aebd7c0d5 100644
--- a/packages/insomnia-testing/package.json
+++ b/packages/insomnia-testing/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "insomnia-testing",
   "license": "Apache-2.0",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "author": "Kong <office@konghq.com>",
   "repository": {
     "type": "git",
diff --git a/packages/insomnia-vcs/package.json b/packages/insomnia-vcs/package.json
index aaf15b43f6..a2b1046b9e 100644
--- a/packages/insomnia-vcs/package.json
+++ b/packages/insomnia-vcs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "insomnia-vcs",
-  "version": "13.1.0",
+  "version": "13.3.0",
   "private": true,
   "description": "Insomnia VCS functionalities",
   "license": "Apache-2.0",
diff --git a/packages/insomnia-vcs/src/__tests__/backend-projects.test.ts b/packages/insomnia-vcs/src/__tests__/backend-projects.test.ts
new file mode 100644
index 0000000000..db94acbfc4
--- /dev/null
+++ b/packages/insomnia-vcs/src/__tests__/backend-projects.test.ts
@@ -0,0 +1,96 @@
+import { createBuilder } from '@develohpanda/fluent-builder';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { projectSchema } from '../__schemas__/type-schemas';
+import { getBackendProjectById, hasBackendProjectForRootDocument, storeBackendProject } from '../backend-projects';
+import { configureStore } from '../store/current-store';
+import MemoryDriver from '../store/drivers/memory-driver';
+import type { BackendProject } from '../types';
+
+const projectBuilder = createBuilder(projectSchema);
+
+describe('hasBackendProjectForRootDocument', () => {
+  let driver: MemoryDriver;
+  let backendProject: BackendProject;
+
+  beforeEach(async () => {
+    backendProject = projectBuilder.reset().build();
+
+    driver = new MemoryDriver();
+    configureStore(driver);
+
+    driver.setItem('/projects/', Buffer.from(JSON.stringify([backendProject])));
+    driver.setItem(`/projects/${backendProject.id}/`, Buffer.from(''));
+    driver.setItem(`/projects/${backendProject.id}/meta.json`, Buffer.from(JSON.stringify(backendProject)));
+  });
+
+  it('should return true if has project', async () => {
+    const hasProject = await hasBackendProjectForRootDocument(backendProject.rootDocumentId);
+
+    expect(hasProject).toBe(true);
+  });
+
+  it('should return false if has no project', async () => {
+    const hasProject = await hasBackendProjectForRootDocument('some other id');
+
+    expect(hasProject).toBe(false);
+  });
+});
+
+describe('storeBackendProject()', () => {
+  let driver: MemoryDriver;
+  let backendProject: BackendProject;
+
+  beforeEach(() => {
+    driver = new MemoryDriver();
+    configureStore(driver);
+    backendProject = projectBuilder.reset().build();
+  });
+
+  it('writes backend project metadata when missing', async () => {
+    const setItemSpy = vi.spyOn(driver, 'setItem');
+
+    await storeBackendProject(backendProject);
+
+    expect(setItemSpy).toHaveBeenCalledTimes(1);
+    expect(setItemSpy).toHaveBeenCalledWith(`/projects/${backendProject.id}/meta.json`, expect.any(Buffer));
+    expect(await getBackendProjectById(backendProject.id)).toEqual(backendProject);
+  });
+
+  it('skips identical backend project metadata writes', async () => {
+    const setItemSpy = vi.spyOn(driver, 'setItem');
+
+    await storeBackendProject(backendProject);
+    setItemSpy.mockClear();
+
+    await storeBackendProject(backendProject);
+
+    expect(setItemSpy).not.toHaveBeenCalled();
+  });
+
+  it('writes changed backend project metadata', async () => {
+    const setItemSpy = vi.spyOn(driver, 'setItem');
+    const updatedProject = {
+      ...backendProject,
+      name: `${backendProject.name} Updated`,
+    };
+
+    await storeBackendProject(backendProject);
+    setItemSpy.mockClear();
+
+    await storeBackendProject(updatedProject);
+
+    expect(setItemSpy).toHaveBeenCalledTimes(1);
+    expect(await getBackendProjectById(backendProject.id)).toEqual(updatedProject);
+  });
+
+  it('writes backend project metadata when existing meta.json is corrupted', async () => {
+    await driver.setItem(`/projects/${backendProject.id}/meta.json`, Buffer.from('{', 'utf8'));
+    const setItemSpy = vi.spyOn(driver, 'setItem');
+
+    await storeBackendProject(backendProject);
+
+    expect(setItemSpy).toHaveBeenCalledTimes(1);
+    expect(setItemSpy).toHaveBeenCalledWith(`/projects/${backendProject.id}/meta.json`, expect.any(Buffer));
+  });
+});
diff --git a/packages/insomnia-vcs/src/__tests__/vcs.test.ts b/packages/insomnia-vcs/src/__tests__/vcs.test.ts
index e6156bc35d..e2abb29648 100644
--- a/packages/insomnia-vcs/src/__tests__/vcs.test.ts
+++ b/packages/insomnia-vcs/src/__tests__/vcs.test.ts
@@ -1,26 +1,25 @@
 // @ts-nocheck
 import { createBuilder } from '@develohpanda/fluent-builder';
-import type { BackendProject } from 'insomnia-data';
 import { models } from 'insomnia-data';
 import { deterministicStringify } from 'insomnia-data/common';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { baseModelSchema, workspaceModelSchema } from '../__schemas__/model-schemas';
-import { projectSchema } from '../__schemas__/type-schemas';
+import { configureStore } from '../store/current-store';
 import MemoryDriver from '../store/drivers/memory-driver';
 import { hashDocument } from '../util';
 import { chunkArray, VCS } from '../vcs';
 
 const baseModelBuilder = createBuilder(baseModelSchema);
 const workspaceModelBuilder = createBuilder(workspaceModelSchema);
-const projectBuilder = createBuilder(projectSchema);
 
 function newDoc(id) {
   return baseModelBuilder.reset()._id(id).build();
 }
 
 async function vcs(branch) {
-  const v = new VCS({ driver: new MemoryDriver() });
+  configureStore(new MemoryDriver());
+  const v = new VCS({ workspaceId: 'workspace_1' });
   await v.switchAndCreateBackendProjectIfNotExist('workspace_1', 'Test Workspace');
   await v.checkout([], branch);
   return v;
@@ -971,93 +970,6 @@ describe('VCS', () => {
     });
   });
 
-  describe('hasBackendProjectForRootDocument', () => {
-    let vcs: VCS;
-    let backendProject: BackendProject;
-
-    beforeEach(async () => {
-      backendProject = projectBuilder.reset().build();
-
-      const driver = new MemoryDriver();
-      vcs = new VCS({ driver });
-
-      driver.setItem('/projects/', Buffer.from(JSON.stringify([backendProject])));
-      driver.setItem(`/projects/${backendProject.id}/`, Buffer.from(''));
-      driver.setItem(`/projects/${backendProject.id}/meta.json`, Buffer.from(JSON.stringify(backendProject)));
-    });
-
-    it('should return true if has project', async () => {
-      const hasProject = await vcs.hasBackendProjectForRootDocument(backendProject.rootDocumentId);
-
-      expect(hasProject).toBe(true);
-    });
-
-    it('should return false if has no project', async () => {
-      const hasProject = await vcs.hasBackendProjectForRootDocument('some other id');
-
-      expect(hasProject).toBe(false);
-    });
-  });
-
-  describe('_storeBackendProject()', () => {
-    let driver: MemoryDriver;
-    let vcs: VCS;
-    let backendProject: BackendProject;
-
-    beforeEach(() => {
-      driver = new MemoryDriver();
-      vcs = new VCS({ driver });
-      backendProject = projectBuilder.reset().build();
-    });
-
-    it('writes backend project metadata when missing', async () => {
-      const setItemSpy = vi.spyOn(driver, 'setItem');
-
-      await vcs._storeBackendProject(backendProject);
-
-      expect(setItemSpy).toHaveBeenCalledTimes(1);
-      expect(setItemSpy).toHaveBeenCalledWith(`/projects/${backendProject.id}/meta.json`, expect.any(Buffer));
-      expect(await vcs._getBackendProjectById(backendProject.id)).toEqual(backendProject);
-    });
-
-    it('skips identical backend project metadata writes', async () => {
-      const setItemSpy = vi.spyOn(driver, 'setItem');
-
-      await vcs._storeBackendProject(backendProject);
-      setItemSpy.mockClear();
-
-      await vcs._storeBackendProject(backendProject);
-
-      expect(setItemSpy).not.toHaveBeenCalled();
-    });
-
-    it('writes changed backend project metadata', async () => {
-      const setItemSpy = vi.spyOn(driver, 'setItem');
-      const updatedProject = {
-        ...backendProject,
-        name: `${backendProject.name} Updated`,
-      };
-
-      await vcs._storeBackendProject(backendProject);
-      setItemSpy.mockClear();
-
-      await vcs._storeBackendProject(updatedProject);
-
-      expect(setItemSpy).toHaveBeenCalledTimes(1);
-      expect(await vcs._getBackendProjectById(backendProject.id)).toEqual(updatedProject);
-    });
-
-    it('writes backend project metadata when existing meta.json is corrupted', async () => {
-      await driver.setItem(`/projects/${backendProject.id}/meta.json`, Buffer.from('{', 'utf8'));
-      const setItemSpy = vi.spyOn(driver, 'setItem');
-
-      await vcs._storeBackendProject(backendProject);
-
-      expect(setItemSpy).toHaveBeenCalledTimes(1);
-      expect(setItemSpy).toHaveBeenCalledWith(`/projects/${backendProject.id}/meta.json`, expect.any(Buffer));
-    });
-  });
-
   it('validate branch names', async () => {
     expect(VCS.validateBranchName('branchA')).toEqual('');
     expect(VCS.validateBranchName('feat/branch-A')).toEqual('');
diff --git a/packages/insomnia-vcs/src/backend-projects.ts b/packages/insomnia-vcs/src/backend-projects.ts
new file mode 100644
index 0000000000..df9e36d930
--- /dev/null
+++ b/packages/insomnia-vcs/src/backend-projects.ts
@@ -0,0 +1,234 @@
+import path from 'node:path';
+
+import { deterministicStringify, generateId } from 'insomnia-data/common';
+
+import { runGraphQL } from './session';
+import { getStore } from './store/current-store';
+import type { BackendProject, BackendProjectWithTeams, BackendProjectWithTeamsAndTeamProjectId, Branch } from './types';
+
+// These helpers never read a VCS instance's active `_backendProject` — they operate on an
+// explicit `rootDocumentId`/`projectId`/`project`, or scan every local project. Keeping them
+// outside the `VCS` class means they can be called (and the shared store touched) without ever
+// activating a workspace-scoped VCS instance.
+
+export async function getBackendProjectById(projectId: string): Promise<BackendProject | null> {
+  return getStore().getItem(`/projects/${projectId}/meta.json`);
+}
+
+export async function storeBackendProject(project: BackendProject) {
+  let existingProject: BackendProject | null = null;
+  try {
+    existingProject = await getBackendProjectById(project.id);
+  } catch (err) {
+    console.warn('[sync] Failed to get existing backend project %s', project.id, err);
+  }
+
+  if (existingProject && deterministicStringify(existingProject) === deterministicStringify(project)) {
+    console.debug('[sync] Skipping store due to no backend changes');
+    return;
+  }
+
+  return getStore().setItem(`/projects/${project.id}/meta.json`, project);
+}
+
+export async function removeProject(project: BackendProject) {
+  console.log(`[sync] Remove local project ${project.id}`);
+  return getStore().removeItem(`/projects/${project.id}/meta.json`);
+}
+
+export async function localBackendProjects(): Promise<BackendProject[]> {
+  const backendProjects: BackendProject[] = [];
+  const keys = await getStore().keys('/projects/', false);
+
+  for (const key of keys) {
+    const id = path.basename(key);
+    const p = await getBackendProjectById(id);
+
+    if (p === null) {
+      // Folder exists but project meta file is gone
+      continue;
+    }
+
+    backendProjects.push(p);
+  }
+
+  return backendProjects;
+}
+
+export async function getBranches(backendProjectId: string): Promise<Branch[]> {
+  const branches: Branch[] = [];
+
+  for (const p of await getStore().keys(`/projects/${backendProjectId}/branches/`)) {
+    const b = await getStore().getItem(p);
+
+    if (b === null) {
+      // Should never happen
+      throw new Error(`Failed to get branch path=${p}`);
+    }
+
+    branches.push(b);
+  }
+
+  return branches;
+}
+
+export async function getBackendProjectByRootDocument(rootDocumentId: string): Promise<BackendProject | null> {
+  if (!rootDocumentId) {
+    throw new Error('No root document ID supplied for backend project');
+  }
+
+  // First, try finding the project
+  const backendProjects = await localBackendProjects();
+  let matchedBackendProjects = backendProjects.filter(p => p.rootDocumentId === rootDocumentId);
+
+  // If there is more than one project for root, try pruning unused ones by branch activity
+  if (matchedBackendProjects.length > 1) {
+    for (const p of matchedBackendProjects) {
+      const branches = await getBranches(p.id);
+
+      if (!branches.find(b => b.snapshots.length > 0)) {
+        await removeProject(p);
+        matchedBackendProjects = matchedBackendProjects.filter(({ id }) => id !== p.id);
+        console.log(`[sync] Remove inactive project for root ${rootDocumentId}`);
+      }
+    }
+  }
+
+  // If there are still too many, error out
+  if (matchedBackendProjects.length > 1) {
+    console.log('[sync] Multiple backend projects matched for root', {
+      backendProjects,
+      matchedBackendProjects,
+      rootDocumentId,
+    });
+    throw new Error('More than one backend project matched query');
+  }
+
+  return matchedBackendProjects[0] || null;
+}
+
+export async function getOrCreateBackendProjectByRootDocument(
+  rootDocumentId: string,
+  name: string,
+): Promise<BackendProject> {
+  let project = await getBackendProjectByRootDocument(rootDocumentId);
+
+  // If we still don't have a project, create one
+  if (!project) {
+    const id = generateId('prj');
+    project = {
+      id,
+      name,
+      rootDocumentId,
+    };
+    await storeBackendProject(project);
+    console.log(`[sync] Created backend project ${project.id}`);
+  }
+
+  return project;
+}
+
+export async function hasBackendProjectForRootDocument(rootDocumentId: string): Promise<boolean> {
+  return Boolean(await getBackendProjectByRootDocument(rootDocumentId));
+}
+
+export async function removeBackendProjectsForRoot(rootDocumentId: string) {
+  const all = await localBackendProjects();
+  const toRemove = all.filter(p => p.rootDocumentId === rootDocumentId);
+
+  for (const backendProject of toRemove) {
+    await removeProject(backendProject);
+  }
+}
+
+// Archives a remote backend project by id, without requiring it to be pulled locally first.
+export async function archiveBackendProject(backendProjectId: string) {
+  await runGraphQL(
+    `
+      mutation ($id: ID!) {
+        projectArchive(id: $id)
+      }
+    `,
+    {
+      id: backendProjectId,
+    },
+    'projectArchive',
+  );
+  console.log(`[sync] Archived remote project ${backendProjectId}`);
+  // A project that was never pulled has no local meta file to clean up.
+  const metaKey = `/projects/${backendProjectId}/meta.json`;
+  if (await getStore().hasItem(metaKey)) {
+    await getStore().removeItem(metaKey);
+  }
+}
+
+export async function remoteBackendProjects({ teamId, teamProjectId }: { teamId: string; teamProjectId: string }) {
+  console.log(`[remoteBackendProjects] Fetching remote workspaces for teamId=${teamId} teamProjectId=${teamProjectId}`);
+  const { projects } = await runGraphQL<{ projects: BackendProjectWithTeams[] }>(
+    `
+      query ($teamId: ID, $teamProjectId: ID) {
+        projects(teamId: $teamId, teamProjectId: $teamProjectId) {
+          id
+          name
+          rootDocumentId
+          teams {
+            id
+            name
+          }
+        }
+      }
+    `,
+    {
+      teamId,
+      teamProjectId,
+    },
+    'projects',
+  );
+
+  console.log(`[remoteBackendProjects] Fetched ${projects.length} remote workspaces`);
+
+  return projects.map(backend => ({
+    id: backend.id,
+    name: backend.name,
+    rootDocumentId: backend.rootDocumentId,
+    // A backend project is guaranteed to exist on exactly one team
+    team: backend.teams[0],
+  }));
+}
+
+export async function remoteBackendProjectsOfTeam({ teamId }: { teamId: string }) {
+  console.log(`[remoteBackendProjectsOfTeam] Fetching remote workspaces for teamId=${teamId}`);
+
+  const { projects } = await runGraphQL<{ projects: BackendProjectWithTeamsAndTeamProjectId[] }>(
+    `
+      query ($teamId: ID, $allProjects: Boolean) {
+        projects(teamId: $teamId, allProjects: $allProjects) {
+          id
+          name
+          rootDocumentId
+          teamProjectId
+          teams {
+            id
+            name
+          }
+        }
+      }
+    `,
+    {
+      teamId,
+      allProjects: true,
+    },
+    'projects',
+  );
+
+  console.log(`[remoteBackendProjectsOfTeam] Fetched ${projects.length} remote workspaces`);
+
+  return projects.map(backend => ({
+    id: backend.id,
+    name: backend.name,
+    rootDocumentId: backend.rootDocumentId,
+    teamProjectId: backend.teamProjectId,
+    // A backend project is guaranteed to exist on exactly one team
+    team: backend.teams[0],
+  }));
+}
diff --git a/packages/insomnia-vcs/src/index.ts b/packages/insomnia-vcs/src/index.ts
index 879788369e..e849087f40 100644
--- a/packages/insomnia-vcs/src/index.ts
+++ b/packages/insomnia-vcs/src/index.ts
@@ -1,7 +1,11 @@
+export * from './backend-projects';
+
 export { default as FileSystemDriver } from './store/drivers/file-system-driver';
 
 export { default as MemoryDriver } from './store/drivers/memory-driver';
 
+export { configureStore } from './store/current-store';
+
 export { VCS, type VcsOptions } from './vcs';
 
 export * from './crypt';
diff --git a/packages/insomnia-vcs/src/session.ts b/packages/insomnia-vcs/src/session.ts
new file mode 100644
index 0000000000..a93adea245
--- /dev/null
+++ b/packages/insomnia-vcs/src/session.ts
@@ -0,0 +1,60 @@
+import { runVcsGraphQL } from 'insomnia-api';
+import type { UserSession } from 'insomnia-data';
+import { services } from 'insomnia-data';
+
+import * as crypt from './crypt';
+
+// TODO: This is a temporary solution to get the private key from the session.
+export async function getPrivateKey(sessionData?: UserSession): Promise<JsonWebKey> {
+  if (!sessionData) {
+    throw new Error("Can't get private key: session is blank.");
+  }
+
+  const { symmetricKey, encPrivateKey } = sessionData;
+
+  if (!symmetricKey || !encPrivateKey) {
+    throw new Error("Can't get private key: session is missing keys.");
+  }
+
+  const privateKeyStr = await crypt.decryptAES(symmetricKey, encPrivateKey);
+  return JSON.parse(privateKeyStr) as JsonWebKey;
+}
+
+export async function assertSession() {
+  const sessionData = await services.userSession.get();
+  const { accountId, id, publicKey, symmetricKey } = sessionData;
+  const privateKey = await getPrivateKey(sessionData);
+
+  if (!id) {
+    throw new Error('Not logged in');
+  }
+
+  return {
+    accountId,
+    sessionId: id,
+    privateKey,
+    publicKey,
+    symmetricKey,
+  };
+}
+
+export async function runGraphQL<T>(query: string, variables: Record<string, any>, name: string): Promise<T> {
+  const { sessionId } = await assertSession();
+  const { data, errors } = await runVcsGraphQL<T>({
+    query,
+    variables,
+    sessionId,
+    name,
+  });
+
+  if (errors && errors.length) {
+    console.log(`[sync] Failed to query ${name}`, errors);
+    throw new Error(`Failed to query ${name}: ${errors[0].message}`);
+  }
+
+  if (data == null) {
+    throw new Error(`Failed to query ${name}: no data returned`);
+  }
+
+  return data;
+}
diff --git a/packages/insomnia-vcs/src/store/current-store.ts b/packages/insomnia-vcs/src/store/current-store.ts
new file mode 100644
index 0000000000..ce33bca2e1
--- /dev/null
+++ b/packages/insomnia-vcs/src/store/current-store.ts
@@ -0,0 +1,17 @@
+import type { BaseDriver } from './drivers/base';
+import compress from './hooks/compress';
+import Store from './index';
+
+let store: Store | null = null;
+
+export function configureStore(driver: BaseDriver): void {
+  store = new Store(driver, [compress]);
+}
+
+export function getStore(): Store {
+  if (!store) {
+    throw new Error('VCS store has not been configured. Call configureStore() first.');
+  }
+
+  return store;
+}
diff --git a/packages/insomnia-vcs/src/vcs.ts b/packages/insomnia-vcs/src/vcs.ts
index 26acd57412..737137a9e4 100644
--- a/packages/insomnia-vcs/src/vcs.ts
+++ b/packages/insomnia-vcs/src/vcs.ts
@@ -2,24 +2,22 @@
 // - [ ] Rename things that run a fetch to fetchSomething...
 // - [ ] Make sure that pull handles updating the parentId to the current project._id
 import crypto from 'node:crypto';
-import path from 'node:path';
 
 import clone from 'clone';
-import { runVcsGraphQL } from 'insomnia-api';
-import type { BaseModel, UserSession } from 'insomnia-data';
-import type { Operation } from 'insomnia-data';
-import { services } from 'insomnia-data';
-import { deterministicStringify, generateId } from 'insomnia-data/common';
+import type { BaseModel, Operation } from 'insomnia-data';
 
+import {
+  archiveBackendProject,
+  getBackendProjectById,
+  getBranches,
+  getOrCreateBackendProjectByRootDocument,
+  storeBackendProject,
+} from './backend-projects';
 import * as crypt from './crypt';
-import Store from './store';
-import type { BaseDriver } from './store/drivers/base';
-import FileSystemDriver from './store/drivers/file-system-driver';
-import compress from './store/hooks/compress';
+import { assertSession, runGraphQL } from './session';
+import { getStore } from './store/current-store';
 import type {
   BackendProject,
-  BackendProjectWithTeams,
-  BackendProjectWithTeamsAndTeamProjectId,
   Branch,
   DocumentKey,
   Head,
@@ -85,19 +83,11 @@ const generateAES256KeyInNode = async (): Promise<JsonWebKey> => {
   };
 };
 
-export type VcsOptions = {
+export interface VcsOptions {
+  workspaceId: string;
   conflictHandler?: ConflictHandler;
   testMode?: boolean;
-} & (
-  | {
-      driver?: undefined;
-      dataPath: string;
-    }
-  | {
-      driver: BaseDriver;
-      dataPath?: undefined;
-    }
-);
+}
 
 // Stage/Unstage
 // Staged items are about to be committed
@@ -114,17 +104,15 @@ export class VCS {
 
     return '';
   }
-  _store: Store;
-  _driver: BaseDriver;
+  readonly workspaceId: string;
   // stored by key `/projects/${project.id}/meta.json`
   _backendProject: BackendProject | null;
   _conflictHandler?: ConflictHandler | null;
   _testMode: boolean | undefined;
   _stageByBackendProjectId: Record<string, Stage> = {};
 
-  constructor({ driver, dataPath, conflictHandler, testMode }: VcsOptions) {
-    this._driver = driver || FileSystemDriver.create(dataPath!);
-    this._store = new Store(this._driver, [compress]);
+  constructor({ workspaceId, conflictHandler, testMode }: VcsOptions) {
+    this.workspaceId = workspaceId;
     this._testMode = testMode;
     this._conflictHandler = conflictHandler;
     // To be set later
@@ -135,41 +123,15 @@ export class VCS {
     this._backendProject = backendProject;
     console.debug(`[sync] Activated project ${backendProject.id}`);
     // Store it because it might not be yet
-    await this._storeBackendProject(backendProject);
+    await storeBackendProject(backendProject);
   }
 
   hasBackendProject() {
     return this._backendProject !== null;
   }
 
-  async hasBackendProjectForRootDocument(rootDocumentId: string) {
-    return Boolean(await this._getBackendProjectByRootDocument(rootDocumentId));
-  }
-
-  async removeBackendProjectsForRoot(rootDocumentId: string) {
-    const all = await this._allBackendProjects();
-    const toRemove = all.filter(p => p.rootDocumentId === rootDocumentId);
-
-    for (const backendProject of toRemove) {
-      await this._removeProject(backendProject);
-    }
-  }
-
   async archiveProject() {
-    const backendProjectId = this._backendProjectId();
-    await this._runGraphQL(
-      `
-        mutation ($id: ID!) {
-          projectArchive(id: $id)
-        }
-      `,
-      {
-        id: backendProjectId,
-      },
-      'projectArchive',
-    );
-    console.log(`[sync] Archived remote project ${backendProjectId}`);
-    await this._store.removeItem(`/projects/${backendProjectId}/meta.json`);
+    await archiveBackendProject(this._backendProjectId());
     this._backendProject = null;
   }
 
@@ -178,87 +140,10 @@ export class VCS {
   }
 
   async switchAndCreateBackendProjectIfNotExist(rootDocumentId: string, name: string) {
-    const project = await this._getOrCreateBackendProjectByRootDocument(rootDocumentId, name);
+    const project = await getOrCreateBackendProjectByRootDocument(rootDocumentId, name);
     await this.setBackendProject(project);
   }
 
-  async localBackendProjects() {
-    return this._allBackendProjects();
-  }
-
-  async remoteBackendProjects({ teamId, teamProjectId }: { teamId: string; teamProjectId: string }) {
-    console.log(
-      `[remoteBackendProjects] Fetching remote workspaces for teamId=${teamId} teamProjectId=${teamProjectId}`,
-    );
-    const { projects } = await this._runGraphQL<{ projects: BackendProjectWithTeams[] }>(
-      `
-        query ($teamId: ID, $teamProjectId: ID) {
-          projects(teamId: $teamId, teamProjectId: $teamProjectId) {
-            id
-            name
-            rootDocumentId
-            teams {
-              id
-              name
-            }
-          }
-        }
-      `,
-      {
-        teamId,
-        teamProjectId,
-      },
-      'projects',
-    );
-
-    console.log(`[remoteBackendProjects] Fetched ${projects.length} remote workspaces`);
-
-    return projects.map(backend => ({
-      id: backend.id,
-      name: backend.name,
-      rootDocumentId: backend.rootDocumentId,
-      // A backend project is guaranteed to exist on exactly one team
-      team: backend.teams[0],
-    }));
-  }
-
-  async remoteBackendProjectsOfTeam({ teamId }: { teamId: string }) {
-    console.log(`[remoteBackendProjectsOfTeam] Fetching remote workspaces for teamId=${teamId}`);
-
-    const { projects } = await this._runGraphQL<{ projects: BackendProjectWithTeamsAndTeamProjectId[] }>(
-      `
-        query ($teamId: ID, $allProjects: Boolean) {
-          projects(teamId: $teamId, allProjects: $allProjects) {
-            id
-            name
-            rootDocumentId
-            teamProjectId
-            teams {
-              id
-              name
-            }
-          }
-        }
-      `,
-      {
-        teamId,
-        allProjects: true,
-      },
-      'projects',
-    );
-
-    console.log(`[remoteBackendProjectsOfTeam] Fetched ${projects.length} remote workspaces`);
-
-    return projects.map(backend => ({
-      id: backend.id,
-      name: backend.name,
-      rootDocumentId: backend.rootDocumentId,
-      teamProjectId: backend.teamProjectId,
-      // A backend project is guaranteed to exist on exactly one team
-      team: backend.teams[0],
-    }));
-  }
-
   async blobFromLastSnapshot(key: string) {
     const branch = await this._getCurrentBranch();
     const snapshot = await this._getLatestSnapshot(branch.name);
@@ -572,6 +457,10 @@ export class VCS {
       throw new Error(`Failed to find commit by id ${snapshotId}`);
     }
 
+    // Update branch.modified so getVersion() changes after a rollback, so that editors with historyKey can detect working content change.
+    const branch = await this._getCurrentBranch();
+    await this._storeBranch(branch);
+
     const currentState: SnapshotState = candidates.map(candidate => ({
       key: candidate.key,
       blob: hashDocument(candidate.document).hash,
@@ -632,7 +521,7 @@ export class VCS {
   }
 
   async getRemoteBranchNames(): Promise<string[]> {
-    const { branches } = await this._runGraphQL<{ branches: { name: string }[] | null }>(
+    const { branches } = await runGraphQL<{ branches: { name: string }[] | null }>(
       `
       query ($projectId: ID!) {
         branches(project: $projectId) {
@@ -649,7 +538,7 @@ export class VCS {
   }
 
   async getBranchNames(): Promise<string[]> {
-    const branches = await this._getBranches();
+    const branches = await getBranches(this._backendProjectId());
     return branches.map(b => b.name);
   }
 
@@ -731,7 +620,7 @@ export class VCS {
       remoteProject = await this._createRemoteProject({ ...localProject, teamId, teamProjectId });
     }
 
-    await this._storeBackendProject(remoteProject);
+    await storeBackendProject(remoteProject);
     return remoteProject;
   }
 
@@ -955,29 +844,8 @@ export class VCS {
     return snapshot;
   }
 
-  async _runGraphQL<T>(query: string, variables: Record<string, any>, name: string): Promise<T> {
-    const { sessionId } = await this._assertSession();
-    const { data, errors } = await runVcsGraphQL<T>({
-      query,
-      variables,
-      sessionId,
-      name,
-    });
-
-    if (errors && errors.length) {
-      console.log(`[sync] Failed to query ${name}`, errors);
-      throw new Error(`Failed to query ${name}: ${errors[0].message}`);
-    }
-
-    if (data == null) {
-      throw new Error(`Failed to query ${name}: no data returned`);
-    }
-
-    return data;
-  }
-
   async _queryBlobsMissing(ids: string[]): Promise<string[]> {
-    const { blobsMissing } = await this._runGraphQL<{ blobsMissing: { missing: string[] } }>(
+    const { blobsMissing } = await runGraphQL<{ blobsMissing: { missing: string[] } }>(
       `
           query ($projectId: ID!, $ids: [ID!]!) {
             blobsMissing(project: $projectId, ids: $ids) {
@@ -995,7 +863,7 @@ export class VCS {
   }
 
   async _queryRemoveBranch(branchName: string) {
-    await this._runGraphQL(
+    await runGraphQL(
       `
       mutation ($projectId: ID!, $branch: String!) {
         branchRemove(project: $projectId, name: $branch)
@@ -1009,7 +877,7 @@ export class VCS {
   }
 
   async _queryBranch(branchName: string): Promise<Branch | null> {
-    const { branch } = await this._runGraphQL<{ branch: Branch | null }>(
+    const { branch } = await runGraphQL<{ branch: Branch | null }>(
       `
       query ($projectId: ID!, $branch: String!) {
         branch(project: $projectId, name: $branch) {
@@ -1032,7 +900,7 @@ export class VCS {
     let allSnapshots: Snapshot[] = [];
 
     for (const ids of chunkArray(allIds, 20)) {
-      const { snapshots } = await this._runGraphQL<{ snapshots: Snapshot[] }>(
+      const { snapshots } = await runGraphQL<{ snapshots: Snapshot[] }>(
         `
         query ($ids: [ID!]!, $projectId: ID!) {
           snapshots(ids: $ids, project: $projectId) {
@@ -1068,7 +936,7 @@ export class VCS {
 
   // push snapshots to the backend's current branch
   async _queryPushSnapshots(allSnapshots: Snapshot[]) {
-    const { accountId } = await this._assertSession();
+    const { accountId } = await assertSession();
 
     for (const snapshots of chunkArray(allSnapshots, 20)) {
       // This bit of logic fills in any missing author IDs from times where
@@ -1080,7 +948,7 @@ export class VCS {
       }
 
       const branch = await this._getCurrentBranch();
-      const { snapshotsCreate } = await this._runGraphQL<{ snapshotsCreate: Snapshot[] }>(
+      const { snapshotsCreate } = await runGraphQL<{ snapshotsCreate: Snapshot[] }>(
         `
         mutation ($projectId: ID!, $snapshots: [SnapshotInput!]!, $branchName: String!) {
           snapshotsCreate(project: $projectId, snapshots: $snapshots, branch: $branchName) {
@@ -1129,7 +997,7 @@ export class VCS {
     const result: Record<string, Buffer> = {};
 
     for (const ids of chunkArray(allIds, 50)) {
-      const { blobs } = await this._runGraphQL<{ blobs: { id: string; content: string }[] }>(
+      const { blobs } = await runGraphQL<{ blobs: { id: string; content: string }[] }>(
         `
       query ($ids: [ID!]!, $projectId: ID!) {
         blobs(ids: $ids, project: $projectId) {
@@ -1167,7 +1035,7 @@ export class VCS {
         id: i.id,
         content: i.content,
       }));
-      const { blobsCreate } = await this._runGraphQL<{ blobsCreate: { count: number } }>(
+      const { blobsCreate } = await runGraphQL<{ blobsCreate: { count: number } }>(
         `
           mutation ($projectId: ID!, $blobs: [BlobInput!]!) {
             blobsCreate(project: $projectId, blobs: $blobs) {
@@ -1221,7 +1089,7 @@ export class VCS {
   }
 
   async _queryBackendProjectKey() {
-    const { projectKey } = await this._runGraphQL<{ projectKey: { encSymmetricKey: string } }>(
+    const { projectKey } = await runGraphQL<{ projectKey: { encSymmetricKey: string } }>(
       `
         query ($projectId: ID!) {
           projectKey(projectId: $projectId) {
@@ -1238,7 +1106,7 @@ export class VCS {
   }
 
   async _queryProject(): Promise<BackendProject | null> {
-    const { project } = await this._runGraphQL<{ project: BackendProject | null }>(
+    const { project } = await runGraphQL<{ project: BackendProject | null }>(
       `
         query ($id: ID!) {
           project(id: $id) {
@@ -1267,7 +1135,7 @@ export class VCS {
       teamId,
     });
 
-    const { teamMemberKeys } = await this._runGraphQL<{
+    const { teamMemberKeys } = await runGraphQL<{
       teamMemberKeys: {
         memberKeys: {
           accountId: string;
@@ -1328,7 +1196,7 @@ export class VCS {
     // Use the local project ID if available; fall back to the workspace ID as a stable identifier.
     const localProjectId = this._backendProject ? this._backendProject.id : workspaceId;
 
-    const { projectCreate } = await this._runGraphQL<{ projectCreate: BackendProject }>(
+    const { projectCreate } = await runGraphQL<{ projectCreate: BackendProject }>(
       `
         mutation (
           $name: String!,
@@ -1369,15 +1237,11 @@ export class VCS {
 
   async _getBackendProject(): Promise<BackendProject | null> {
     const projectId = this._backendProject ? this._backendProject.id : 'n/a';
-    return this._getBackendProjectById(projectId);
-  }
-
-  async _getBackendProjectById(projectId: string): Promise<BackendProject | null> {
-    return this._store.getItem(`/projects/${projectId}/meta.json`);
+    return getBackendProjectById(projectId);
   }
 
   async _getBackendProjectSymmetricKey() {
-    const { privateKey, symmetricKey } = await this._assertSession();
+    const { privateKey, symmetricKey } = await assertSession();
 
     if (this._testMode) {
       // use the session symmetric key in playwright tests
@@ -1389,22 +1253,6 @@ export class VCS {
     return JSON.parse(symmetricKeyStr);
   }
 
-  // TODO: This is a temporary solution to get the private key from the session.
-  async _getPrivateKey(sessionData?: UserSession): Promise<JsonWebKey> {
-    if (!sessionData) {
-      throw new Error("Can't get private key: session is blank.");
-    }
-
-    const { symmetricKey, encPrivateKey } = sessionData;
-
-    if (!symmetricKey || !encPrivateKey) {
-      throw new Error("Can't get private key: session is missing keys.");
-    }
-
-    const privateKeyStr = await crypt.decryptAES(symmetricKey, encPrivateKey);
-    return JSON.parse(privateKeyStr) as JsonWebKey;
-  }
-
   async _assertBackendProject() {
     const project = await this._getBackendProject();
 
@@ -1415,24 +1263,8 @@ export class VCS {
     return project;
   }
 
-  async _storeBackendProject(project: BackendProject) {
-    let existingProject: BackendProject | null = null;
-    try {
-      existingProject = await this._getBackendProjectById(project.id);
-    } catch (err) {
-      console.warn('[sync] Failed to get existing backend project %s', project.id, err);
-    }
-
-    if (existingProject && deterministicStringify(existingProject) === deterministicStringify(project)) {
-      console.debug('[sync] Skipping store due to no backend changes');
-      return;
-    }
-
-    return this._store.setItem(`/projects/${project.id}/meta.json`, project);
-  }
-
   async _getHead(): Promise<Head> {
-    const head = await this._store.getItem(`/projects/${this._backendProjectId()}/head.json`);
+    const head = await getStore().getItem(`/projects/${this._backendProjectId()}/head.json`);
 
     if (head === null) {
       await this._storeHead({ branch: 'master' });
@@ -1447,24 +1279,6 @@ export class VCS {
     return this._getOrCreateBranch(head.branch);
   }
 
-  async _assertSession() {
-    const sessionData = await services.userSession.get();
-    const { accountId, id, publicKey, symmetricKey } = sessionData;
-    const privateKey = await this._getPrivateKey(sessionData);
-
-    if (!id) {
-      throw new Error('Not logged in');
-    }
-
-    return {
-      accountId,
-      sessionId: id,
-      privateKey,
-      publicKey,
-      symmetricKey,
-    };
-  }
-
   async _assertBranch(branchName: string) {
     const branch = await this._getBranch(branchName);
 
@@ -1484,26 +1298,7 @@ export class VCS {
   }
 
   async _getBranch(name: string): Promise<Branch | null> {
-    return this._store.getItem(`/projects/${this._backendProjectId()}/branches/${encodeBranchName(name)}.json`);
-  }
-
-  async _getBranches(backendProjectId?: string) {
-    const branches: Branch[] = [];
-
-    const pId = backendProjectId || this._backendProjectId();
-
-    for (const p of await this._store.keys(`/projects/${pId}/branches/`)) {
-      const b = await this._store.getItem(p);
-
-      if (b === null) {
-        // Should never happen
-        throw new Error(`Failed to get branch path=${p}`);
-      }
-
-      branches.push(b);
-    }
-
-    return branches;
+    return getStore().getItem(`/projects/${this._backendProjectId()}/branches/${encodeBranchName(name)}.json`);
   }
 
   async _getOrCreateBranch(name: string): Promise<Branch> {
@@ -1526,80 +1321,8 @@ export class VCS {
     return branch;
   }
 
-  async _getBackendProjectByRootDocument(rootDocumentId: string) {
-    if (!rootDocumentId) {
-      throw new Error('No root document ID supplied for backend project');
-    }
-
-    // First, try finding the project
-    const backendProjects = await this._allBackendProjects();
-    let matchedBackendProjects = backendProjects.filter(p => p.rootDocumentId === rootDocumentId);
-
-    // If there is more than one project for root, try pruning unused ones by branch activity
-    if (matchedBackendProjects.length > 1) {
-      for (const p of matchedBackendProjects) {
-        const branches = await this._getBranches(p.id);
-
-        if (!branches.find(b => b.snapshots.length > 0)) {
-          await this._removeProject(p);
-          matchedBackendProjects = matchedBackendProjects.filter(({ id }) => id !== p.id);
-          console.log(`[sync] Remove inactive project for root ${rootDocumentId}`);
-        }
-      }
-    }
-
-    // If there are still too many, error out
-    if (matchedBackendProjects.length > 1) {
-      console.log('[sync] Multiple backend projects matched for root', {
-        backendProjects,
-        matchedBackendProjects,
-        rootDocumentId,
-      });
-      throw new Error('More than one backend project matched query');
-    }
-
-    return matchedBackendProjects[0] || null;
-  }
-
-  async _getOrCreateBackendProjectByRootDocument(rootDocumentId: string, name: string) {
-    let project: BackendProject | null = await this._getBackendProjectByRootDocument(rootDocumentId);
-
-    // If we still don't have a project, create one
-    if (!project) {
-      const id = generateId('prj');
-      project = {
-        id,
-        name,
-        rootDocumentId,
-      };
-      await this._storeBackendProject(project);
-      console.log(`[sync] Created backend project ${project.id}`);
-    }
-
-    return project;
-  }
-
-  async _allBackendProjects() {
-    const backendProjects: BackendProject[] = [];
-    const keys = await this._store.keys('/projects/', false);
-
-    for (const key of keys) {
-      const id = path.basename(key);
-      const p: BackendProject | null = await this._getBackendProjectById(id);
-
-      if (p === null) {
-        // Folder exists but project meta file is gone
-        continue;
-      }
-
-      backendProjects.push(p);
-    }
-
-    return backendProjects;
-  }
-
   async _assertSnapshot(id: string) {
-    const snapshot: Snapshot | null = await this._store.getItem(
+    const snapshot: Snapshot | null = await getStore().getItem(
       `/projects/${this._backendProjectId()}/snapshots/${id}.json`,
     );
 
@@ -1615,7 +1338,7 @@ export class VCS {
   }
 
   async _getSnapshot(id: string) {
-    const snapshot: Snapshot | null = await this._store.getItem(
+    const snapshot: Snapshot | null = await getStore().getItem(
       `/projects/${this._backendProjectId()}/snapshots/${id}.json`,
     );
 
@@ -1634,7 +1357,7 @@ export class VCS {
   }
 
   async _storeSnapshot(snapshot: Snapshot) {
-    return this._store.setItem(`/projects/${this._backendProjectId()}/snapshots/${snapshot.id}.json`, snapshot);
+    return getStore().setItem(`/projects/${this._backendProjectId()}/snapshots/${snapshot.id}.json`, snapshot);
   }
 
   async _storeSnapshots(snapshots: Snapshot[]) {
@@ -1642,7 +1365,7 @@ export class VCS {
 
     for (const snapshot of snapshots) {
       const p = `/projects/${this._backendProjectId()}/snapshots/${snapshot.id}.json`;
-      const promise = this._store.setItem(p, snapshot);
+      const promise = getStore().setItem(p, snapshot);
       // @ts-expect-error -- TSCONVERSION appears to be a genuine error
       promises.push(promise);
     }
@@ -1659,29 +1382,24 @@ export class VCS {
 
     branch.modified = new Date();
     // toLowerCase may introduce issues under case sensitive filesystems
-    return this._store.setItem(
+    return getStore().setItem(
       `/projects/${this._backendProjectId()}/branches/${encodeBranchName(branch.name).toLowerCase()}.json`,
       branch,
     );
   }
 
   async _removeBranch(branch: Branch) {
-    return this._store.removeItem(
+    return getStore().removeItem(
       `/projects/${this._backendProjectId()}/branches/${encodeBranchName(branch.name)}.json`,
     );
   }
 
-  async _removeProject(project: BackendProject) {
-    console.log(`[sync] Remove local project ${project.id}`);
-    return this._store.removeItem(`/projects/${project.id}/meta.json`);
-  }
-
   async _storeHead(head: Head) {
-    await this._store.setItem(`/projects/${this._backendProjectId()}/head.json`, head);
+    await getStore().setItem(`/projects/${this._backendProjectId()}/head.json`, head);
   }
 
   _getBlob(blobId: string) {
-    return this._store.getItem(
+    return getStore().getItem(
       `/projects/${this._backendProjectId()}/blobs/${blobId.slice(0, 2)}/${blobId.slice(2)}`,
     ) as Promise<BaseModel | null>;
   }
@@ -1697,7 +1415,7 @@ export class VCS {
   }
 
   async _storeBlob(blobId: string, content: Record<string, any> | null) {
-    return this._store.setItem(
+    return getStore().setItem(
       `/projects/${this._backendProjectId()}/blobs/${blobId.slice(0, 2)}/${blobId.slice(2)}`,
       content,
     );
@@ -1709,7 +1427,7 @@ export class VCS {
     for (const blobId of Object.keys(blobsToStore)) {
       const buff = Buffer.from(blobsToStore[blobId], 'utf8');
       promises.push(
-        this._store.setItem(
+        getStore().setItem(
           `/projects/${this._backendProjectId()}/blobs/${blobId.slice(0, 2)}/${blobId.slice(2)}`,
           buff,
         ),
@@ -1724,7 +1442,7 @@ export class VCS {
 
     for (const blobId of Object.keys(decryptedBlobs)) {
       promises.push(
-        this._store.setItemRaw(
+        getStore().setItemRaw(
           `/projects/${this._backendProjectId()}/blobs/${blobId.slice(0, 2)}/${blobId.slice(2)}`,
           decryptedBlobs[blobId],
         ),
@@ -1735,13 +1453,13 @@ export class VCS {
   }
 
   async _getBlobRaw(blobId: string) {
-    return this._store.getItemRaw(
+    return getStore().getItemRaw(
       `/projects/${this._backendProjectId()}/blobs/${blobId.slice(0, 2)}/${blobId.slice(2)}`,
     );
   }
 
   async _hasBlob(blobId: string) {
-    return this._store.hasItem(`/projects/${this._backendProjectId()}/blobs/${blobId.slice(0, 2)}/${blobId.slice(2)}`);
+    return getStore().hasItem(`/projects/${this._backendProjectId()}/blobs/${blobId.slice(0, 2)}/${blobId.slice(2)}`);
   }
 
   getActiveBackendProject() {
diff --git a/packages/insomnia/package.json b/packages/insomnia/package.json
index ef63e66556..ec29e713f0 100644
--- a/packages/insomnia/package.json
+++ b/packages/insomnia/package.json
@@ -1,6 +1,6 @@
 {
   "name": "insomnia",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "productName": "Insomnia",
   "private": true,
   "description": "The Collaborative API Design Tool",
@@ -68,9 +68,9 @@
     "@react-router/fs-routes": "7.18.2",
     "@react-router/node": "7.18.2",
     "@react-router/serve": "7.18.2",
-    "@rjsf/core": "6.0.0-beta.15",
-    "@rjsf/utils": "6.0.0-beta.15",
-    "@rjsf/validator-ajv8": "6.0.0-beta.15",
+    "@rjsf/core": "6.0.0-beta.19",
+    "@rjsf/utils": "6.0.0-beta.19",
+    "@rjsf/validator-ajv8": "6.0.0-beta.19",
     "@sentry/electron": "^6.5.0",
     "@stoplight/spectral-core": "^1.22.0",
     "@stoplight/spectral-formats": "^1.8.2",
@@ -220,7 +220,7 @@
   },
   "optionalDependencies": {
     "@kong/insomnia-plugin-ai": "^1.0.11",
-    "@kong/insomnia-plugin-external-vault": "0.1.5-dev.20260806050036"
+    "@kong/insomnia-plugin-external-vault": "0.1.5"
   },
   "dev": {
     "dev-server-port": 3334
diff --git a/packages/insomnia/src/__tests__/install-plugin-info-cwd.test.ts b/packages/insomnia/src/__tests__/install-plugin-info-cwd.test.ts
new file mode 100644
index 0000000000..a7db52fd4a
--- /dev/null
+++ b/packages/insomnia/src/__tests__/install-plugin-info-cwd.test.ts
@@ -0,0 +1,113 @@
+import type * as fsPromisesTypes from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('electron', () => ({
+  app: {
+    getPath: vi.fn(() => '/mock/user/data/path'),
+    getAppPath: vi.fn(() => (globalThis as any).__yarnHome),
+  },
+}));
+
+vi.mock('../main/analytics', () => ({
+  trackAnalyticsEvent: vi.fn(),
+  AnalyticsEvent: {
+    installPlugin: 'Plugin Installed',
+  },
+}));
+
+vi.mock('insomnia-data', () => ({
+  services: {
+    settings: {
+      get: vi.fn(() => Promise.resolve({})),
+    },
+  },
+}));
+
+const execFileMock = vi.fn();
+vi.mock('node:child_process', async () => {
+  // Mirror Node semantics: promisified execFile resolves { stdout, stderr }.
+  const { promisify } = await import('node:util');
+  const fn: any = (...args: any[]) => execFileMock(...args);
+  fn[promisify.custom] = (cmd: any, args: any, opts: any) =>
+    new Promise((resolve, reject) => {
+      execFileMock(cmd, args, opts, (err: any, stdout: any, stderr: any) =>
+        err ? reject(err) : resolve({ stdout, stderr }),
+      );
+    });
+  return { execFile: fn };
+});
+
+vi.mock('node:fs/promises', async () => {
+  const actual = await vi.importActual<typeof fsPromisesTypes>('node:fs/promises');
+  return {
+    ...actual,
+    writeFile: (async (file: any, data: any, ...rest: any[]) => {
+      const store = ((globalThis as any).__writtenManifests ??= {}) as Record<string, string>;
+      store[String(file)] = String(data);
+      return actual.writeFile(file, data, ...rest);
+    }) as any,
+  };
+});
+
+import * as fsPromises from 'node:fs/promises';
+
+import { getPluginInfo } from '../main/install-plugin';
+
+const pluginPayload = {
+  data: {
+    name: 'insomnia-plugin-test',
+    version: '1.0.0',
+    insomnia: {
+      name: 'Test Plugin',
+      displayName: 'Test Plugin',
+      description: 'A test plugin',
+    },
+    dist: {
+      shasum: 'abc123',
+      tarball: 'https://registry.npmjs.org/test-plugin/-/test-plugin-1.0.0.tgz',
+    },
+  },
+};
+
+describe('getPluginInfo working directory', () => {
+  const testDir = path.dirname(fileURLToPath(import.meta.url));
+  // getYarnPath only accepts app paths under the module base (src/), so
+  // stage an empty standalone bundle inside the test dir for the lookup.
+  const yarnHome = path.resolve(testDir, 'tmp-yarn-home');
+
+  afterEach(async () => {
+    await fsPromises.rm(yarnHome, { recursive: true, force: true });
+  });
+
+  it('runs yarn info in a controlled temp dir, not the process cwd', async () => {
+    (globalThis as any).__writtenManifests = {};
+    // Production layout resolves the bundle to ../bin relative to the app
+    // path, so point the app one level below the staged bin directory.
+    (globalThis as any).__yarnHome = path.resolve(yarnHome, 'app');
+    await fsPromises.mkdir(path.resolve(yarnHome, 'bin'), { recursive: true });
+    await fsPromises.writeFile(path.resolve(yarnHome, 'bin', 'yarn-standalone.js'), '', 'utf8');
+    execFileMock.mockImplementation((_cmd: any, _args: any, _options: any, callback: any) => {
+      callback?.(null, JSON.stringify(pluginPayload), '');
+      return {} as any;
+    });
+
+    const result = await getPluginInfo('insomnia-plugin-test');
+    expect(result.name).toBe('insomnia-plugin-test');
+
+    expect(execFileMock).toHaveBeenCalledOnce();
+    const options = execFileMock.mock.calls[0][2] as { cwd?: string };
+    expect(options.cwd).toBeDefined();
+    expect(options.cwd).not.toBe(process.cwd());
+    expect(options.cwd?.startsWith(tmpdir())).toBe(true);
+
+    const written = (globalThis as any).__writtenManifests as Record<string, string>;
+    const manifestKey = Object.keys(written).find(key => key.endsWith('package.json'));
+    expect(manifestKey).toBeDefined();
+    expect(manifestKey?.startsWith(options.cwd as string)).toBe(true);
+    expect(JSON.parse(written[manifestKey as string])).toMatchObject({ license: 'ISC' });
+  });
+});
diff --git a/packages/insomnia/src/common/__tests__/app-data.test.ts b/packages/insomnia/src/common/__tests__/app-data.test.ts
index bdf12cf43b..60fe450d70 100644
--- a/packages/insomnia/src/common/__tests__/app-data.test.ts
+++ b/packages/insomnia/src/common/__tests__/app-data.test.ts
@@ -58,6 +58,22 @@ describe('updateAppDataOnDbChanges', () => {
     expect(queryClient.getQueryState(organizationDataKeys.byOrganizationId(organizationId))?.isInvalidated).toBe(true);
   });
 
+  it('invalidates both the origin and destination organization when a project moves parents', () => {
+    const organizationAId = 'org_a';
+    const organizationBId = 'org_b';
+    const project = { _id: 'proj_1', parentId: organizationAId } as OrganizationData['projects'][0];
+    const orgDataA: OrganizationData = { projects: [project], workspaces: [], workspaceMetas: [] };
+    const orgDataB: OrganizationData = { projects: [], workspaces: [], workspaceMetas: [] };
+    queryClient.setQueryData(organizationDataKeys.byOrganizationId(organizationAId), orgDataA);
+    queryClient.setQueryData(organizationDataKeys.byOrganizationId(organizationBId), orgDataB);
+
+    const moved = fakeDoc('Project', { _id: 'proj_1', parentId: organizationBId });
+    updateAppDataOnDbChanges(queryClient, [change('update', moved)]);
+
+    expect(queryClient.getQueryState(organizationDataKeys.byOrganizationId(organizationAId))?.isInvalidated).toBe(true);
+    expect(queryClient.getQueryState(organizationDataKeys.byOrganizationId(organizationBId))?.isInvalidated).toBe(true);
+  });
+
   it('invalidates the organization matched via project when a workspace changes', () => {
     const organizationId = 'org_1';
     const projectId = 'proj_1';
diff --git a/packages/insomnia/src/common/__tests__/import-deep-link.test.ts b/packages/insomnia/src/common/__tests__/import-deep-link.test.ts
index 708c2fabd2..cfbb531678 100644
--- a/packages/insomnia/src/common/__tests__/import-deep-link.test.ts
+++ b/packages/insomnia/src/common/__tests__/import-deep-link.test.ts
@@ -19,6 +19,14 @@ describe('parseDeepLinkUrl', () => {
     expect(parseDeepLinkUrl('insomniadev://app/import', true)?.urlWithoutParams).toBe('insomnia://app/import');
     expect(parseDeepLinkUrl('insomniadev://app/import', false)?.urlWithoutParams).toBe('insomniadev://app/import');
   });
+
+  it('preserves param names verbatim', () => {
+    expect(parseDeepLinkUrl('insomnia://app/import?CuRl=x&operationId=listPets&sourceUrl=https://x')?.params).toEqual({
+      CuRl: 'x',
+      operationId: 'listPets',
+      sourceUrl: 'https://x',
+    });
+  });
 });
 
 describe('sanitizeUrlAndExtractOrigin', () => {
@@ -53,8 +61,35 @@ describe('resolveImportDeepLink', () => {
     expect(resolveImportDeepLink({ mcp: 'https://x/mcp', curl: 'curl https://x' })?.type).toBe('mcp');
   });
 
-  it('returns null when no resource param is present', () => {
-    expect(resolveImportDeepLink({ origin: 'https://app.insomnia.rest' })).toBeNull();
-    expect(resolveImportDeepLink({ mcp: '   ' })).toBeNull();
+  it('selects the tab with an empty value for a bare param', () => {
+    expect(resolveImportDeepLink({ clipboard: '' })).toEqual({ type: 'clipboard', defaultValue: '', origin: '' });
+    expect(resolveImportDeepLink({ curl: '' })).toEqual({ type: 'curl', defaultValue: '', origin: '' });
+    expect(resolveImportDeepLink({})).toBeNull();
+  });
+
+  it('prefers value-bearing params over bare ones', () => {
+    expect(resolveImportDeepLink({ uri: '', curl: 'curl https://x' })).toEqual({
+      type: 'curl',
+      defaultValue: 'curl https://x',
+      origin: '',
+    });
+    expect(resolveImportDeepLink({ curl: '', clipboard: '' })?.type).toBe('curl');
+  });
+
+  it('matches source selector names case-insensitively but metadata params case-sensitively', () => {
+    expect(resolveImportDeepLink({ CuRl: 'curl https://x', mCp: '' })?.type).toBe('curl');
+    expect(resolveImportDeepLink({ CLIPBOARD: '' })?.type).toBe('clipboard');
+    // camelCase metadata params must not be shadowed by lowercasing
+    expect(
+      resolveImportDeepLink({ uri: 'https://x/spec.yaml', operationId: 'listPets' }),
+    ).toMatchObject({ type: 'uri', operationId: 'listPets' });
+  });
+
+  it('ignores a value on a valueless source', () => {
+    expect(resolveImportDeepLink({ clipboard: 'ignored' })).toEqual({ type: 'clipboard', defaultValue: '', origin: '' });
+  });
+
+  it('treats a whitespace-only value as bare', () => {
+    expect(resolveImportDeepLink({ mcp: '   ' })).toEqual({ type: 'mcp', defaultValue: '', origin: '' });
   });
 });
diff --git a/packages/insomnia/src/common/__tests__/import.test.ts b/packages/insomnia/src/common/__tests__/import.test.ts
index 940e5b1578..764ca0765a 100644
--- a/packages/insomnia/src/common/__tests__/import.test.ts
+++ b/packages/insomnia/src/common/__tests__/import.test.ts
@@ -288,7 +288,7 @@ describe('importRaw()', () => {
     const fixturePath = path.join(__dirname, '..', '__fixtures__', 'openapi', 'endpoint-security-input.yaml');
     const content = fs.readFileSync(fixturePath, 'utf8').toString();
     const disableLogs = console.log;
-    console.log = () => { };
+    console.log = () => {};
     const scanResult = await importUtil.scanResources([
       {
         contentStr: content,
@@ -605,7 +605,7 @@ describe('export/import round-trip is deterministic', () => {
     });
 
     const { workspace } = await roundTrip(sourceWorkspace._id);
-    expect(workspace.scope).toBe('design');
+    expect(workspace.scope).toBe('collection');
 
     const importedSpec = await services.apiSpec.getByParentId(workspace._id);
     expect(importedSpec).toBeTruthy();
diff --git a/packages/insomnia/src/common/__tests__/insomnia-v5.test.ts b/packages/insomnia/src/common/__tests__/insomnia-v5.test.ts
index 45debebdb7..4038ee7916 100644
--- a/packages/insomnia/src/common/__tests__/insomnia-v5.test.ts
+++ b/packages/insomnia/src/common/__tests__/insomnia-v5.test.ts
@@ -45,7 +45,7 @@ describe('Insomnia v5 Import/Export - Comprehensive Tests', () => {
     it('maps v5 schema types to workspace scopes', () => {
       expect(insomniaSchemaTypeToScope('collection.insomnia.rest/5.0')).toBe('collection');
       expect(insomniaSchemaTypeToScope('environment.insomnia.rest/5.0')).toBe('environment');
-      expect(insomniaSchemaTypeToScope('spec.insomnia.rest/5.0')).toBe('design');
+      expect(insomniaSchemaTypeToScope('spec.insomnia.rest/5.0')).toBe('collection');
       expect(insomniaSchemaTypeToScope('mock.insomnia.rest/5.0')).toBe('mock-server');
       expect(insomniaSchemaTypeToScope('mcpClient.insomnia/5.0')).toBe('mcp');
     });
diff --git a/packages/insomnia/src/common/api-specs.ts b/packages/insomnia/src/common/api-specs.ts
index 51b0eb34ac..cf0e4657e0 100644
--- a/packages/insomnia/src/common/api-specs.ts
+++ b/packages/insomnia/src/common/api-specs.ts
@@ -39,6 +39,29 @@ export function parseApiSpec(rawDocument: string) {
   return result;
 }
 
+/**
+ * Detects the serialization syntax of an API spec by probing it with JSON.parse.
+ * JSON is valid YAML, so anything that fails to parse as JSON is treated as YAML.
+ */
+export function detectApiSpecSyntax(contents: string): 'json' | 'yaml' {
+  try {
+    JSON.parse(contents);
+    return 'json';
+  } catch {
+    return 'yaml';
+  }
+}
+
+/**
+ * Re-serializes an API spec into the requested syntax. Throws if the spec cannot
+ * be parsed (invalid YAML or JSON).
+ */
+export function convertApiSpecSyntax(contents: string, to: 'json' | 'yaml'): string {
+  // YAML parses JSON as well
+  const parsed = YAML.parse(contents);
+  return to === 'json' ? JSON.stringify(parsed, null, 2) : YAML.stringify(parsed);
+}
+
 export function resolveComponentSchemaRefs(spec: ParsedApiSpec, methodInfo: Record<string, any>) {
   const schemas = spec.contents?.components?.schemas;
   if (!schemas) {
diff --git a/packages/insomnia/src/common/app-data.ts b/packages/insomnia/src/common/app-data.ts
index ff3d3bcaca..58e54bf0ca 100644
--- a/packages/insomnia/src/common/app-data.ts
+++ b/packages/insomnia/src/common/app-data.ts
@@ -248,6 +248,16 @@ export function updateAppDataOnDbChanges(queryClient: QueryClient, changes: Chan
 
     if (doc.type === models.project.type) {
       organizationIdsToRevalidate.add(doc.parentId);
+      // The project may have moved from a different, already-cached organization (e.g. the Konnect
+      // migration re-parents projects across organizations) — find and revalidate its old one too,
+      // since `doc.parentId` alone only ever points at the new one.
+      for (const [queryKey, data] of queryClient.getQueriesData<OrganizationData>({
+        queryKey: organizationDataKeys.all,
+      })) {
+        if (data?.projects.some(p => p._id === doc._id)) {
+          organizationIdsToRevalidate.add(queryKey[1] as string);
+        }
+      }
       continue;
     }
 
diff --git a/packages/insomnia/src/common/collection.test.ts b/packages/insomnia/src/common/collection.test.ts
new file mode 100644
index 0000000000..01c8ccd9c3
--- /dev/null
+++ b/packages/insomnia/src/common/collection.test.ts
@@ -0,0 +1,39 @@
+import { models } from 'insomnia-data';
+import { describe, expect, it } from 'vitest';
+
+import type { Child } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
+
+import { filterCollection } from './collection';
+
+const makeChild = (doc: Record<string, unknown>): Child =>
+  ({
+    doc: { type: models.request.type, ...doc },
+    children: [],
+    collapsed: false,
+    hidden: false,
+    pinned: false,
+    level: 0,
+    ancestors: [],
+  }) as unknown as Child;
+
+describe('filterCollection()', () => {
+  it('hides docs that do not match the filter', () => {
+    const children = [makeChild({ _id: 'req_1', name: 'Get users', url: 'https://api.example.com' })];
+
+    expect(filterCollection(children, 'users').map(child => child.hidden)).toEqual([false]);
+    expect(filterCollection(children, 'missing').map(child => child.hidden)).toEqual([true]);
+  });
+
+  // Docs are read straight off disk (NeDB) and can carry non-string values, e.g. a folder
+  // `description` object imported from Postman. A filter must not take the sidebar down with it.
+  it('tolerates non-string searchable fields on a doc', () => {
+    const children = [
+      makeChild({ _id: 'req_1', name: 42, description: { content: 'markdown', type: 'text/markdown' }, url: 8080 }),
+      makeChild({ _id: 'req_2', name: 'Get users', url: 'https://api.example.com' }),
+    ];
+
+    const filtered = filterCollection(children, 'users');
+
+    expect(filtered.map(child => child.hidden)).toEqual([true, false]);
+  });
+});
diff --git a/packages/insomnia/src/common/collection.ts b/packages/insomnia/src/common/collection.ts
index 27d82e7733..e7aff4f27f 100644
--- a/packages/insomnia/src/common/collection.ts
+++ b/packages/insomnia/src/common/collection.ts
@@ -78,21 +78,24 @@ export function flattenCollectionChildren(
   return collection;
 }
 
+// Docs are read straight off disk, where a field can hold a non-string value (e.g. a
+// `description` object from a Postman collection). Only strings are searchable text.
+const toSearchableText = (value: unknown): string => (typeof value === 'string' ? value : '');
+
 export function filterCollection(collection: Child[], filter: string): Child[] {
   if (!filter) return collection;
-  const filtered = collection.map(node => ({
-    ...node,
-    hidden: !fuzzyMatchAll(
-      filter,
-      [
-        node.doc.name,
-        (node.doc as { description?: string }).description ?? '',
-        ...(!models.requestGroup.isRequestGroup(node.doc) ? [(node.doc as { url?: string }).url ?? ''] : []),
-      ],
-      { splitSpace: false, loose: true },
-    )?.indexes,
-    collapsed: false,
-  }));
+  const filtered = collection.map(node => {
+    const searchableFields = [
+      toSearchableText(node.doc.name),
+      toSearchableText(node.doc.description),
+      ...(!models.requestGroup.isRequestGroup(node.doc) ? [toSearchableText(node.doc.url)] : []),
+    ];
+    return {
+      ...node,
+      hidden: !fuzzyMatchAll(filter, searchableFields, { splitSpace: false, loose: true })?.indexes,
+      collapsed: false,
+    };
+  });
   const nodeById = new Map(filtered.map(item => [item.doc._id, item]));
 
   filtered.forEach(node => {
diff --git a/packages/insomnia/src/common/constants.ts b/packages/insomnia/src/common/constants.ts
index 9564f74b5b..e649e9b11f 100644
--- a/packages/insomnia/src/common/constants.ts
+++ b/packages/insomnia/src/common/constants.ts
@@ -25,6 +25,9 @@ export const INSOMNIA_GITLAB_CLIENT_ID = env.INSOMNIA_GITLAB_CLIENT_ID;
 export const INSOMNIA_GITLAB_API_URL = env.INSOMNIA_GITLAB_API_URL;
 export const PLAYWRIGHT_TEST = env.PLAYWRIGHT_TEST;
 export const OAUTH_WINDOW_SESSION_ID_KEY = 'current-oauth-session-id';
+// Bump this when the onboarding content changes so that users will see the new wizard again.
+export const ONBOARDING_VERSION = '13.3';
+export const HAS_SEEN_ONBOARDING_KEY = `hasSeenOnboardingV${ONBOARDING_VERSION}`;
 
 // App Stuff
 export const getSkipOnboarding = () => env.INSOMNIA_SKIP_ONBOARDING;
diff --git a/packages/insomnia/src/common/documentation.ts b/packages/insomnia/src/common/documentation.ts
index 8e10592389..d63c6a8eb6 100644
--- a/packages/insomnia/src/common/documentation.ts
+++ b/packages/insomnia/src/common/documentation.ts
@@ -19,6 +19,7 @@ export const docsMcpAuthentication = newInsomniaDocs('/mcp-clients-in-insomnia/#
 export const docsPricingLearnMoreLink = newInsomniaDocs(
   '/storage/#what-are-the-user-and-git-sync-limits-for-the-essentials-plan',
 );
+export const docsPreRequestAndAfterResponseScripts = newInsomniaDocs('/scripts');
 
 export const docsGitAccessToken = {
   github: 'https://docs.github.com/github/authenticating-to-github/creating-a-personal-access-token',
diff --git a/packages/insomnia/src/common/get-workspace-label.ts b/packages/insomnia/src/common/get-workspace-label.ts
index bb81029d6f..68a4aff51c 100644
--- a/packages/insomnia/src/common/get-workspace-label.ts
+++ b/packages/insomnia/src/common/get-workspace-label.ts
@@ -7,10 +7,10 @@ export type ProjectScopeKeys = WorkspaceScope | 'unsynced';
 
 export const scopeToLabelMap: Record<
   ProjectScopeKeys,
-  'Document' | 'Collection' | 'Mock Server' | 'Unsynced' | 'Environment' | 'MCP Client'
+  'API Collection' | 'Mock Server' | 'Unsynced' | 'Environment' | 'MCP Client'
 > = {
-  'design': 'Document',
-  'collection': 'Collection',
+  'design': 'API Collection',
+  'collection': 'API Collection',
   'mock-server': 'Mock Server',
   'unsynced': 'Unsynced',
   'environment': 'Environment',
@@ -18,7 +18,7 @@ export const scopeToLabelMap: Record<
 };
 
 export const scopeToIconMap: Record<ProjectScopeKeys, IconProp> = {
-  'design': 'file',
+  'design': 'bars',
   'collection': 'bars',
   'mock-server': 'server',
   'unsynced': 'cloud-download',
@@ -27,7 +27,7 @@ export const scopeToIconMap: Record<ProjectScopeKeys, IconProp> = {
 };
 
 export const scopeToBgColorMap: Record<ProjectScopeKeys, string> = {
-  'design': 'bg-(--color-info)',
+  'design': 'bg-(--color-surprise)',
   'collection': 'bg-(--color-surprise)',
   'mock-server': 'bg-(--color-warning)',
   'unsynced': 'bg-(--hl-md)',
@@ -36,7 +36,7 @@ export const scopeToBgColorMap: Record<ProjectScopeKeys, string> = {
 };
 
 export const scopeToTextColorMap: Record<ProjectScopeKeys, string> = {
-  'design': 'text-(--color-font-info)',
+  'design': 'text-(--color-font-surprise)',
   'collection': 'text-(--color-font-surprise)',
   'mock-server': 'text-(--color-font-warning)',
   'unsynced': 'text-(--color-font)',
diff --git a/packages/insomnia/src/common/import-deep-link.ts b/packages/insomnia/src/common/import-deep-link.ts
index a0fe760f55..fe506d043c 100644
--- a/packages/insomnia/src/common/import-deep-link.ts
+++ b/packages/insomnia/src/common/import-deep-link.ts
@@ -35,32 +35,50 @@ export const sanitizeUrlAndExtractOrigin = (url?: string): string => {
 };
 
 export interface ImportDeepLinkResource {
-  type: Extract<ImportSourceType, 'uri' | 'mcp' | 'curl'>;
+  type: ImportSourceType;
   defaultValue: string;
   origin: string;
   endpoint?: string;
   operationId?: string;
 }
 
-// Resolution order is uri -> mcp -> curl; endpoint/operationId don't apply to mcp.
+// Param names double as the source selector: `?curl` selects the cURL tab,
+// `?curl=<value>` selects it and pre-populates the input. Only uri/mcp/curl
+// can carry a value through the link; clipboard/file are selected bare.
+// Selector names are case-insensitive (`?mCp`); metadata params (origin,
+// endpoint, operationId, source, sourceUrl) stay case-sensitive.
+const DEEP_LINK_SOURCE_ORDER = ['uri', 'mcp', 'curl', 'clipboard', 'file'] as const satisfies readonly ImportSourceType[];
+
+// Case-insensitive lookup of a source-selector param name.
+const findSourceParam = (params: Record<string, string>, type: ImportSourceType): string | undefined =>
+  Object.keys(params).find(name => name.toLowerCase() === type);
+
+// Value-bearing params win over bare ones, each in the order above;
+// endpoint/operationId only apply to uri and curl.
 export const resolveImportDeepLink = (params: Record<string, string>): ImportDeepLinkResource | null => {
   const origin = sanitizeUrlAndExtractOrigin(params.origin);
   const endpoint = params.endpoint || undefined;
   const operationId = params.operationId || undefined;
 
-  const uri = params.uri?.trim();
-  if (uri) {
-    return { type: 'uri', defaultValue: uri, origin, endpoint, operationId };
+  for (const type of ['uri', 'mcp', 'curl'] as const) {
+    const value = params[findSourceParam(params, type) ?? '']?.trim();
+    if (!value) {
+      continue;
+    }
+    return {
+      type,
+      defaultValue: value,
+      origin,
+      ...(type === 'uri' || type === 'curl' ? { endpoint, operationId } : {}),
+    };
   }
 
-  const mcp = params.mcp?.trim();
-  if (mcp) {
-    return { type: 'mcp', defaultValue: mcp, origin };
-  }
-
-  const curl = params.curl?.trim();
-  if (curl) {
-    return { type: 'curl', defaultValue: curl, origin, endpoint, operationId };
+  // A bare param (e.g. `insomnia://app/import?clipboard`, or `?curl` with no
+  // value) opens the Import modal with that tab selected, nothing pre-populated.
+  for (const type of DEEP_LINK_SOURCE_ORDER) {
+    if (findSourceParam(params, type) !== undefined) {
+      return { type, defaultValue: '', origin };
+    }
   }
 
   return null;
diff --git a/packages/insomnia/src/common/import-v5-parser.ts b/packages/insomnia/src/common/import-v5-parser.ts
index 57dca1877d..c33aa3a272 100644
--- a/packages/insomnia/src/common/import-v5-parser.ts
+++ b/packages/insomnia/src/common/import-v5-parser.ts
@@ -12,13 +12,15 @@
  * - Handle different workspace scopes and request types
  *
  */
-
+import { models } from 'insomnia-data';
 import { z } from 'zod/v4';
 
 import { INSOMNIA_SCHEMA_VERSION } from '~/common/insomnia-schema-migrations/schema-version';
 
 // This uses zod in order to ensure the parsed input matches our types before we insert it into the database
 
+const { environment } = models;
+
 // Basic literal types that can appear in JSON data
 export const LiteralSchema = z.union([z.string(), z.number(), z.boolean(), z.null()]);
 export const KeyLiteralSchema = z.union([z.string(), z.number()]);
@@ -103,23 +105,11 @@ export const CookieJarSchema = z.object({
   cookies: z.array(CookieSchema).optional(),
 });
 
-export const EnvironmentSchema = z.object({
-  name: z.string().optional(),
+const baseEnvironmentSchema = environment.baseEnvironmentSchema.omit({ metaSortKey: true }).extend({
   meta: MetaSchema.optional(),
-  data: JsonSchema.optional(),
-  color: z.string().optional().nullable(),
-  subEnvironments: z
-    .array(
-      z.object({
-        name: z.string(),
-        meta: MetaSchema.optional(),
-        data: JsonSchema.optional(),
-        dataPropertyOrder: JsonSchema.optional(),
-        color: z.string().optional().nullable(),
-      }),
-    )
-    .optional(),
-  dataPropertyOrder: JsonSchema.optional(),
+});
+export const EnvironmentSchema = baseEnvironmentSchema.extend({
+  subEnvironments: z.array(baseEnvironmentSchema).optional(),
 });
 
 export const GRPCRequestSchema = z.object({
@@ -580,6 +570,8 @@ export const CollectionSchema = z.object({
   cookieJar: CookieJarSchema.optional(),
   environments: EnvironmentSchema.optional(),
   certificates: z.array(CACertificateSchema).optional(),
+  testSuites: z.array(TestSuiteSchema).optional(),
+  spec: SpecSchema.optional(),
 });
 
 export const ApiSpecSchema = z.object({
diff --git a/packages/insomnia/src/common/import.ts b/packages/insomnia/src/common/import.ts
index 6366de66b8..55e900d715 100644
--- a/packages/insomnia/src/common/import.ts
+++ b/packages/insomnia/src/common/import.ts
@@ -611,7 +611,7 @@ export const importResourcesToNewWorkspace = async ({
   if (apiSpecResource || isApiSpecImport(resourceCacheItem.importer)) {
     newWorkspace = await services.workspace.create({
       name: workspaceToImport?.name,
-      scope: 'design',
+      scope: workspaceToImport?.scope ?? 'collection',
       parentId: projectId,
     });
 
@@ -626,7 +626,7 @@ export const importResourcesToNewWorkspace = async ({
     });
   } else {
     newWorkspace = await services.workspace.create({
-      name: workspaceToImport?.name || 'Imported Collection',
+      name: workspaceToImport?.name || 'Imported API Collection',
       scope: workspaceToImport?.scope || 'collection',
       parentId: projectId,
     });
diff --git a/packages/insomnia/src/common/insomnia-v5.ts b/packages/insomnia/src/common/insomnia-v5.ts
index 88e84c2e5d..bbf9c9bc73 100644
--- a/packages/insomnia/src/common/insomnia-v5.ts
+++ b/packages/insomnia/src/common/insomnia-v5.ts
@@ -289,7 +289,8 @@ export function insomniaSchemaTypeToScope(type: InsomniaFile['type']): Workspace
   } else if (type === 'environment.insomnia.rest/5.0') {
     return 'environment';
   } else if (type === 'spec.insomnia.rest/5.0') {
-    return 'design';
+    // The legacy spec type is treated as collection scope for now. We keep the spec type for backward compatibility.
+    return 'collection';
   } else if (type === 'mcpClient.insomnia/5.0') {
     return 'mcp';
   }
@@ -305,7 +306,7 @@ function getWorkspace(file: InsomniaFile): WithExportType<Workspace> {
     ),
     type: 'Workspace',
     _type: 'workspace',
-    name: file.name || 'Imported Collection',
+    name: file.name || 'Imported API Collection',
     parentId: '',
     scope: insomniaSchemaTypeToScope(file.type),
   };
@@ -447,7 +448,8 @@ function getMockRoutes(file: InsomniaFile): WithExportType<MockRoute>[] {
 }
 
 function getTestSuites(file: InsomniaFile): (UnitTestSuite | UnitTest)[] {
-  if (file.type === 'spec.insomnia.rest/5.0') {
+  // Now both legacy spec and new api collection files could contain legacy unit tests
+  if (file.type === 'spec.insomnia.rest/5.0' || file.type === 'collection.insomnia.rest/5.0') {
     const resources: (UnitTestSuite | UnitTest)[] = [];
 
     file.testSuites?.forEach((testSuite, index) => {
@@ -716,7 +718,14 @@ function importData(rawData: string) {
   if (fileSchemaParser.success) {
     const file = fileSchemaParser.data;
     if (file.type === 'collection.insomnia.rest/5.0') {
-      return [getWorkspace(file), ...getEnvironments(file), ...getCookieJar(file), ...getCollection(file)];
+      return [
+        getWorkspace(file),
+        ...getEnvironments(file),
+        ...getCookieJar(file),
+        ...getCollection(file),
+        ...getApiSpec(file),
+        ...getTestSuites(file),
+      ];
     }
 
     if (file.type === 'spec.insomnia.rest/5.0') {
@@ -1167,8 +1176,18 @@ export async function getInsomniaV5DataExport({
     }
 
     if (workspace.scope === 'collection') {
+      const collectionApiSpec = exportableResources.filter(models.apiSpec.isApiSpec);
+      const collectionTestSuites = exportableResources.filter(
+        resource => models.unitTestSuite.isUnitTestSuite(resource) || models.unitTest.isUnitTest(resource),
+      );
+      const collectionContainsApiSpecOrTestSuites = collectionApiSpec.length > 0 || collectionTestSuites.length > 0;
       const collection: InsomniaFile = {
-        type: 'collection.insomnia.rest/5.0',
+        type: collectionContainsApiSpecOrTestSuites
+          ? // We added api spec and test suites to the collection workspace in V13.3.
+            // In order not to break legacy versions which only handles api spec and test suites in the spec workspace for git sync.
+            // We export collection workspaces type as spec.insomnia.rest/5.0 if it contains api spec or test suites.
+            'spec.insomnia.rest/5.0'
+          : 'collection.insomnia.rest/5.0',
         schema_version: INSOMNIA_SCHEMA_VERSION,
         name: workspace.name,
         meta: mapWorkspaceMeta(workspace),
@@ -1188,6 +1207,8 @@ export async function getInsomniaV5DataExport({
           exportableResources.filter(models.environment.isEnvironment),
           includePrivateEnvironments,
         ),
+        spec: collectionApiSpec.length > 0 ? getSpecFromResources(collectionApiSpec) : {},
+        testSuites: getTestSuitesFromResources(collectionTestSuites),
       };
 
       const parsedCollection = InsomniaFileSchema.parse(collection);
diff --git a/packages/insomnia/src/common/organization-storage-rules.ts b/packages/insomnia/src/common/organization-storage-rules.ts
index 9086bac1da..a5db9ea8b2 100644
--- a/packages/insomnia/src/common/organization-storage-rules.ts
+++ b/packages/insomnia/src/common/organization-storage-rules.ts
@@ -18,7 +18,7 @@ export async function fetchAndCacheOrganizationStorageRule(
 ): Promise<StorageRules> {
   invariant(organizationId, 'Organization ID is required');
 
-  if (models.organization.isScratchpadOrganizationId(organizationId)) {
+  if (models.organization.isLocalOrganizationId(organizationId)) {
     return {
       enableCloudSync: false,
       enableLocalVault: true,
diff --git a/packages/insomnia/src/common/organization.ts b/packages/insomnia/src/common/organization.ts
index 405a6be7d1..e6f89e14fb 100644
--- a/packages/insomnia/src/common/organization.ts
+++ b/packages/insomnia/src/common/organization.ts
@@ -1,26 +1,63 @@
-import { getCurrentPlan, getUserProfile } from 'insomnia-api';
+import { type CurrentPlan, getCurrentPlan, getUserProfile, type Organization, type User } from 'insomnia-api';
 import { services } from 'insomnia-data';
 
 import { invariant } from '~/common/utils/invariant';
 
+export interface OrganizationData {
+  organizations: Organization[];
+  user?: User;
+  currentPlan?: CurrentPlan;
+}
+
+// Fetches the organization triple (organizations / user / current plan) from the
+// cloud API in parallel. Shared by both the TanStack query (the source of truth for
+// React consumers) and `syncOrganizations` (the localStorage write path still used by
+// the non-React readers). Throws if any of the three fail their invariant.
+export async function fetchOrganizationData(sessionId: string): Promise<OrganizationData> {
+  const [organizations, user, currentPlan] = await Promise.all([
+    services.organization.list(),
+    getUserProfile({ sessionId }),
+    getCurrentPlan({ sessionId }),
+  ]);
+
+  invariant(organizations, 'Failed to load organizations');
+  invariant(user && user.id, 'Failed to load user');
+  invariant(currentPlan && currentPlan.planId, 'Failed to load current plan');
+
+  return { organizations, user, currentPlan };
+}
+
+// Write-through helper: persists the organization triple to localStorage so the
+// non-React readers (`getInitialEntry`, various loaders, event-stream handlers, etc.)
+// keep working while the migration to TanStack Query is incremental.
+export function writeOrganizationDataToLocalStorage(accountId: string, data: OrganizationData) {
+  invariant(accountId, 'Account ID is not defined');
+  localStorage.setItem(`${accountId}:spaces`, JSON.stringify(data.organizations));
+  localStorage.setItem(`${accountId}:user`, JSON.stringify(data.user));
+  localStorage.setItem(`${accountId}:currentPlan`, JSON.stringify(data.currentPlan));
+}
+
+// Reads the persisted triple back from localStorage. Used to seed the query's
+// `initialData` so the first paint is instant (matching the old loader, which read
+// localStorage synchronously). Defaults mirror the previous loader behaviour.
+export function readOrganizationDataFromLocalStorage(accountId: string): OrganizationData {
+  const userRaw = localStorage.getItem(`${accountId}:user`);
+  const currentPlanRaw = localStorage.getItem(`${accountId}:currentPlan`);
+  return {
+    organizations: JSON.parse(localStorage.getItem(`${accountId}:spaces`) || '[]') as Organization[],
+    // Leave these undefined (not `{}`) when the key is absent, so consumers can rely on the
+    // declared optional shape — casting `{}` to User/CurrentPlan hides missing fields from the
+    // type checker and causes runtime NPEs (e.g. `currentPlan.type.includes`).
+    user: userRaw ? (JSON.parse(userRaw) as User) : undefined,
+    currentPlan: currentPlanRaw ? (JSON.parse(currentPlanRaw) as CurrentPlan) : undefined,
+  };
+}
+
 // This is reusable action/loader implementations.
 export async function syncOrganizations(sessionId: string, accountId: string) {
   try {
-    const [organizations, user, currentPlan] = await Promise.all([
-      services.organization.list(),
-      getUserProfile({ sessionId }),
-      getCurrentPlan({ sessionId }),
-    ]);
-
-    invariant(organizations, 'Failed to load organizations');
-    invariant(user && user.id, 'Failed to load user');
-    invariant(currentPlan && currentPlan.planId, 'Failed to load current plan');
-
-    invariant(accountId, 'Account ID is not defined');
-
-    localStorage.setItem(`${accountId}:spaces`, JSON.stringify(organizations));
-    localStorage.setItem(`${accountId}:user`, JSON.stringify(user));
-    localStorage.setItem(`${accountId}:currentPlan`, JSON.stringify(currentPlan));
+    const data = await fetchOrganizationData(sessionId);
+    writeOrganizationDataToLocalStorage(accountId, data);
   } catch (error) {
     console.log('[organization] Failed to load Organizations', error);
   }
diff --git a/packages/insomnia/src/common/project.ts b/packages/insomnia/src/common/project.ts
index 99c986e0ec..e28381cd08 100644
--- a/packages/insomnia/src/common/project.ts
+++ b/packages/insomnia/src/common/project.ts
@@ -20,7 +20,7 @@ export interface InsomniaFile {
   name: string;
   remoteId?: string;
   scope: WorkspaceScope | 'unsynced';
-  label: 'Document' | 'Collection' | 'Mock Server' | 'Unsynced' | 'Environment' | 'MCP Client';
+  label: 'Document' | 'API Collection' | 'Mock Server' | 'Unsynced' | 'Environment' | 'MCP Client';
   created: number;
   lastModifiedTimestamp: number;
   branch?: string;
diff --git a/packages/insomnia/src/common/render.ts b/packages/insomnia/src/common/render.ts
index e190ef19e7..f37802b125 100644
--- a/packages/insomnia/src/common/render.ts
+++ b/packages/insomnia/src/common/render.ts
@@ -296,8 +296,11 @@ export async function render<T>(
         // If the variable outputs a tag, render it again. This is a common use
         // case for environment variables:
         //   {{ foo }} => {% uuid 'v4' %} => dd265685-16a3-4d76-a59c-e8264c16835a
+        // Gated on the ORIGINAL input lacking custom-tag syntax so that tags returning
+        // raw external content (response bodies, OAuth tokens, file contents) never have
+        // their output re-interpreted as a second template pass against the live context.
         // @ts-expect-error -- TSCONVERSION
-        if (input.includes('{%')) {
+        if (!hasNunjucksCustomTagSymbols && input.includes('{%')) {
           // @ts-expect-error -- TSCONVERSION
           input = await getRuntime().templating.renderTemplate({ input, context, path, ignoreUndefinedEnvVariable });
         }
@@ -444,13 +447,13 @@ export async function getRenderContext({
   }
 
   // Get Keys from root environment
-  getKeySource((rootEnvironment || {}).data, inKey, rootEnvironment?.name || 'Base Environment (Collection)');
+  getKeySource((rootEnvironment || {}).data, inKey, rootEnvironment?.name || 'Base Environment (API Collection)');
 
   if (subEnvironment && subEnvironment._id !== rootEnvironment?._id) {
     getKeySource(
       subEnvironment.data || {},
       inKey,
-      `${subEnvironment.name || 'Environment'} (Collection Sub-Environment)`,
+      `${subEnvironment.name || 'Environment'} (API Collection Sub-Environment)`,
     );
   }
 
@@ -584,11 +587,16 @@ export async function getRenderedRequestAndContext({
   const suppressUserAgent = shouldSuppressUserAgent({ request, requestGroups });
   request.headers = getOrInheritHeaders({ request, requestGroups });
   request.authentication = getOrInheritAuthentication({ request, requestGroups });
+  // Only manually-authored cookies may contain live template syntax. Server-set cookie values
+  // are excluded from rendering here too, not just in the Cookie Jar UI, so that a template
+  // placed in a cookie by a response is never re-evaluated on a later request.
+  const manualCookies = cookieJar.cookies.filter(cookie => cookie.source === 'manual');
+  const nonManualCookies = cookieJar.cookies.filter(cookie => cookie.source !== 'manual');
   // Render all request properties
   const renderResult = await render(
     {
       _request: request,
-      _cookieJar: cookieJar,
+      _cookieJar: { ...cookieJar, cookies: manualCookies },
     },
     renderContext,
     request.settingDisableRenderRequestBody ? /^body.*/ : null,
@@ -598,7 +606,10 @@ export async function getRenderedRequestAndContext({
   );
 
   const renderedRequest = renderResult._request;
-  const renderedCookieJar = renderResult._cookieJar;
+  const renderedCookieJar = {
+    ...renderResult._cookieJar,
+    cookies: [...renderResult._cookieJar.cookies, ...nonManualCookies],
+  };
   renderedRequest.description = await render(description, renderContext, null, 'keep');
   // Remove disabled params
   renderedRequest.parameters = renderedRequest.parameters.filter(p => !p.disabled);
diff --git a/packages/insomnia/src/common/stream-summary.test.ts b/packages/insomnia/src/common/stream-summary.test.ts
new file mode 100644
index 0000000000..4499cd60f8
--- /dev/null
+++ b/packages/insomnia/src/common/stream-summary.test.ts
@@ -0,0 +1,204 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  candidateJsonPayloadsFromSseText,
+  computeStreamSummary,
+  extractStreamValueAtPath,
+  getCandidatePayloadsFromEvents,
+  inferStreamSummaryPath,
+} from './stream-summary';
+
+describe('extractStreamValueAtPath', () => {
+  it('extracts a string field', () => {
+    const payload = JSON.stringify({ choices: [{ delta: { content: 'hello' } }] });
+    expect(extractStreamValueAtPath(payload, '$.choices[0].delta.content')).toBe('hello');
+  });
+
+  it('stringifies a numeric field instead of dropping it', () => {
+    const payload = JSON.stringify({ value: 42 });
+    expect(extractStreamValueAtPath(payload, '$.value')).toBe('42');
+  });
+
+  it('stringifies an object field instead of dropping it', () => {
+    const payload = JSON.stringify({ value: { foo: 'bar' } });
+    expect(extractStreamValueAtPath(payload, '$.value')).toBe(JSON.stringify({ foo: 'bar' }));
+  });
+
+  it('joins array results', () => {
+    const payload = JSON.stringify({ items: ['a', 'b', 'c'] });
+    expect(extractStreamValueAtPath(payload, '$.items[*]')).toBe('abc');
+  });
+
+  it('returns null for invalid JSON payload', () => {
+    expect(extractStreamValueAtPath('not json', '$.value')).toBeNull();
+  });
+
+  it('returns null for invalid JSONPath', () => {
+    const payload = JSON.stringify({ value: 'hello' });
+    expect(extractStreamValueAtPath(payload, '$[?(]')).toBeNull();
+  });
+
+  it('returns null when the path matches nothing', () => {
+    const payload = JSON.stringify({ value: 'hello' });
+    expect(extractStreamValueAtPath(payload, '$.missing')).toBeNull();
+  });
+
+  it('returns null (does not throw) for a truncated, still-streaming JSON payload', () => {
+    const payload = '{"choices":[{"delta":{"content":"hi"';
+    expect(() => extractStreamValueAtPath(payload, '$.choices[0].delta.content')).not.toThrow();
+    expect(extractStreamValueAtPath(payload, '$.choices[0].delta.content')).toBeNull();
+  });
+});
+
+describe('computeStreamSummary', () => {
+  it('joins multiple payloads and reports fragmentCount', () => {
+    const payloads = [
+      JSON.stringify({ choices: [{ delta: { content: 'Hel' } }] }),
+      JSON.stringify({ choices: [{ delta: { content: 'lo ' } }] }),
+      JSON.stringify({ choices: [{ delta: {} }] }),
+      JSON.stringify({ choices: [{ delta: { content: 'world' } }] }),
+    ];
+    const result = computeStreamSummary(payloads, '$.choices[0].delta.content');
+    expect(result).toEqual({ fragmentCount: 3, summary: 'Hello world' });
+  });
+
+  it('renders Gemini text progressively as the array grows, mid-stream, before it closes', () => {
+    const keyPath = '$.candidates[0].content.parts[0].text';
+    // Each call simulates the accumulated wire text at a point in time as more of Gemini's
+    // still-open array arrives; the array only closes on the last call.
+    const atFirstElement = candidateJsonPayloadsFromSseText(
+      '[{"candidates":[{"content":{"parts":[{"text":"Hel"}]}}]}',
+    );
+    expect(computeStreamSummary(atFirstElement, keyPath)).toEqual({ fragmentCount: 1, summary: 'Hel' });
+
+    const withSecondElementStillOpen = candidateJsonPayloadsFromSseText(
+      '[{"candidates":[{"content":{"parts":[{"text":"Hel"}]}}]}\n,\n{"candidates":[{"content":{"parts":[{"text":"lo',
+    );
+    expect(computeStreamSummary(withSecondElementStillOpen, keyPath)).toEqual({ fragmentCount: 1, summary: 'Hel' });
+
+    const afterClose = candidateJsonPayloadsFromSseText(
+      '[{"candidates":[{"content":{"parts":[{"text":"Hel"}]}}]}\n,\n{"candidates":[{"content":{"parts":[{"text":"lo"}]}}]}\n]',
+    );
+    expect(computeStreamSummary(afterClose, keyPath)).toEqual({ fragmentCount: 2, summary: 'Hello' });
+  });
+});
+
+describe('inferStreamSummaryPath', () => {
+  it('matches OpenAI chat completions', () => {
+    expect(inferStreamSummaryPath('https://api.openai.com/v1/chat/completions')).toBe('$.choices[0].delta.content');
+  });
+
+  it('matches OpenAI responses API on a proxy host', () => {
+    expect(inferStreamSummaryPath('https://my-proxy.example.com/v1/responses')).toBe('$.delta');
+  });
+
+  it('matches Anthropic messages API', () => {
+    expect(inferStreamSummaryPath('https://api.anthropic.com/v1/messages')).toBe('$.delta.text');
+  });
+
+  it('matches Google Gemini streamGenerateContent', () => {
+    expect(
+      inferStreamSummaryPath('https://generativelanguage.googleapis.com/v1beta/models/gemini-pro:streamGenerateContent'),
+    ).toBe('$.candidates[0].content.parts[0].text');
+  });
+
+  it('returns null when no pathname matches', () => {
+    expect(inferStreamSummaryPath('https://example.com/v1/unknown')).toBeNull();
+  });
+
+  it('returns null for an invalid URL', () => {
+    expect(inferStreamSummaryPath('not a url')).toBeNull();
+  });
+});
+
+describe('candidateJsonPayloadsFromSseText', () => {
+  it('extracts a single data frame', () => {
+    const text = 'data: {"choices":[{"delta":{"content":"hi"}}]}\n\n';
+    expect(candidateJsonPayloadsFromSseText(text)).toEqual([
+      '{"choices":[{"delta":{"content":"hi"}}]}',
+    ]);
+  });
+
+  it('extracts multiple frames separated by blank lines', () => {
+    const text = 'data: {"a":1}\n\ndata: {"b":2}\n\n';
+    expect(candidateJsonPayloadsFromSseText(text)).toEqual([
+      '{"a":1}',
+      '{"b":2}',
+    ]);
+  });
+
+  it('extracts a frame with event:/id: fields mixed in', () => {
+    const text = 'event: message\nid: 42\ndata: {"a":1}\n\n';
+    expect(candidateJsonPayloadsFromSseText(text)).toEqual(['{"a":1}']);
+  });
+
+  it('joins a multi-line data: continuation frame', () => {
+    const text = 'data: {"a":1,\ndata: "b":2}\n\n';
+    expect(candidateJsonPayloadsFromSseText(text)).toEqual(['{"a":1,\n"b":2}']);
+  });
+
+  it('falls back to a bare JSON blob with no data: prefix', () => {
+    const text = '{"a":1}';
+    expect(candidateJsonPayloadsFromSseText(text)).toEqual(['{"a":1}']);
+  });
+
+  it('splits a bare top-level JSON array into one candidate per element (Gemini non-SSE streaming)', () => {
+    // Gemini's default streamGenerateContent (no ?alt=sse) sends one top-level JSON array
+    // with no blank lines between elements, not per-chunk `data:` frames.
+    const text = '[{"candidates":[{"content":{"parts":[{"text":"Hel"}]}}]}\n,\n{"candidates":[{"content":{"parts":[{"text":"lo"}]}}]}\n]';
+    expect(candidateJsonPayloadsFromSseText(text)).toEqual([
+      JSON.stringify({ candidates: [{ content: { parts: [{ text: 'Hel' }] } }] }),
+      JSON.stringify({ candidates: [{ content: { parts: [{ text: 'lo' }] } }] }),
+    ]);
+  });
+
+  it('returns only the elements that have closed so far from a still-open, unterminated array (does not throw)', () => {
+    // Same Gemini shape as above, but mid-stream: the array's closing `]` (and the second
+    // element's closing `}`) haven't arrived yet.
+    const text = '[{"candidates":[{"content":{"parts":[{"text":"Hel"}]}}]}\n,\n{"candidates":[{"content":{"parts":[{"text":"lo';
+    expect(() => candidateJsonPayloadsFromSseText(text)).not.toThrow();
+    expect(candidateJsonPayloadsFromSseText(text)).toEqual([
+      JSON.stringify({ candidates: [{ content: { parts: [{ text: 'Hel' }] } }] }),
+    ]);
+  });
+
+  it('returns nothing (does not throw) for a single element that has not closed yet', () => {
+    const text = '[{"candidates":[{"content":{"parts":[{"text":"Hel"';
+    expect(() => candidateJsonPayloadsFromSseText(text)).not.toThrow();
+    expect(candidateJsonPayloadsFromSseText(text)).toEqual([]);
+  });
+});
+
+describe('getCandidatePayloadsFromEvents', () => {
+  it('reconstructs curl SSE chunks in chronological order given a newest-first input array', () => {
+    const chunkA = 'data: {"choices":[{"delta":{"content":"Hel"}}]}\n\n';
+    const chunkB = 'data: {"choices":[{"delta":{"content":"lo"}}]}\n\n';
+    // findMany() returns newest-first, so the true arrival order (A then B) appears reversed here.
+    const newestFirst = [
+      { type: 'message', direction: 'INCOMING', data: chunkB },
+      { type: 'message', direction: 'INCOMING', data: chunkA },
+    ];
+    expect(getCandidatePayloadsFromEvents(newestFirst)).toEqual([
+      '{"choices":[{"delta":{"content":"Hel"}}]}',
+      '{"choices":[{"delta":{"content":"lo"}}]}',
+    ]);
+  });
+
+  it('reconstructs curl SSE frames split across multiple chunks, given a newest-first input array', () => {
+    // True arrival order is 'data: {"a"' then ':1}\n\n'; findMany() returns newest-first.
+    const newestFirst = [
+      { type: 'message', direction: 'INCOMING', data: ':1}\n\n' },
+      { type: 'message', direction: 'INCOMING', data: 'data: {"a"' },
+    ];
+    expect(getCandidatePayloadsFromEvents(newestFirst)).toEqual(['{"a":1}']);
+  });
+
+  it('ignores outgoing and non-message events', () => {
+    const events = [
+      { type: 'message', direction: 'INCOMING', data: '{"delta":"kept"}' },
+      { type: 'message', direction: 'OUTGOING', data: '{"delta":"ignored"}' },
+      { type: 'open', direction: '', data: '' },
+    ];
+    expect(getCandidatePayloadsFromEvents(events)).toEqual(['{"delta":"kept"}']);
+  });
+});
diff --git a/packages/insomnia/src/common/stream-summary.ts b/packages/insomnia/src/common/stream-summary.ts
new file mode 100644
index 0000000000..e0e46c2215
--- /dev/null
+++ b/packages/insomnia/src/common/stream-summary.ts
@@ -0,0 +1,207 @@
+import { JSONPath } from 'jsonpath-plus';
+
+const stringifyValue = (value: unknown): string | null => {
+  if (value === null || value === undefined) {
+    return null;
+  }
+  if (typeof value === 'string') {
+    return value;
+  }
+  if (typeof value === 'number' || typeof value === 'boolean' || typeof value === 'bigint') {
+    return String(value);
+  }
+  return JSON.stringify(value);
+};
+
+export const extractStreamValueAtPath = (payload: string, keyPath: string): string | null => {
+  try {
+    const parsed = JSON.parse(payload);
+    const path = keyPath.trim();
+    const result = JSONPath({ path, json: parsed });
+    if (Array.isArray(result)) {
+      // An empty array means the path matched nothing at all (as opposed to matching a
+      // field whose value happens to be an empty string), so it's treated the same as
+      // a null/undefined result rather than joined into an empty-but-present fragment.
+      if (result.length === 0) {
+        return null;
+      }
+      return result
+        .map(stringifyValue)
+        .filter((value): value is string => value !== null)
+        .join('');
+    }
+    return stringifyValue(result);
+  } catch {
+    return null;
+  }
+};
+
+export const computeStreamSummary = (
+  payloads: string[],
+  keyPath: string,
+): { fragmentCount: number; summary: string } => {
+  const fragments = payloads
+    .map(payload => extractStreamValueAtPath(payload, keyPath))
+    .filter((value): value is string => value !== null);
+  return { fragmentCount: fragments.length, summary: fragments.join('') };
+};
+
+const STANDARD_SSE_FIELD = /^(event|id|retry):/i;
+
+export function candidateJsonPayloadsFromSseText(text: string): string[] {
+  const normalized = text.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
+  const blocks = normalized.split(/\n{2,}/);
+  const candidates: string[] = [];
+
+  for (const block of blocks) {
+    const lines = block.split('\n');
+    const dataLines = lines
+      .map(line => /^data:(?: ?)(.*)$/.exec(line)?.[1])
+      .filter((line): line is string => line != null);
+
+    if (dataLines.length > 0) {
+      const payload = dataLines.join('\n').trim();
+      if (payload) {
+        candidates.push(payload);
+      }
+      continue;
+    }
+
+    const trimmedBlock = block.trim();
+    if (!trimmedBlock) {
+      continue;
+    }
+
+    if (trimmedBlock.startsWith('[')) {
+      // Gemini's default (non-SSE, no `?alt=sse`) streaming response is a single top-level
+      // JSON array with no blank lines between elements, so it lands here as one block.
+      // Extract whichever elements have arrived complete so far, even mid-stream before the
+      // array's closing `]` shows up, so the summary can render as chunks come in rather
+      // than only once the whole response finishes.
+      candidates.push(...extractCompleteTopLevelArrayElements(trimmedBlock));
+      continue;
+    }
+
+    if (isParsableJson(trimmedBlock)) {
+      candidates.push(trimmedBlock);
+      continue;
+    }
+
+    for (const line of lines) {
+      const trimmedLine = line.trim();
+      if (
+        !trimmedLine ||
+        trimmedLine.startsWith(':') ||
+        STANDARD_SSE_FIELD.test(trimmedLine) ||
+        !isParsableJson(trimmedLine)
+      ) {
+        continue;
+      }
+      candidates.push(trimmedLine);
+    }
+  }
+
+  return candidates;
+}
+
+// Scans a (possibly unterminated) top-level JSON array and returns the substring of each
+// element that has closed so far, tracking bracket depth and string escaping by hand rather
+// than JSON.parse-ing the whole thing (which fails until the array's closing `]` arrives).
+// An element still being streamed simply never closes, so it's correctly left out.
+function extractCompleteTopLevelArrayElements(text: string): string[] {
+  const elements: string[] = [];
+  let depth = 0;
+  let inString = false;
+  let escaped = false;
+  let elementStart = -1;
+
+  for (let i = 0; i < text.length; i++) {
+    const char = text[i];
+
+    if (inString) {
+      if (escaped) {
+        escaped = false;
+      } else if (char === '\\') {
+        escaped = true;
+      } else if (char === '"') {
+        inString = false;
+      }
+      continue;
+    }
+
+    if (char === '"') {
+      inString = true;
+      continue;
+    }
+
+    if (char === '[' || char === '{') {
+      if (depth === 1 && elementStart === -1) {
+        elementStart = i;
+      }
+      depth++;
+      continue;
+    }
+
+    if (char === ']' || char === '}') {
+      depth--;
+      if (depth === 1 && elementStart !== -1) {
+        elements.push(text.slice(elementStart, i + 1));
+        elementStart = -1;
+      }
+      continue;
+    }
+  }
+
+  return elements;
+}
+
+function isParsableJson(value: string): boolean {
+  try {
+    JSON.parse(value);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export interface StreamMessageEvent {
+  type: string;
+  direction: string;
+  data: string;
+}
+
+export function getCandidatePayloadsFromEvents(events: StreamMessageEvent[]): string[] {
+  // curl's findMany() reverse the event log for "latest event
+  // first" display, so undo that exact reversal here (rather than sort by timestamp,
+  // which has only millisecond resolution and can't disambiguate SSE chunks that arrive
+  // within the same millisecond) to get back true chronological order.
+  const incoming = events.filter(event => event.type === 'message' && event.direction === 'INCOMING').reverse();
+
+  return candidateJsonPayloadsFromSseText(incoming.map(event => event.data).join(''));
+}
+
+const PATH_TO_JSONPATH: { pathname: string; jsonPath: string }[] = [
+  // OpenAI: Chat Completions API
+  { pathname: '/v1/chat/completions', jsonPath: '$.choices[0].delta.content' },
+  // OpenAI: Completions API, Legacy
+  { pathname: '/v1/completions', jsonPath: '$.choices[0].text' },
+  // OpenAI Responses API
+  { pathname: '/v1/responses', jsonPath: '$.delta' },
+  // Anthropic Claude Messages API
+  { pathname: '/v1/messages', jsonPath: '$.delta.text' },
+];
+
+export const inferStreamSummaryPath = (url: string): string | null => {
+  try {
+    const { pathname } = new URL(url);
+    // Gemini uses a ":verb" suffix (.../models/gemini-pro:streamGenerateContent) rather than
+    // a fixed REST path, so it can't go in PATH_TO_JSONPATH's exact-match table below.
+    if (pathname.toLowerCase().includes(':streamgeneratecontent')) {
+      return '$.candidates[0].content.parts[0].text';
+    }
+    const match = PATH_TO_JSONPATH.find(entry => entry.pathname === pathname);
+    return match ? match.jsonPath : null;
+  } catch {
+    return null;
+  }
+};
diff --git a/packages/insomnia/src/common/templating/__tests__/utils.test.ts b/packages/insomnia/src/common/templating/__tests__/utils.test.ts
index 16c3ae2f55..525d7a576a 100644
--- a/packages/insomnia/src/common/templating/__tests__/utils.test.ts
+++ b/packages/insomnia/src/common/templating/__tests__/utils.test.ts
@@ -332,6 +332,72 @@ describe('decodeEncoding()', () => {
   });
 });
 
+describe('replaceVaultTagIdIfNeeded()', () => {
+  const vaultTagIdRegex = utils.vaultTagIdRegex;
+  const normalTemplate = `{% vault 'aws', '${utils.generateExternalVaultTagId()}', 'eyJTZWNyZXRJZCI6IjEifQ==' %}`;
+
+  it('leaves plain text without template tag symbols untouched', () => {
+    const template = 'normal string';
+    expect(utils.replaceVaultTagIdIfNeeded(template)).toBe(template);
+  });
+
+  it('leaves multiple line of input unchanged', () => {
+    const input = 'line 1\nline 2\nline 3';
+    expect(utils.replaceVaultTagIdIfNeeded(input)).toBe(input);
+  });
+
+  it('leaves a template tag with no vault tag id untouched', () => {
+    const template = "{% response 'body', 'req_123', 'b64', '' %}";
+    expect(utils.replaceVaultTagIdIfNeeded(template)).toBe(template);
+  });
+
+  it('replaces the vault tag id inside a template tag with a freshly generated one', () => {
+    const result = utils.replaceVaultTagIdIfNeeded(normalTemplate);
+
+    expect(result).not.toBe(normalTemplate);
+    expect(result).not.toContain('externalVaultTag_0b1ea47e317f4f03ae147dcb6c5f66c6');
+
+    const [, newId] = result.match(/'(externalVaultTag_\w+)'/) || [];
+    expect(newId).toMatch(vaultTagIdRegex);
+  });
+
+  it('generates a different id on each call', () => {
+    const first = utils.replaceVaultTagIdIfNeeded(normalTemplate);
+    const second = utils.replaceVaultTagIdIfNeeded(normalTemplate);
+    expect(first).not.toBe(second);
+  });
+
+  it('does not replace a vault tag id-like string outside of a {% %} block', () => {
+    const idLikeString = 'externalVaultTag_0b1ea47e317f4f03ae147dcb6c5f66c6';
+    const template = `see ${idLikeString} for reference ${normalTemplate}`;
+
+    const result = utils.replaceVaultTagIdIfNeeded(template);
+
+    // the id-like text outside the tag is left alone
+    expect(result).toContain(idLikeString);
+    // the id inside the {% %} tag is still replaced
+    expect(result).not.toContain(normalTemplate);
+  });
+
+  it('replaces each vault tag id with a distinct new id when the template contains multiple tags', () => {
+    const template =
+      'templateStart' +
+      "{% vault 'aws', 'externalVaultTag_0b1ef47e317f4f03ae147dcb6c5f66c6', 'eyJTZWNyZXRJZCI6IjEifQ==' %}" +
+      "{% vault 'aws', 'externalVaultTag_1b1ef47e317f4f03ae147dcb6c5f66c6', 'eyJTZWNyZXRJZCI6IjEifQ==' %}" +
+      "{% vault 'aws', 'externalVaultTag_2b1ef47e317f4f03ae147dcb6c5f66c6', 'eyJTZWNyZXRJZCI6IjEifQ==' %}" +
+      'templateEnd';
+
+    const result = utils.replaceVaultTagIdIfNeeded(template);
+
+    const newIds = result.match(new RegExp(`${utils.externalVaultTagPrefix}_\\w+`, 'g')) || [];
+    expect(newIds).toHaveLength(3);
+    expect(new Set(newIds).size).toBe(3);
+    newIds.forEach(id => expect(id).toMatch(vaultTagIdRegex));
+    expect(result.startsWith('templateStart')).toBe(true);
+    expect(result.endsWith('templateEnd')).toBe(true);
+  });
+});
+
 describe('extractUndefinedVariableKey()', () => {
   it('extract nunjucks variable key', () => {
     expect(extractUndefinedVariableKey('{{name}}', {})).toEqual(['name']);
diff --git a/packages/insomnia/src/common/templating/utils.ts b/packages/insomnia/src/common/templating/utils.ts
index da0a65df99..f6cca8d99f 100644
--- a/packages/insomnia/src/common/templating/utils.ts
+++ b/packages/insomnia/src/common/templating/utils.ts
@@ -1,10 +1,12 @@
 import type { EditorFromTextArea, MarkerRange } from 'codemirror';
 
+import { generateId } from '~/common/misc';
 import type { NunjucksParsedTag, NunjucksParsedTagArg } from '~/common/templating/types';
 import { base64ToUtf8, utf8ToBase64 } from '~/common/utils/utf8-bytes';
 
 import { tokenizeArgs } from './tokenize-args';
 export { tokenizeArgs };
+
 import objectPath from './third_party/object-path';
 
 /**
@@ -163,3 +165,16 @@ export function extractNunjucksTagFromCoords(
 }
 
 export const responseTagRegex = new RegExp('{% *response *.* %}');
+
+// Unique id prefix for external vault tags
+export const externalVaultTagPrefix = 'externalVaultTag';
+export const generateExternalVaultTagId = () => generateId(externalVaultTagPrefix);
+const tagRegex = /{%[\s\S]+?%}/g;
+export const vaultTagIdRegex = new RegExp(`${externalVaultTagPrefix}_[a-z0-9]{32}`, 'g');
+export const containsExternalVaultTag = (input: string) => {
+  const hasTemplateTagSymbols = input.match(tagRegex);
+  return hasTemplateTagSymbols && input.includes(externalVaultTagPrefix);
+};
+// Replace the unique id in vault tag with a new unique id to avoid duplicates when pasting
+export const replaceVaultTagIdIfNeeded = (input: string) =>
+  input.replace(tagRegex, tag => tag.replace(vaultTagIdRegex, () => generateExternalVaultTagId()));
diff --git a/packages/insomnia/src/common/zod/deep-strict.test.ts b/packages/insomnia/src/common/zod/deep-strict.test.ts
new file mode 100644
index 0000000000..e90f1db2ef
--- /dev/null
+++ b/packages/insomnia/src/common/zod/deep-strict.test.ts
@@ -0,0 +1,298 @@
+import { describe, expect, it } from 'vitest';
+import { z } from 'zod/v4';
+
+import { deepStrict } from './deep-strict';
+
+describe('deepStrict', () => {
+  it('makes a plain object strict', () => {
+    const schema = deepStrict(z.object({ name: z.string() }));
+    expect(schema.safeParse({ name: 'a' }).success).toBe(true);
+    expect(schema.safeParse({ name: 'a', extra: 'x' }).success).toBe(false);
+  });
+
+  it('recurses into a nested object property', () => {
+    const schema = deepStrict(
+      z.object({
+        name: z.string(),
+        nested: z.object({ value: z.string() }),
+      }),
+    );
+    expect(schema.safeParse({ name: 'a', nested: { value: 'b' } }).success).toBe(true);
+    expect(schema.safeParse({ name: 'a', nested: { value: 'b', extra: 'x' } }).success).toBe(false);
+  });
+
+  it('recurses into array elements', () => {
+    const schema = deepStrict(z.array(z.object({ value: z.string() })));
+    expect(schema.safeParse([{ value: 'a' }]).success).toBe(true);
+    expect(schema.safeParse([{ value: 'a', extra: 'x' }]).success).toBe(false);
+  });
+
+  it('preserves optional() while still strictifying the inner object', () => {
+    const schema = deepStrict(z.object({ value: z.string() }).optional());
+    expect(schema.safeParse({ value: 'a' }).success).toBe(true);
+    expect(schema.safeParse({ value: 'a', extra: 'x' }).success).toBe(false);
+  });
+
+  it('preserves nullable() while still strictifying the inner object', () => {
+    const schema = deepStrict(z.object({ value: z.string() }).nullable());
+    expect(schema.safeParse(null).success).toBe(true);
+    expect(schema.safeParse({ value: 'a' }).success).toBe(true);
+    expect(schema.safeParse({ value: 'a', extra: 'x' }).success).toBe(false);
+  });
+
+  it('strictifies every branch of a plain union', () => {
+    const schema = deepStrict(z.union([z.object({ a: z.string() }), z.object({ b: z.string() })]));
+    expect(schema.safeParse({ a: 'x' }).success).toBe(true);
+    expect(schema.safeParse({ b: 'x' }).success).toBe(true);
+    expect(schema.safeParse({ a: 'x', extra: 'x' }).success).toBe(false);
+    expect(schema.safeParse({ b: 'x', extra: 'x' }).success).toBe(false);
+  });
+
+  it('strictifies every branch of a discriminated union while keeping the discriminator working', () => {
+    const schema = deepStrict(
+      z.discriminatedUnion('type', [
+        z.object({ type: z.literal('a'), value: z.string() }),
+        z.object({ type: z.literal('b'), count: z.number() }),
+      ]),
+    );
+    expect(schema.safeParse({ type: 'a', value: 'x' }).success).toBe(true);
+    expect(schema.safeParse({ type: 'b', count: 1 }).success).toBe(true);
+    expect(schema.safeParse({ type: 'a', value: 'x', extra: 'x' }).success).toBe(false);
+    expect(schema.safeParse({ type: 'b', count: 1, extra: 'x' }).success).toBe(false);
+  });
+
+  it('leaves non-object, non-container schemas (e.g. plain string) untouched', () => {
+    const schema = deepStrict(z.string());
+    expect(schema.safeParse('hello').success).toBe(true);
+    expect(schema.safeParse(1).success).toBe(false);
+  });
+
+  it('leaves each option of a primitive union untouched while reconstructing the union', () => {
+    const schema = deepStrict(z.union([z.string(), z.number()]));
+    expect(schema.safeParse('hello').success).toBe(true);
+    expect(schema.safeParse(1).success).toBe(true);
+    expect(schema.safeParse(true).success).toBe(false);
+  });
+
+  it('handles a combination of wrappers: optional array of strict objects', () => {
+    const schema = deepStrict(z.array(z.object({ value: z.string() })).optional());
+    expect(schema.safeParse([{ value: 'a' }]).success).toBe(true);
+    expect(schema.safeParse([{ value: 'a', extra: 'x' }]).success).toBe(false);
+  });
+
+  it('recurses into the value schema of a record', () => {
+    const schema = deepStrict(z.record(z.string(), z.object({ value: z.string() })));
+    expect(schema.safeParse({ k: { value: 'a' } }).success).toBe(true);
+    expect(schema.safeParse({ k: { value: 'a', extra: 'x' } }).success).toBe(false);
+  });
+
+  it('recurses into tuple items and the rest element', () => {
+    const schema = deepStrict(z.tuple([z.object({ value: z.string() })], z.object({ tag: z.string() })));
+    expect(schema.safeParse([{ value: 'a' }, { tag: 'x' }]).success).toBe(true);
+    expect(schema.safeParse([{ value: 'a', extra: 'x' }]).success).toBe(false);
+    expect(schema.safeParse([{ value: 'a' }, { tag: 'x', extra: 'x' }]).success).toBe(false);
+  });
+
+  it('recurses into both sides of an intersection', () => {
+    // Note: zod's strict-object validation is applied independently to each side of an
+    // intersection, so intersecting two *disjoint-key* strict objects can never succeed
+    // (each side rejects the other side's keys as unrecognized) -- that's an inherent zod
+    // limitation, not something deepStrict introduces. Use matching shapes on both sides so
+    // the test isolates deepStrict's own recursion behavior instead of that limitation.
+    const schema = deepStrict(
+      z.intersection(
+        z.object({ value: z.object({ nested: z.string() }) }),
+        z.object({ value: z.object({ nested: z.string() }) }),
+      ),
+    );
+    expect(schema.safeParse({ value: { nested: 'x' } }).success).toBe(true);
+    expect(schema.safeParse({ value: { nested: 'x', extra: 'z' } }).success).toBe(false);
+  });
+
+  it('recurses into a lazy (self-referential) schema without infinite looping', () => {
+    interface Tree {
+      value: string;
+      children?: Tree[];
+    }
+    const TreeSchema: z.ZodType<Tree> = z.lazy(() =>
+      z.object({
+        value: z.string(),
+        children: z.array(TreeSchema).optional(),
+      }),
+    );
+    const schema = deepStrict(TreeSchema);
+    expect(schema.safeParse({ value: 'a', children: [{ value: 'b' }] }).success).toBe(true);
+    expect(TreeSchema.safeParse({ value: 'a', children: [{ value: 'b', extra: 'x' }] }).success).toBe(true);
+    expect(schema.safeParse({ value: 'a', children: [{ value: 'b', extra: 'x' }] }).success).toBe(false);
+    expect(schema.safeParse({ value: 'a', extra: 'x' }).success).toBe(false);
+  });
+
+  it('preserves a refinement attached to the original object schema', () => {
+    const schema = deepStrict(
+      z.object({ a: z.number(), b: z.number() }).refine(d => d.a < d.b, 'a must be less than b'),
+    );
+    expect(schema.safeParse({ a: 1, b: 2 }).success).toBe(true);
+    expect(schema.safeParse({ a: 5, b: 1 }).success).toBe(false);
+    // the refinement doesn't loosen strictness -- unknown keys are still rejected
+    expect(schema.safeParse({ a: 1, b: 2, extra: 'x' }).success).toBe(false);
+  });
+
+  it('preserves an explicit catchall schema instead of forcing every unknown key closed', () => {
+    const schema = deepStrict(z.object({ value: z.string() }).catchall(z.number()));
+    expect(schema.safeParse({ value: 'a', extra: 1 }).success).toBe(true);
+    expect(schema.safeParse({ value: 'a', extra: 'not-a-number' }).success).toBe(false);
+  });
+
+  it('recurses into a nested object inside a catchall schema', () => {
+    const schema = deepStrict(z.object({ value: z.string() }).catchall(z.object({ nested: z.string() })));
+    expect(schema.safeParse({ value: 'a', extra: { nested: 'x' } }).success).toBe(true);
+    expect(schema.safeParse({ value: 'a', extra: { nested: 'x', bad: 'y' } }).success).toBe(false);
+  });
+
+  it('leaves omit() alone since it already compiles down to a plain strict-able object', () => {
+    const schema = deepStrict(z.object({ a: z.string(), b: z.object({ nested: z.string() }) }).omit({ a: true }));
+    expect(schema.safeParse({ b: { nested: 'x' } }).success).toBe(true);
+    expect(schema.safeParse({ b: { nested: 'x' }, a: 'y' } as any).success).toBe(false);
+    expect(schema.safeParse({ b: { nested: 'x', extra: 'y' } }).success).toBe(false);
+  });
+
+  it('recurses into the input side of a transform pipe (rejects unknown keys before the transform runs)', () => {
+    const schema = deepStrict(
+      z
+        .object({ a: z.string(), nested: z.object({ value: z.string() }) })
+        .transform(d => ({ ...d, computed: d.a.length })),
+    );
+    expect(schema.safeParse({ a: 'x', nested: { value: 'y', extra: 'z' } }).success).toBe(false);
+    expect(schema.safeParse({ a: 'x', nested: { value: 'y' }, extraTop: 'z' } as any).success).toBe(false);
+    const result = schema.safeParse({ a: 'x', nested: { value: 'y' } });
+    expect(result.success).toBe(true);
+    // the transform itself still runs on the strictified input
+    expect(result.success && result.data.computed).toBe(1);
+  });
+
+  it('recurses into both sides of a raw z.pipe()', () => {
+    const schema = deepStrict(
+      z.pipe(
+        z.object({ nested: z.object({ value: z.string() }) }),
+        z.object({ nested: z.object({ value: z.string() }) }),
+      ),
+    );
+    expect(schema.safeParse({ nested: { value: 'x' } }).success).toBe(true);
+    expect(schema.safeParse({ nested: { value: 'x', extra: 'y' } }).success).toBe(false);
+  });
+});
+
+// A composite schema shaped like the real request.ts model
+describe('deepStrict on a request-like composite schema', () => {
+  const AuthTypeBasicSchema = z.object({
+    type: z.literal('basic'),
+    username: z.string().optional(),
+    password: z.string().optional(),
+  });
+  const AuthTypeBearerSchema = z.object({
+    type: z.literal('bearer'),
+    token: z.string().optional(),
+  });
+  const AuthenticationSchema = z.union([
+    z.discriminatedUnion('type', [AuthTypeBasicSchema, AuthTypeBearerSchema]),
+    z.object({}),
+  ]);
+  const HeaderSchema = z.object({ name: z.string(), value: z.string() });
+  const BodyParamSchema = z.object({ name: z.string(), value: z.string().optional() });
+  const BodySchema = z.object({
+    mimeType: z.string().nullable().optional(),
+    params: z.array(BodyParamSchema).optional(),
+  });
+  const RequestLikeSchema = z.object({
+    name: z.string(),
+    metaSortKey: z.number(),
+    body: BodySchema.optional().default({}),
+    headers: z.array(HeaderSchema).optional().default([]),
+    authentication: AuthenticationSchema.optional().default({}),
+  });
+
+  const strictSchema = deepStrict(RequestLikeSchema);
+
+  function baseDoc(overrides: Record<string, any> = {}): Record<string, any> {
+    return {
+      name: 'Test',
+      metaSortKey: 0,
+      body: { mimeType: 'application/json', params: [{ name: 'a', value: '1' }] },
+      headers: [{ name: 'X', value: 'Y' }],
+      authentication: { type: 'basic', username: 'u' },
+      ...overrides,
+    };
+  }
+
+  it('accepts a fully valid request-like document', () => {
+    expect(strictSchema.safeParse(baseDoc()).success).toBe(true);
+  });
+
+  it('rejects an unknown top-level key', () => {
+    expect(strictSchema.safeParse(baseDoc({ extraTopLevel: 'x' })).success).toBe(false);
+  });
+
+  it('rejects an unknown key nested inside the body object', () => {
+    const doc = baseDoc();
+    doc.body = { ...doc.body, extraBodyField: 'x' };
+    expect(strictSchema.safeParse(doc).success).toBe(false);
+  });
+
+  it('rejects an unknown key two levels deep inside a body.params array item', () => {
+    const doc = baseDoc();
+    doc.body = { ...doc.body, params: [{ name: 'a', extraParamField: 'x' }] };
+    expect(strictSchema.safeParse(doc).success).toBe(false);
+  });
+
+  it('rejects an unknown key on a headers array item', () => {
+    const doc = baseDoc();
+    doc.headers = [{ name: 'X', value: 'Y', extraHeaderField: 'x' }];
+    expect(strictSchema.safeParse(doc).success).toBe(false);
+  });
+
+  it('rejects an unknown key on the matched branch of the authentication union', () => {
+    const doc = baseDoc();
+    doc.authentication = { type: 'basic', username: 'u', extraAuthField: 'x' };
+    expect(strictSchema.safeParse(doc).success).toBe(false);
+  });
+
+  it('accepts the empty-object fallback branch of authentication when it carries no keys', () => {
+    expect(strictSchema.safeParse(baseDoc({ authentication: {} })).success).toBe(true);
+  });
+
+  it('rejects an unrecognized authentication type across every union branch instead of silently stripping it', () => {
+    const doc = baseDoc({ authentication: { type: 'someFutureAuthType', apiKey: 'secret' } });
+    const result = strictSchema.safeParse(doc);
+    expect(result.success).toBe(false);
+    if (result.success) {
+      return;
+    }
+    // The discriminated union has no matching discriminator, and the permissive `z.object({})`
+    // fallback is strict too now, so it rejects the unrecognized `type`/`apiKey` keys instead of
+    // silently stripping them -- both branches fail, surfacing as one `invalid_union` issue.
+    const authIssue = result.error.issues.find(issue => issue.path[0] === 'authentication');
+    expect(authIssue?.code).toBe('invalid_union');
+  });
+
+  it('omit and extend should preserve strictness', () => {
+    const newSchema = RequestLikeSchema.omit({
+      metaSortKey: true,
+    }).extend({
+      newField: z
+        .object({
+          foo: z.string(),
+          bar: z.string(),
+        })
+        .optional(),
+    });
+    const doc = baseDoc({
+      newField: { foo: 'x', bar: 'y', extra: 'extra' },
+    });
+    expect(newSchema.safeParse(doc).success).toBe(true);
+    const strictSchema = deepStrict(newSchema);
+    const strictResult = strictSchema.safeParse(doc);
+    expect(strictResult.success).toBe(false);
+    expect(strictResult.error?.issues.find(issue => issue.path[0] === 'newField')?.code).toBe('unrecognized_keys');
+    expect(strictResult.error?.issues.length).toBe(2);
+  });
+});
diff --git a/packages/insomnia/src/common/zod/deep-strict.ts b/packages/insomnia/src/common/zod/deep-strict.ts
new file mode 100644
index 0000000000..3a7df41016
--- /dev/null
+++ b/packages/insomnia/src/common/zod/deep-strict.ts
@@ -0,0 +1,86 @@
+import { z } from 'zod/v4';
+
+type WalkableDef =
+  | z.core.$ZodObjectDef
+  | z.core.$ZodArrayDef
+  | z.core.$ZodOptionalDef
+  | z.core.$ZodNullableDef
+  | z.core.$ZodDefaultDef
+  | z.core.$ZodUnionDef
+  | z.core.$ZodDiscriminatedUnionDef
+  | z.core.$ZodRecordDef
+  | z.core.$ZodTupleDef
+  | z.core.$ZodIntersectionDef
+  | z.core.$ZodLazyDef
+  | z.core.$ZodPipeDef;
+
+// Iterator and recursively apply strict mode to all nested Zod schemas
+export function deepStrict<T extends z.ZodType>(schema: T): T {
+  const def = schema.def as WalkableDef;
+  switch (def.type) {
+    case 'object': {
+      const shape: Record<string, z.ZodType> = {};
+      for (const key of Object.keys(def.shape)) {
+        shape[key] = deepStrict(def.shape[key] as z.ZodType);
+      }
+      // Preserve an explicit catchall (e.g. `.passthrough()`/`.catchall(x)`) instead of
+      // silently overriding the author's unknown-key handling; only default to `.strict()`
+      let rebuilt: z.ZodObject = def.catchall
+        ? z.object(shape).catchall(deepStrict(def.catchall as z.ZodType))
+        : z.object(shape).strict();
+      // Reattach any refinements/checks (e.g. `.refine()`/`.superRefine()`) attached to the
+      // original object schema -- rebuilding via `z.object(shape)` otherwise drops them.
+      for (const check of def.checks ?? []) {
+        rebuilt = rebuilt.check(check as z.core.$ZodCheck<Record<string, unknown>>);
+      }
+      return rebuilt as unknown as T;
+    }
+    case 'array': {
+      return deepStrict(def.element as z.ZodType).array() as unknown as T;
+    }
+    case 'optional': {
+      return deepStrict(def.innerType as z.ZodType).optional() as unknown as T;
+    }
+    case 'nullable': {
+      return deepStrict(def.innerType as z.ZodType).nullable() as unknown as T;
+    }
+    case 'default': {
+      return deepStrict(def.innerType as z.ZodType).default(def.defaultValue) as unknown as T;
+    }
+    case 'union': {
+      const options = def.options.map(option => deepStrict(option as z.ZodType));
+      return 'discriminator' in def
+        ? (z.discriminatedUnion(
+            def.discriminator,
+            options as unknown as [z.core.$ZodTypeDiscriminable, ...z.core.$ZodTypeDiscriminable[]],
+          ) as unknown as T)
+        : (z.union(options) as unknown as T);
+    }
+    case 'record': {
+      return z.record(def.keyType, deepStrict(def.valueType as z.ZodType)) as unknown as T;
+    }
+    case 'tuple': {
+      const items = def.items.map(item => deepStrict(item as z.ZodType)) as [z.ZodType, ...z.ZodType[]];
+      return def.rest
+        ? (z.tuple(items, deepStrict(def.rest as z.ZodType)) as unknown as T)
+        : (z.tuple(items) as unknown as T);
+    }
+    case 'intersection': {
+      return z.intersection(deepStrict(def.left as z.ZodType), deepStrict(def.right as z.ZodType)) as unknown as T;
+    }
+    case 'lazy': {
+      // Keep the recursion lazy
+      return z.lazy(() => deepStrict(def.getter() as z.ZodType)) as unknown as T;
+    }
+    case 'pipe': {
+      // `.transform()` compiles down to a pipe whose `out` side is a `$ZodTransform` (a bare
+      // function wrapper, not a shape to strictify) -- deepStrict is a no-op on it via the
+      // default case below. Recursing into `in` is what makes e.g. `object.transform(fn)`
+      // still reject unknown keys before the transform ever runs.
+      return z.pipe(deepStrict(def.in as z.ZodType), deepStrict(def.out as z.ZodType)) as unknown as T;
+    }
+    default: {
+      return schema;
+    }
+  }
+}
diff --git a/packages/insomnia/src/entry.client.tsx b/packages/insomnia/src/entry.client.tsx
index 6951ac0334..f5083725f2 100644
--- a/packages/insomnia/src/entry.client.tsx
+++ b/packages/insomnia/src/entry.client.tsx
@@ -9,17 +9,25 @@ import { HydratedRouter } from 'react-router/dom';
 
 import { insomniaFetch } from '~/common/insomnia-fetch';
 import { setTemplatingDbAuthToken } from '~/common/templating/liquid-extension-worker';
+import { migrateKonnectProjectsIfUnambiguous } from '~/konnect/migrate-konnect-organization';
 import { initRuntime } from '~/runtimes';
 import { rendererRuntime } from '~/runtimes/runtime.renderer';
 import { migrateFromLocalStorage, type SessionData, setSessionData, setVaultSessionData } from '~/ui/account/session';
 import { database as clientDatabase } from '~/ui/database.client';
+import { refreshKonnectAccess } from '~/ui/organization-utils';
 import { applyColorScheme } from '~/ui/plugins/misc';
 import { createServicesProxy } from '~/ui/services-proxy';
 import { clearOAuthWindowSessionId } from '~/ui/spawn-oauth-window';
 import { getInitialEntry } from '~/ui/utils/router';
 
 import { configureV3ClientDefaults } from './common/configure-v3-client';
-import { getInsomniaSession, getInsomniaVaultKey, getInsomniaVaultSalt, getSkipOnboarding } from './common/constants';
+import {
+  getInsomniaSession,
+  getInsomniaVaultKey,
+  getInsomniaVaultSalt,
+  getSkipOnboarding,
+  HAS_SEEN_ONBOARDING_KEY,
+} from './common/constants';
 import { HtmlElementWrapper } from './ui/components/html-element-wrapper';
 import { showModal } from './ui/components/modals';
 import { AlertModal } from './ui/components/modals/alert-modal';
@@ -72,7 +80,7 @@ try {
   // we need to inject state into localStorage
   const skipOnboarding = getSkipOnboarding();
   if (skipOnboarding) {
-    window.localStorage.setItem('hasSeenOnboardingV13', skipOnboarding.toString());
+    window.localStorage.setItem(HAS_SEEN_ONBOARDING_KEY, skipOnboarding.toString());
     window.localStorage.setItem('hasUserLoggedInBefore', skipOnboarding.toString());
   }
 } catch (e) {
@@ -145,6 +153,23 @@ if (appSettings.clearOAuth2SessionOnRestart) {
 
 applyColorScheme(appSettings);
 
+// Runs before the router hydrates so every loader can assume Konnect projects already live under
+// the Konnect organization. The ambiguous case is left for the user to resolve in the UI.
+try {
+  const { id: sessionId, accountId } = await services.userSession.get();
+  if (accountId) {
+    try {
+      await migrateKonnectProjectsIfUnambiguous(accountId);
+    } catch (e) {
+      console.log('[konnect] Failed to migrate Konnect projects', e);
+    }
+  }
+  // Resolved here, after the migration, so render-time readers of Konnect access stay synchronous.
+  await refreshKonnectAccess(sessionId, accountId);
+} catch (e) {
+  console.log('[konnect] Failed to resolve Konnect access', e);
+}
+
 const initialEntry = await getInitialEntry();
 
 // `getInitialEntry` returns either a bare pathname string or an object carrying router
diff --git a/packages/insomnia/src/entry.main.ts b/packages/insomnia/src/entry.main.ts
index 321f4d3977..5659b7156e 100644
--- a/packages/insomnia/src/entry.main.ts
+++ b/packages/insomnia/src/entry.main.ts
@@ -123,7 +123,9 @@ app.on('ready', async () => {
   disableSpellcheckerDownload();
 
   // Default-deny web-API permissions; only allow-listed ones are granted (see permission-policy.ts).
-  session.defaultSession.setPermissionRequestHandler((_webContents, permission, callback) => callback(isPermissionAllowed(permission)));
+  session.defaultSession.setPermissionRequestHandler((_webContents, permission, callback) =>
+    callback(isPermissionAllowed(permission)),
+  );
   session.defaultSession.setPermissionCheckHandler((_webContents, permission) => isPermissionAllowed(permission));
 
   if (isDevelopment()) {
@@ -345,6 +347,7 @@ const _launchApp = async () => {
 async function _createModelInstances() {
   await services.stats.get();
   await services.settings.getOrCreate();
+
   try {
     const scratchpadProject = await services.project.getById(models.project.SCRATCHPAD_PROJECT_ID);
     const scratchPad = await services.workspace.getById(models.workspace.SCRATCHPAD_WORKSPACE_ID);
diff --git a/packages/insomnia/src/entry.preload.ts b/packages/insomnia/src/entry.preload.ts
index 8c2ce624ff..3ea0c7f778 100644
--- a/packages/insomnia/src/entry.preload.ts
+++ b/packages/insomnia/src/entry.preload.ts
@@ -150,9 +150,9 @@ const electronStorage: electronStorageBridgeAPI = {
   setItem: (key, value) => invokeWithNormalizedError('electronStorage.setItem', key, value),
 };
 
-const invokeSyncMethod = async <T>(methodName: string, ...args: unknown[]) => {
+const invokeSyncMethod = async <T>(workspaceId: string, methodName: string, ...args: unknown[]) => {
   try {
-    return (await invokeWithNormalizedError('sync.invoke', methodName, ...args)) as T;
+    return (await invokeWithNormalizedError('sync.invoke', workspaceId, methodName, ...args)) as T;
   } catch (error) {
     if (isUserAbortResolveMergeConflictError(error)) {
       throw new UserAbortResolveMergeConflictError(
@@ -164,39 +164,45 @@ const invokeSyncMethod = async <T>(methodName: string, ...args: unknown[]) => {
   }
 };
 
+const invokeGlobalSyncMethod = async <T>(methodName: string, ...args: unknown[]) => {
+  return (await invokeWithNormalizedError('sync.invokeGlobal', methodName, ...args)) as T;
+};
+
 const sync: SyncBridgeAPI = {
-  archiveProject: () => invokeSyncMethod('archiveProject'),
-  checkout: (...args) => invokeSyncMethod('checkout', ...args),
-  compareRemoteBranch: () => invokeSyncMethod('compareRemoteBranch'),
-  fork: (...args) => invokeSyncMethod('fork', ...args),
-  getActiveBackendProject: () => invokeSyncMethod('getActiveBackendProject'),
-  getBranchNames: () => invokeSyncMethod('getBranchNames'),
-  getCurrentBranchName: () => invokeSyncMethod('getCurrentBranchName'),
-  getHistory: (...args) => invokeSyncMethod('getHistory', ...args),
-  getHistoryCount: () => invokeSyncMethod('getHistoryCount'),
-  getRemoteBranchNames: () => invokeSyncMethod('getRemoteBranchNames'),
-  getVersion: () => invokeSyncMethod('getVersion'),
-  hasBackendProject: () => invokeSyncMethod('hasBackendProject'),
-  localBackendProjects: () => invokeSyncMethod('localBackendProjects'),
-  merge: (...args) => invokeSyncMethod('merge', ...args),
-  pull: (...args) => invokeSyncMethod('pull', ...args),
+  archiveProject: workspaceId => invokeSyncMethod(workspaceId, 'archiveProject'),
+  checkout: (workspaceId, ...args) => invokeSyncMethod(workspaceId, 'checkout', ...args),
+  compareRemoteBranch: workspaceId => invokeSyncMethod(workspaceId, 'compareRemoteBranch'),
+  fork: (workspaceId, ...args) => invokeSyncMethod(workspaceId, 'fork', ...args),
+  getActiveBackendProject: workspaceId => invokeSyncMethod(workspaceId, 'getActiveBackendProject'),
+  getBranchNames: workspaceId => invokeSyncMethod(workspaceId, 'getBranchNames'),
+  getCurrentBranchName: workspaceId => invokeSyncMethod(workspaceId, 'getCurrentBranchName'),
+  getHistory: (workspaceId, ...args) => invokeSyncMethod(workspaceId, 'getHistory', ...args),
+  getHistoryCount: workspaceId => invokeSyncMethod(workspaceId, 'getHistoryCount'),
+  getRemoteBranchNames: workspaceId => invokeSyncMethod(workspaceId, 'getRemoteBranchNames'),
+  getVersion: workspaceId => invokeSyncMethod(workspaceId, 'getVersion'),
+  hasBackendProject: workspaceId => invokeSyncMethod(workspaceId, 'hasBackendProject'),
+  localBackendProjects: () => invokeGlobalSyncMethod('localBackendProjects'),
+  merge: (workspaceId, ...args) => invokeSyncMethod(workspaceId, 'merge', ...args),
+  pull: (workspaceId, ...args) => invokeSyncMethod(workspaceId, 'pull', ...args),
   pullRemoteBackendProject: options => invokeWithNormalizedError('sync.pullRemoteBackendProject', options),
-  push: (...args) => invokeSyncMethod('push', ...args),
-  remoteBackendProjects: (...args) => invokeSyncMethod('remoteBackendProjects', ...args),
-  remoteBackendProjectsOfTeam: (...args) => invokeSyncMethod('remoteBackendProjectsOfTeam', ...args),
-  removeBackendProjectsForRoot: (...args) => invokeSyncMethod('removeBackendProjectsForRoot', ...args),
-  removeBranch: (...args) => invokeSyncMethod('removeBranch', ...args),
-  removeRemoteBranch: (...args) => invokeSyncMethod('removeRemoteBranch', ...args),
-  rollback: (...args) => invokeSyncMethod('rollback', ...args),
-  rollbackToLatest: (...args) => invokeSyncMethod('rollbackToLatest', ...args),
+  push: (workspaceId, ...args) => invokeSyncMethod(workspaceId, 'push', ...args),
+  remoteBackendProjects: (...args) => invokeGlobalSyncMethod('remoteBackendProjects', ...args),
+  remoteBackendProjectsOfTeam: (...args) => invokeGlobalSyncMethod('remoteBackendProjectsOfTeam', ...args),
+  hasBackendProjectForRootDocument: (...args) => invokeGlobalSyncMethod('hasBackendProjectForRootDocument', ...args),
+  removeBackendProjectsForRoot: (...args) => invokeGlobalSyncMethod('removeBackendProjectsForRoot', ...args),
+  archiveBackendProject: (...args) => invokeGlobalSyncMethod('archiveBackendProject', ...args),
+  removeBranch: (workspaceId, ...args) => invokeSyncMethod(workspaceId, 'removeBranch', ...args),
+  removeRemoteBranch: (workspaceId, ...args) => invokeSyncMethod(workspaceId, 'removeRemoteBranch', ...args),
+  rollback: (workspaceId, ...args) => invokeSyncMethod(workspaceId, 'rollback', ...args),
+  rollbackToLatest: (workspaceId, ...args) => invokeSyncMethod(workspaceId, 'rollbackToLatest', ...args),
   resolveConflict: options => ipcRenderer.send('sync.resolveConflict', options),
   cancelConflict: options => ipcRenderer.send('sync.cancelConflict', options),
-  stage: (...args) => invokeSyncMethod('stage', ...args),
-  status: (...args) => invokeSyncMethod('status', ...args),
-  switchAndCreateBackendProjectIfNotExist: (...args) =>
-    invokeSyncMethod('switchAndCreateBackendProjectIfNotExist', ...args),
-  takeSnapshot: (...args) => invokeSyncMethod('takeSnapshot', ...args),
-  unstage: (...args) => invokeSyncMethod('unstage', ...args),
+  stage: (workspaceId, ...args) => invokeSyncMethod(workspaceId, 'stage', ...args),
+  status: (workspaceId, ...args) => invokeSyncMethod(workspaceId, 'status', ...args),
+  switchAndCreateBackendProjectIfNotExist: (workspaceId, ...args) =>
+    invokeSyncMethod(workspaceId, 'switchAndCreateBackendProjectIfNotExist', ...args),
+  takeSnapshot: (workspaceId, ...args) => invokeSyncMethod(workspaceId, 'takeSnapshot', ...args),
+  unstage: (workspaceId, ...args) => invokeSyncMethod(workspaceId, 'unstage', ...args),
 };
 
 const git: GitServiceAPI = {
diff --git a/packages/insomnia/src/konnect/__tests__/migrate-konnect-organization.test.ts b/packages/insomnia/src/konnect/__tests__/migrate-konnect-organization.test.ts
new file mode 100644
index 0000000000..e52173bf7e
--- /dev/null
+++ b/packages/insomnia/src/konnect/__tests__/migrate-konnect-organization.test.ts
@@ -0,0 +1,204 @@
+/**
+ * Tests run against the in-memory NeDB initialized by setup-vitest.ts.
+ * localStorage is stubbed per-test to supply the cached organization list.
+ */
+
+import { initDatabase, models, services } from 'insomnia-data';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { mainDatabase } from '../../main/database.main';
+import {
+  detectKonnectOrgMigration,
+  migrateKonnectProjectsIfUnambiguous,
+  runKonnectOrgMigration,
+} from '../migrate-konnect-organization';
+
+const ACCOUNT_ID = 'acct_1';
+const ORG_A = 'org_a';
+const ORG_B = 'org_b';
+const KONNECT_ORG_ID = models.organization.getKonnectOrganizationId(ACCOUNT_ID);
+
+function stubLocalStorage(initial: Record<string, string> = {}) {
+  const store = new Map(Object.entries(initial));
+  vi.stubGlobal('localStorage', {
+    getItem: (key: string) => store.get(key) ?? null,
+    setItem: (key: string, value: string) => void store.set(key, value),
+    removeItem: (key: string) => void store.delete(key),
+  });
+  return store;
+}
+
+async function createKonnectProject(parentId: string, controlPlaneId: string) {
+  const project = await services.project.create({
+    name: `CP ${controlPlaneId}`,
+    parentId,
+    konnectControlPlaneId: controlPlaneId,
+  });
+  await services.workspace.create({
+    name: `Service of ${controlPlaneId}`,
+    parentId: project._id,
+    scope: 'collection',
+    konnectServiceId: `svc-${controlPlaneId}`,
+  });
+  return project;
+}
+
+const listKonnectProjects = () => services.project.list({ konnectControlPlaneId: { $exists: true, $ne: null } });
+
+beforeEach(async () => {
+  await initDatabase(mainDatabase, { inMemoryOnly: true }, true);
+  stubLocalStorage({
+    [`${ACCOUNT_ID}:spaces`]: JSON.stringify([
+      { id: ORG_A, name: 'Org A' },
+      { id: ORG_B, name: 'Org B' },
+    ]),
+  });
+});
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+});
+
+describe('detectKonnectOrgMigration', () => {
+  it('reports nothing to do when there are no Konnect projects', async () => {
+    expect(await detectKonnectOrgMigration({ accountId: ACCOUNT_ID })).toEqual({ status: 'none', groups: [] });
+  });
+
+  it('reports a single source organization as auto-migratable', async () => {
+    await createKonnectProject(ORG_A, 'cp-1');
+    await createKonnectProject(ORG_A, 'cp-2');
+
+    const plan = await detectKonnectOrgMigration({ accountId: ACCOUNT_ID });
+
+    expect(plan.status).toBe('auto');
+    expect(plan.groups).toEqual([
+      { organizationId: ORG_A, organizationName: 'Org A', projectCount: 2, workspaceCount: 2 },
+    ]);
+  });
+
+  it('reports multiple source organizations as a conflict', async () => {
+    await createKonnectProject(ORG_A, 'cp-1');
+    await createKonnectProject(ORG_B, 'cp-2');
+
+    const plan = await detectKonnectOrgMigration({ accountId: ACCOUNT_ID });
+
+    expect(plan.status).toBe('conflict');
+    expect(plan.groups.map(g => g.organizationId).sort()).toEqual([ORG_A, ORG_B]);
+  });
+
+  it('ignores Konnect projects owned by another account on the same machine', async () => {
+    await createKonnectProject('org_someone_else', 'cp-1');
+
+    expect(await detectKonnectOrgMigration({ accountId: ACCOUNT_ID })).toEqual({ status: 'none', groups: [] });
+  });
+
+  it('ignores Konnect projects that already live under the Konnect organization', async () => {
+    await createKonnectProject(KONNECT_ORG_ID, 'cp-1');
+
+    expect(await detectKonnectOrgMigration({ accountId: ACCOUNT_ID })).toEqual({ status: 'none', groups: [] });
+  });
+
+  it('ignores regular projects, which omit konnectControlPlaneId entirely', async () => {
+    await services.project.create({ name: 'Regular', parentId: ORG_A });
+
+    expect(await detectKonnectOrgMigration({ accountId: ACCOUNT_ID })).toEqual({ status: 'none', groups: [] });
+  });
+});
+
+describe('runKonnectOrgMigration', () => {
+  it('re-parents the chosen organization and deletes the rest with their descendants', async () => {
+    await createKonnectProject(ORG_A, 'cp-1');
+    const discarded = await createKonnectProject(ORG_B, 'cp-2');
+
+    await runKonnectOrgMigration({ accountId: ACCOUNT_ID, keepOrganizationId: ORG_A });
+
+    const projects = await listKonnectProjects();
+    expect(projects).toHaveLength(1);
+    expect(projects[0].parentId).toBe(KONNECT_ORG_ID);
+    expect(projects[0].konnectControlPlaneId).toBe('cp-1');
+
+    expect(await services.workspace.count({ parentId: discarded._id })).toBe(0);
+  });
+
+  it("leaves another account's Konnect projects untouched", async () => {
+    await createKonnectProject(ORG_A, 'cp-1');
+    await createKonnectProject('org_someone_else', 'cp-other');
+
+    await runKonnectOrgMigration({ accountId: ACCOUNT_ID, keepOrganizationId: ORG_A });
+
+    const projects = await listKonnectProjects();
+    expect(projects.map(p => p.parentId).sort()).toEqual([KONNECT_ORG_ID, 'org_someone_else'].sort());
+  });
+
+  it('carries the last-synced timestamp over to the Konnect organization', async () => {
+    const store = stubLocalStorage({
+      [`${ACCOUNT_ID}:spaces`]: JSON.stringify([{ id: ORG_A, name: 'Org A' }]),
+      [`${ORG_A}:konnect-last-synced-at`]: '1700000000000',
+    });
+    await createKonnectProject(ORG_A, 'cp-1');
+
+    await runKonnectOrgMigration({ accountId: ACCOUNT_ID, keepOrganizationId: ORG_A });
+
+    expect(store.get(`${KONNECT_ORG_ID}:konnect-last-synced-at`)).toBe('1700000000000');
+    expect(store.get(`${ORG_A}:konnect-last-synced-at`)).toBeUndefined();
+  });
+
+  it('clears the last-synced timestamp of every source organization but leaves orphans alone', async () => {
+    const store = stubLocalStorage({
+      [`${ACCOUNT_ID}:spaces`]: JSON.stringify([
+        { id: ORG_A, name: 'Org A' },
+        { id: ORG_B, name: 'Org B' },
+      ]),
+      [`${ORG_A}:konnect-last-synced-at`]: '1700000000000',
+      [`${ORG_B}:konnect-last-synced-at`]: '1600000000000',
+      ['org_someone_else:konnect-last-synced-at']: '1500000000000',
+    });
+    await createKonnectProject(ORG_A, 'cp-1');
+    await createKonnectProject(ORG_B, 'cp-2');
+    await createKonnectProject('org_someone_else', 'cp-other');
+
+    await runKonnectOrgMigration({ accountId: ACCOUNT_ID, keepOrganizationId: ORG_A });
+
+    expect(store.get(`${KONNECT_ORG_ID}:konnect-last-synced-at`)).toBe('1700000000000');
+    expect(store.get(`${ORG_A}:konnect-last-synced-at`)).toBeUndefined();
+    expect(store.get(`${ORG_B}:konnect-last-synced-at`)).toBeUndefined();
+    expect(store.get('org_someone_else:konnect-last-synced-at')).toBe('1500000000000');
+  });
+
+  it('neither re-parents nor deletes regular projects', async () => {
+    await createKonnectProject(ORG_A, 'cp-1');
+    const keptRegular = await services.project.create({ name: 'Regular A', parentId: ORG_A });
+    const discardedRegular = await services.project.create({ name: 'Regular B', parentId: ORG_B });
+
+    await runKonnectOrgMigration({ accountId: ACCOUNT_ID, keepOrganizationId: ORG_A });
+
+    expect((await services.project.getById(keptRegular._id))?.parentId).toBe(ORG_A);
+    expect((await services.project.getById(discardedRegular._id))?.parentId).toBe(ORG_B);
+  });
+});
+
+describe('migrateKonnectProjectsIfUnambiguous', () => {
+  it('migrates automatically and is idempotent on a second run', async () => {
+    await createKonnectProject(ORG_A, 'cp-1');
+
+    expect(await migrateKonnectProjectsIfUnambiguous(ACCOUNT_ID)).toEqual({ status: 'none', groups: [] });
+
+    const afterFirstRun = await listKonnectProjects();
+    expect(afterFirstRun.map(p => p.parentId)).toEqual([KONNECT_ORG_ID]);
+
+    expect(await migrateKonnectProjectsIfUnambiguous(ACCOUNT_ID)).toEqual({ status: 'none', groups: [] });
+    expect(await listKonnectProjects()).toHaveLength(1);
+  });
+
+  it('defers to the user when the source organization is ambiguous', async () => {
+    await createKonnectProject(ORG_A, 'cp-1');
+    await createKonnectProject(ORG_B, 'cp-2');
+
+    const plan = await migrateKonnectProjectsIfUnambiguous(ACCOUNT_ID);
+
+    expect(plan.status).toBe('conflict');
+    // Nothing moved until the user picks one.
+    const projects = await listKonnectProjects();
+    expect(projects.map(p => p.parentId).sort()).toEqual([ORG_A, ORG_B]);
+  });
+});
diff --git a/packages/insomnia/src/konnect/migrate-konnect-organization.ts b/packages/insomnia/src/konnect/migrate-konnect-organization.ts
new file mode 100644
index 0000000000..946c0613d1
--- /dev/null
+++ b/packages/insomnia/src/konnect/migrate-konnect-organization.ts
@@ -0,0 +1,156 @@
+import type { Organization } from 'insomnia-api';
+import type { Project } from 'insomnia-data';
+import { models, services } from 'insomnia-data';
+
+import { database } from '~/common/database';
+import { projectLock } from '~/common/project';
+
+export interface KonnectMigrationGroup {
+  organizationId: string;
+  organizationName: string;
+  projectCount: number;
+  workspaceCount: number;
+}
+
+export interface KonnectMigrationPlan {
+  /** `auto` means a single source organization, `conflict` means the user has to choose one. */
+  status: 'none' | 'auto' | 'conflict';
+  groups: KonnectMigrationGroup[];
+}
+
+const lastSyncedAtKey = (organizationId: string) => `${organizationId}:konnect-last-synced-at`;
+
+function readCachedOrganizations(accountId: string): Organization[] {
+  try {
+    return JSON.parse(localStorage.getItem(`${accountId}:spaces`) || '[]') as Organization[];
+  } catch {
+    return [];
+  }
+}
+
+async function listMigratableKonnectProjects(accountId: string): Promise<{
+  projects: Project[];
+  organizationNameById: Map<string, string>;
+}> {
+  const organizationNameById = new Map(readCachedOrganizations(accountId).map(o => [o.id, o.name]));
+  if (organizationNameById.size === 0) {
+    return { projects: [], organizationNameById };
+  }
+
+  // Konnect projects parented to an organization this account does not belong to came from another
+  // account sharing the same database; they are deliberately left alone.
+  // `konnectControlPlaneId` is an optional key, so non-Konnect projects omit it entirely and NeDB's
+  // `$ne: null` alone would match them.
+  const projects = await services.project.list({
+    konnectControlPlaneId: { $exists: true, $ne: null },
+    parentId: { $in: [...organizationNameById.keys()] },
+  });
+
+  return { projects, organizationNameById };
+}
+
+export async function detectKonnectOrgMigration({ accountId }: { accountId: string }): Promise<KonnectMigrationPlan> {
+  if (!accountId) {
+    return { status: 'none', groups: [] };
+  }
+
+  const { projects, organizationNameById } = await listMigratableKonnectProjects(accountId);
+  if (projects.length === 0) {
+    return { status: 'none', groups: [] };
+  }
+
+  const projectsByOrganizationId = new Map<string, Project[]>();
+  for (const project of projects) {
+    projectsByOrganizationId.set(project.parentId, [
+      ...(projectsByOrganizationId.get(project.parentId) ?? []),
+      project,
+    ]);
+  }
+
+  const groups: KonnectMigrationGroup[] = [];
+  for (const [organizationId, organizationProjects] of projectsByOrganizationId) {
+    const workspaceCounts = await Promise.all(
+      organizationProjects.map(project => services.workspace.count({ parentId: project._id })),
+    );
+    groups.push({
+      organizationId,
+      organizationName: organizationNameById.get(organizationId) ?? organizationId,
+      projectCount: organizationProjects.length,
+      workspaceCount: workspaceCounts.reduce((total, count) => total + count, 0),
+    });
+  }
+
+  groups.sort((a, b) => b.projectCount - a.projectCount || a.organizationName.localeCompare(b.organizationName));
+
+  return { status: groups.length > 1 ? 'conflict' : 'auto', groups };
+}
+
+/**
+ * Runs the migration only when there is exactly one source organization. The ambiguous case is
+ * surfaced to the user instead, since it means discarding one organization's Konnect data.
+ */
+export async function migrateKonnectProjectsIfUnambiguous(accountId: string): Promise<KonnectMigrationPlan> {
+  const plan = await detectKonnectOrgMigration({ accountId });
+  if (plan.status === 'auto') {
+    await runKonnectOrgMigration({ accountId, keepOrganizationId: plan.groups[0].organizationId });
+    return { status: 'none', groups: [] };
+  }
+  return plan;
+}
+
+/**
+ * Re-parents the chosen organization's Konnect projects onto the account-wide Konnect organization
+ * and discards the rest. Idempotent: once nothing matches, `detectKonnectOrgMigration` returns
+ * `none` and this is never called again.
+ */
+export async function runKonnectOrgMigration({
+  accountId,
+  keepOrganizationId,
+}: {
+  accountId: string;
+  keepOrganizationId: string;
+}): Promise<void> {
+  if (!accountId) {
+    return;
+  }
+  const konnectOrganizationId = models.organization.getKonnectOrganizationId(accountId);
+
+  await projectLock.lock();
+  try {
+    const { projects } = await listMigratableKonnectProjects(accountId);
+    const projectsToKeep = projects.filter(p => p.parentId === keepOrganizationId);
+    const projectsToRemove = projects.filter(p => p.parentId !== keepOrganizationId);
+
+    if (projectsToKeep.length > 0) {
+      const bufferId = await database.bufferChangesIndefinitely();
+      try {
+        for (const project of projectsToKeep) {
+          await services.project.update(project, { parentId: konnectOrganizationId });
+        }
+      } finally {
+        await database.flushChanges(bufferId);
+      }
+    }
+
+    // `project.remove` buffers and flushes internally, so it must not run inside the buffer above.
+    for (const project of projectsToRemove) {
+      await services.project.remove(project);
+    }
+
+    try {
+      const previousLastSyncedAt = localStorage.getItem(lastSyncedAtKey(keepOrganizationId));
+      if (previousLastSyncedAt && !localStorage.getItem(lastSyncedAtKey(konnectOrganizationId))) {
+        localStorage.setItem(lastSyncedAtKey(konnectOrganizationId), previousLastSyncedAt);
+      }
+      // `projects` was captured before the re-parent, so it still carries the source organization
+      // ids. Orphans are absent from it and keep their key, matching how their data is left alone.
+      for (const sourceOrganizationId of new Set([keepOrganizationId, ...projects.map(p => p.parentId)])) {
+        localStorage.removeItem(lastSyncedAtKey(sourceOrganizationId));
+      }
+    } catch {
+      // A stale timestamp is cosmetic; never fail the migration over it.
+    }
+  } finally {
+    await projectLock.unlock();
+  }
+}
diff --git a/packages/insomnia/src/konnect/sync.ts b/packages/insomnia/src/konnect/sync.ts
index bef35fdf51..021bf50ed1 100644
--- a/packages/insomnia/src/konnect/sync.ts
+++ b/packages/insomnia/src/konnect/sync.ts
@@ -700,13 +700,13 @@ export async function syncKonnect({ pat, organizationId, signal, onProgress }: S
   };
 
   try {
-    // Load all existing Konnect projects up front to avoid per Control Plane queries
-    const existingProjects = (
-      await insoservices.project.list({
-        parentId: organizationId,
-        konnectControlPlaneId: { $ne: null },
-      })
-    ).filter(p => p.konnectControlPlaneId != null);
+    // Load all existing Konnect projects up front to avoid per Control Plane queries.
+    // `konnectControlPlaneId` is an optional key, so regular projects omit it entirely and NeDB's
+    // `$ne: null` alone would match them.
+    const existingProjects = await insoservices.project.list({
+      parentId: organizationId,
+      konnectControlPlaneId: { $exists: true, $ne: null },
+    });
     const existingProjectsByKonnectId = new Map(existingProjects.map(p => [p.konnectControlPlaneId!, p]));
     const incomingControlPlaneIds = new Set<string>();
     const syncCtx: SyncContext = { pat, organizationId, existingProjectsByKonnectId, signal, onProgress };
diff --git a/packages/insomnia/src/main/__tests__/git-service-import-legacy-insomnia-folder.test.ts b/packages/insomnia/src/main/__tests__/git-service-import-legacy-insomnia-folder.test.ts
new file mode 100644
index 0000000000..942f55cd10
--- /dev/null
+++ b/packages/insomnia/src/main/__tests__/git-service-import-legacy-insomnia-folder.test.ts
@@ -0,0 +1,191 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+import { models } from 'insomnia-data';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import YAML from 'yaml';
+
+import { database as db } from '~/common/database';
+import { fsClient } from '~/sync/git/fs-client';
+
+// git-service.ts pulls in main/analytics.ts, which pulls in @sentry/electron
+// and other Electron-main-process-only globals that aren't relevant to the
+// legacy-migration logic under test here (and don't play well with the
+// project's lightweight `electron` test mock). Replace it with a no-op that
+// keeps the real, dependency-free `AnalyticsEvent` enum intact.
+vi.mock('~/main/analytics', async () => {
+  const { AnalyticsEvent } = await import('insomnia-analytics');
+  return {
+    AnalyticsEvent,
+    trackAnalyticsEvent: vi.fn(),
+    setCurrentOrganizationId: vi.fn(),
+    trackPageView: vi.fn(),
+  };
+});
+
+const { importLegacyInsomniaFolder } = await import('~/main/git-service');
+
+const PROJECT_ID = 'proj_test';
+
+describe('importLegacyInsomniaFolder()', () => {
+  let repoDir: string;
+
+  beforeEach(async () => {
+    await db.init({ inMemoryOnly: true }, true);
+    repoDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'insomnia-legacy-migration-'));
+  });
+
+  afterEach(async () => {
+    await fs.promises.rm(repoDir, { recursive: true, force: true });
+  });
+
+  const writeLegacyDoc = (type: string, doc: Record<string, unknown>) => {
+    const typeDir = path.join(repoDir, '.insomnia', type);
+    fs.mkdirSync(typeDir, { recursive: true });
+    fs.writeFileSync(path.join(typeDir, `${doc._id}.yaml`), YAML.stringify({ type, ...doc }));
+  };
+
+  it('does not migrate anything when there is no legacy .insomnia folder', async () => {
+    const client = fsClient(repoDir);
+    const result = await importLegacyInsomniaFolder({ fsClient: client, projectId: PROJECT_ID });
+    expect(result.changes).toBeUndefined();
+  });
+
+  describe('syncable types', () => {
+    // The full set of model types where canSync is true today. Each should be
+    // migrated into the database from a legacy .insomnia/<Type>/ folder.
+    const syncableTypes = models
+      .all()
+      .filter(m => m.canSync)
+      .map(m => m.type)
+      .sort();
+
+    it('documents the exact set of types allowed to migrate', () => {
+      expect(syncableTypes).toEqual(
+        [
+          'ApiSpec',
+          'Environment',
+          'GrpcRequest',
+          'MockRoute',
+          'MockServer',
+          'McpRequest',
+          'ProjectLintRuleset',
+          'ProtoDirectory',
+          'ProtoFile',
+          'Request',
+          'RequestGroup',
+          'SocketIOPayload',
+          'SocketIORequest',
+          'UnitTest',
+          'UnitTestSuite',
+          'WebSocketPayload',
+          'WebSocketRequest',
+          'Workspace',
+        ].sort(),
+      );
+    });
+
+    it.each(syncableTypes)('migrates a %s document into the database, since canSync is true', async type => {
+      // Workspace is required for the fixture's Workspace-scoped types, but it
+      // also independently exercises the parentId-correction path below, so
+      // give every case a Workspace folder regardless of the type under test.
+      writeLegacyDoc(models.workspace.type, { _id: 'wrk_test', name: 'Test Workspace', scope: 'collection', parentId: null });
+
+      const docId = `${type}_new`;
+      writeLegacyDoc(type, { _id: docId, name: `New ${type}`, parentId: 'wrk_test' });
+
+      const client = fsClient(repoDir);
+      const result = await importLegacyInsomniaFolder({ fsClient: client, projectId: PROJECT_ID });
+
+      expect(result.errors).toBeUndefined();
+
+      const doc = await db.findOne(type, { _id: docId });
+      expect(doc).toBeDefined();
+      expect(doc?.type).toBe(type);
+    });
+  });
+
+  describe('non-syncable types', () => {
+    // The full set of model types where canSync is false. None of these
+    // should ever be written to the database by the legacy migration, even
+    // though their directory/id/type fields are all well-formed. This is the
+    // regression coverage for the Settings-smuggling vulnerability: an
+    // attacker-authored repo ships a `.insomnia/Settings/` folder containing
+    // a full Settings document (e.g. a malicious httpProxy + validateSSL:
+    // false), which getOrCreate()'s created-ascending sort would then prefer
+    // over the genuine record.
+    const nonSyncableTypes = models
+      .all()
+      .filter(m => !m.canSync)
+      .map(m => m.type)
+      .sort();
+
+    it.each(nonSyncableTypes)('does not migrate a %s document into the database, since canSync is false', async type => {
+      writeLegacyDoc(models.workspace.type, { _id: 'wrk_test', name: 'Test Workspace', scope: 'collection', parentId: null });
+
+      const docId = `${type}_new`;
+      writeLegacyDoc(type, { _id: docId, name: `New ${type}` });
+
+      const client = fsClient(repoDir);
+      const result = await importLegacyInsomniaFolder({ fsClient: client, projectId: PROJECT_ID });
+
+      expect(result.errors).toBeUndefined();
+
+      const doc = await db.findOne(type, { _id: docId });
+      expect(doc).toBeUndefined();
+    });
+
+    it('specifically blocks a smuggled Settings document from overriding the real settings', async () => {
+      writeLegacyDoc(models.workspace.type, { _id: 'wrk_test', name: 'Test Workspace', scope: 'collection', parentId: null });
+
+      writeLegacyDoc(models.settings.type, {
+        _id: 'set_attacker',
+        created: 0,
+        proxyEnabled: true,
+        httpProxy: 'http://attacker.example.com:8080',
+        httpsProxy: 'http://attacker.example.com:8080',
+        validateSSL: false,
+      });
+
+      const client = fsClient(repoDir);
+      const result = await importLegacyInsomniaFolder({ fsClient: client, projectId: PROJECT_ID });
+
+      expect(result.errors).toBeUndefined();
+
+      const attackerSettings = await db.findOne(models.settings.type, { _id: 'set_attacker' });
+      expect(attackerSettings).toBeUndefined();
+    });
+
+    it('still migrates the syncable Workspace alongside a rejected Settings folder', async () => {
+      writeLegacyDoc(models.workspace.type, { _id: 'wrk_test', name: 'Test Workspace', scope: 'collection', parentId: null });
+      writeLegacyDoc(models.settings.type, {
+        _id: 'set_attacker',
+        created: 0,
+        proxyEnabled: true,
+      });
+
+      const client = fsClient(repoDir);
+      const result = await importLegacyInsomniaFolder({ fsClient: client, projectId: PROJECT_ID });
+
+      expect(result.errors).toBeUndefined();
+
+      const workspace = await db.findOne(models.workspace.type, { _id: 'wrk_test' });
+      expect(workspace).toBeDefined();
+      expect((workspace as { parentId?: string })?.parentId).toBe(PROJECT_ID);
+
+      const attackerSettings = await db.findOne(models.settings.type, { _id: 'set_attacker' });
+      expect(attackerSettings).toBeUndefined();
+    });
+  });
+
+  it('removes the legacy .insomnia folder from disk after migrating', async () => {
+    writeLegacyDoc(models.workspace.type, { _id: 'wrk_test', name: 'Test Workspace', scope: 'collection', parentId: null });
+
+    const client = fsClient(repoDir);
+    await importLegacyInsomniaFolder({ fsClient: client, projectId: PROJECT_ID });
+
+    const legacyDirExists = fs.existsSync(path.join(repoDir, '.insomnia'));
+    expect(legacyDirExists).toBe(false);
+  });
+});
diff --git a/packages/insomnia/src/main/__tests__/secure-read-file.test.ts b/packages/insomnia/src/main/__tests__/secure-read-file.test.ts
new file mode 100644
index 0000000000..e8128aaad8
--- /dev/null
+++ b/packages/insomnia/src/main/__tests__/secure-read-file.test.ts
@@ -0,0 +1,185 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
+import { services } from 'insomnia-data';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+
+// secureReadFile backs the templating/plugin/script file-read capability (the `file` tag,
+// `context.util.readFile`, and the sandbox bridge). NeDB stores every model as
+// `insomnia.<Model>.db` directly inside the userData directory that this function otherwise
+// allows, so it must never let a template read those files, even via a symlink or a
+// sibling-directory path that merely shares the userData directory's name as a prefix.
+//
+// This exercises the real `services.settings` (an in-memory NeDB store set up by
+// setup-vitest.ts) rather than mocking `insomnia-data`, since secure-read-file.ts's `services`
+// binding is already resolved against the real module graph by the time this test file loads.
+//
+// Test fixtures live under a scratch directory in this package rather than os.tmpdir(), since
+// os.tmpdir() is itself an unconditionally allowed root (used for multipart bodies) and would
+// make every "outside the allowlist" scenario trivially pass regardless of this fix.
+
+const TEST_ROOT = path.join(__dirname, '.tmp-secure-read-file');
+
+describe('secureReadFile', () => {
+  // vitest.config.ts sets INSOMNIA_DATA_PATH=os.tmpdir() globally, which takes precedence over
+  // the electron `userData` path in getSecuredFolderAllowList — override it per test so the
+  // "allowed" root is a directory this suite controls.
+  const originalInsomniaDataPath = process.env.INSOMNIA_DATA_PATH;
+  let userDataDir: string;
+
+  beforeEach(async () => {
+    fs.mkdirSync(TEST_ROOT, { recursive: true });
+    userDataDir = fs.mkdtempSync(path.join(TEST_ROOT, 'userData-'));
+    process.env.INSOMNIA_DATA_PATH = userDataDir;
+    await services.settings.patch({ dataFolders: [] });
+  });
+
+  afterEach(() => {
+    process.env.INSOMNIA_DATA_PATH = originalInsomniaDataPath;
+    fs.rmSync(TEST_ROOT, { recursive: true, force: true });
+  });
+
+  it('rejects a NeDB database file inside the userData directory', async () => {
+    const { secureReadFile } = await import('../secure-read-file');
+    const dbFile = path.join(userDataDir, 'insomnia.Environment.db');
+    fs.writeFileSync(dbFile, '{"secret":"vault-value"}');
+
+    await expect(secureReadFile(dbFile)).rejects.toThrow(/cannot access/);
+  });
+
+  it('rejects a NeDB-named file placed inside the allowed responses subdirectory', async () => {
+    // isReservedDatabaseFile matches by basename alone, so it still guards the allowed
+    // responses/version-control subdirectories even though real NeDB files never live there.
+    const { secureReadFile } = await import('../secure-read-file');
+    const responsesDir = path.join(userDataDir, 'responses');
+    fs.mkdirSync(responsesDir, { recursive: true });
+    const dbFile = path.join(responsesDir, 'insomnia.Environment.db');
+    fs.writeFileSync(dbFile, '{"secret":"vault-value"}');
+
+    await expect(secureReadFile(dbFile)).rejects.toThrow(/cannot access/);
+  });
+
+  it('rejects an ordinary file directly inside the userData directory', async () => {
+    // Only responses/ and version-control/ subdirectories are allowed roots; the rest of
+    // userData (cookies, caches, etc.) is out of scope for this file-read surface.
+    const { secureReadFile } = await import('../secure-read-file');
+    const file = path.join(userDataDir, 'notes.txt');
+    fs.writeFileSync(file, 'hello');
+
+    await expect(secureReadFile(file)).rejects.toThrow(/cannot access/);
+  });
+
+  it('allows an ordinary file inside the userData responses directory', async () => {
+    const { secureReadFile } = await import('../secure-read-file');
+    const responsesDir = path.join(userDataDir, 'responses');
+    fs.mkdirSync(responsesDir, { recursive: true });
+    const file = path.join(responsesDir, 'abc123.response');
+    fs.writeFileSync(file, 'response-body');
+
+    await expect(secureReadFile(file)).resolves.toBe('response-body');
+  });
+
+  it('allows an ordinary file inside the userData version-control directory', async () => {
+    const { secureReadFile } = await import('../secure-read-file');
+    const vcsDir = path.join(userDataDir, 'version-control', 'projects', 'prj_1');
+    fs.mkdirSync(vcsDir, { recursive: true });
+    const file = path.join(vcsDir, 'head.json');
+    fs.writeFileSync(file, '{"branch":"main"}');
+
+    await expect(secureReadFile(file)).resolves.toBe('{"branch":"main"}');
+  });
+
+  it('rejects a Chromium cookie store file directly inside the userData directory', async () => {
+    const { secureReadFile } = await import('../secure-read-file');
+    const cookiesFile = path.join(userDataDir, 'Cookies');
+    fs.writeFileSync(cookiesFile, 'sqlite-cookie-data');
+
+    await expect(secureReadFile(cookiesFile)).rejects.toThrow(/cannot access/);
+  });
+
+  it('rejects a sibling directory that merely shares a userData subdirectory name as a string prefix', async () => {
+    const { secureReadFile } = await import('../secure-read-file');
+    const responsesDir = path.join(userDataDir, 'responses');
+    fs.mkdirSync(responsesDir, { recursive: true });
+    const siblingDir = `${responsesDir}Other`;
+    fs.mkdirSync(siblingDir);
+    const file = path.join(siblingDir, 'notes.txt');
+    fs.writeFileSync(file, 'hello');
+
+    await expect(secureReadFile(file)).rejects.toThrow(/cannot access/);
+  });
+
+  it('rejects a sibling directory that merely shares the allowed directory as a string prefix', async () => {
+    const { secureReadFile } = await import('../secure-read-file');
+    const siblingDir = `${userDataDir}Other`;
+    fs.mkdirSync(siblingDir);
+    const file = path.join(siblingDir, 'notes.txt');
+    fs.writeFileSync(file, 'hello');
+
+    await expect(secureReadFile(file)).rejects.toThrow(/cannot access/);
+  });
+
+  it('rejects a symlink inside the allowed directory that resolves to a NeDB database file', async () => {
+    const { secureReadFile } = await import('../secure-read-file');
+    const dbFile = path.join(userDataDir, 'insomnia.Settings.db');
+    fs.writeFileSync(dbFile, '{"secret":"settings-value"}');
+    const innocuousLink = path.join(userDataDir, 'innocuous.txt');
+    fs.symlinkSync(dbFile, innocuousLink);
+
+    await expect(secureReadFile(innocuousLink)).rejects.toThrow(/cannot access/);
+  });
+
+  it('rejects a hard link inside the allowed directory that aliases a NeDB database file', async () => {
+    // Unlike a symlink, a hard link has no "original" for realpath() to resolve back to — it's
+    // a second directory entry pointing at the same inode/content, so the innocuous name never
+    // becomes `insomnia.<Model>.db` no matter how the path is resolved. This must be caught by
+    // comparing file identity (device + inode), not by name.
+    const { secureReadFile } = await import('../secure-read-file');
+    const dbFile = path.join(userDataDir, 'insomnia.OAuth2Token.db');
+    fs.writeFileSync(dbFile, '{"secret":"oauth2-token-value"}');
+    const innocuousHardLink = path.join(userDataDir, 'innocuous-hardlink.txt');
+    fs.linkSync(dbFile, innocuousHardLink);
+
+    await expect(secureReadFile(innocuousHardLink)).rejects.toThrow(/cannot access/);
+  });
+
+  it('rejects a symlink inside the allowed directory that resolves outside every allowed root', async () => {
+    const { secureReadFile } = await import('../secure-read-file');
+    const outsideDir = fs.mkdtempSync(path.join(TEST_ROOT, 'outside-'));
+    const outsideFile = path.join(outsideDir, 'secret.txt');
+    fs.writeFileSync(outsideFile, 'outside-secret');
+    const link = path.join(userDataDir, 'link.txt');
+    fs.symlinkSync(outsideFile, link);
+
+    await expect(secureReadFile(link)).rejects.toThrow(/cannot access/);
+  });
+
+  it('allows a file inside a user-configured allowlisted folder', async () => {
+    const customDir = fs.mkdtempSync(path.join(TEST_ROOT, 'custom-'));
+    await services.settings.patch({ dataFolders: [customDir] });
+    const { secureReadFile } = await import('../secure-read-file');
+    const file = path.join(customDir, 'data.txt');
+    fs.writeFileSync(file, 'custom-data');
+
+    await expect(secureReadFile(file)).resolves.toBe('custom-data');
+  });
+
+  it('rejects a NeDB database file inside a user-configured allowlisted folder', async () => {
+    const customDir = fs.mkdtempSync(path.join(TEST_ROOT, 'custom-'));
+    await services.settings.patch({ dataFolders: [customDir] });
+    const { secureReadFile } = await import('../secure-read-file');
+    const dbFile = path.join(customDir, 'insomnia.Request.db');
+    fs.writeFileSync(dbFile, '{"secret":"request-value"}');
+
+    await expect(secureReadFile(dbFile)).rejects.toThrow(/cannot access/);
+  });
+
+  it('allows an ordinary file when the filesystem root is allowlisted', async () => {
+    await services.settings.patch({ dataFolders: [path.parse(userDataDir).root] });
+    const { secureReadFile } = await import('../secure-read-file');
+    const file = path.join(userDataDir, 'notes.txt');
+    fs.writeFileSync(file, 'hello');
+
+    await expect(secureReadFile(file)).resolves.toBe('hello');
+  });
+});
diff --git a/packages/insomnia/src/main/__tests__/sync-initialization.test.ts b/packages/insomnia/src/main/__tests__/sync-initialization.test.ts
index a5da2f1640..8de8be7d05 100644
--- a/packages/insomnia/src/main/__tests__/sync-initialization.test.ts
+++ b/packages/insomnia/src/main/__tests__/sync-initialization.test.ts
@@ -2,7 +2,7 @@ import { models, services } from 'insomnia-data';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { fetchAndCacheOrganizationStorageRule } from '~/common/organization-storage-rules';
-import { getMainVCS } from '~/main/cloud-sync/vcs';
+import { getVCSForWorkspace } from '~/main/cloud-sync/vcs';
 import {
   initializeLocalBackendProjectAndMarkForSync,
   pushSnapshotOnInitialize,
@@ -43,7 +43,7 @@ vi.mock('insomnia-data', () => ({
 }));
 
 vi.mock('~/main/cloud-sync/vcs', () => ({
-  getMainVCS: vi.fn(),
+  getVCSForWorkspace: vi.fn(),
 }));
 
 vi.mock('~/sync/vcs/initialize-backend-project', () => ({
@@ -77,7 +77,7 @@ describe('sync-initialization', () => {
     vi.mocked(fetchAndCacheOrganizationStorageRule).mockResolvedValue({
       enableCloudSync: true,
     } as any);
-    vi.mocked(getMainVCS).mockReturnValue(mockVcs);
+    vi.mocked(getVCSForWorkspace).mockReturnValue(mockVcs);
     vi.mocked(initializeLocalBackendProjectAndMarkForSync).mockResolvedValue();
     vi.mocked(pushSnapshotOnInitialize).mockResolvedValue();
   });
@@ -88,7 +88,7 @@ describe('sync-initialization', () => {
     await initializeWorkspaceBackendProject({ workspaceId: workspace._id });
 
     expect(services.workspaceMeta.getOrCreateByParentId).not.toHaveBeenCalled();
-    expect(getMainVCS).not.toHaveBeenCalled();
+    expect(getVCSForWorkspace).not.toHaveBeenCalled();
     expect(initializeLocalBackendProjectAndMarkForSync).not.toHaveBeenCalled();
   });
 
@@ -97,7 +97,7 @@ describe('sync-initialization', () => {
 
     await initializeWorkspaceBackendProject({ workspaceId: workspace._id });
 
-    expect(getMainVCS).not.toHaveBeenCalled();
+    expect(getVCSForWorkspace).not.toHaveBeenCalled();
     expect(initializeLocalBackendProjectAndMarkForSync).not.toHaveBeenCalled();
   });
 
@@ -107,7 +107,7 @@ describe('sync-initialization', () => {
     await syncNewWorkspaceIfNeeded({ workspaceId: workspace._id });
 
     expect(fetchAndCacheOrganizationStorageRule).not.toHaveBeenCalled();
-    expect(getMainVCS).not.toHaveBeenCalled();
+    expect(getVCSForWorkspace).not.toHaveBeenCalled();
     expect(initializeLocalBackendProjectAndMarkForSync).not.toHaveBeenCalled();
     expect(pushSnapshotOnInitialize).not.toHaveBeenCalled();
   });
@@ -121,7 +121,7 @@ describe('sync-initialization', () => {
 
     expect(services.environment.getOrCreateForParentId).not.toHaveBeenCalled();
     expect(services.cookieJar.getOrCreateForParentId).not.toHaveBeenCalled();
-    expect(getMainVCS).not.toHaveBeenCalled();
+    expect(getVCSForWorkspace).not.toHaveBeenCalled();
     expect(initializeLocalBackendProjectAndMarkForSync).not.toHaveBeenCalled();
     expect(pushSnapshotOnInitialize).not.toHaveBeenCalled();
   });
@@ -132,7 +132,7 @@ describe('sync-initialization', () => {
     expect(services.environment.getOrCreateForParentId).toHaveBeenCalledWith(workspace._id);
     expect(services.cookieJar.getOrCreateForParentId).toHaveBeenCalledWith(workspace._id);
     expect(services.workspaceMeta.getOrCreateByParentId).toHaveBeenCalledWith(workspace._id);
-    expect(getMainVCS).toHaveBeenCalled();
+    expect(getVCSForWorkspace).toHaveBeenCalled();
     expect(initializeLocalBackendProjectAndMarkForSync).toHaveBeenCalledWith({
       vcs: mockVcs,
       workspace,
diff --git a/packages/insomnia/src/main/cloud-sync/initialization.ts b/packages/insomnia/src/main/cloud-sync/initialization.ts
index b8b4769879..1e823d8654 100644
--- a/packages/insomnia/src/main/cloud-sync/initialization.ts
+++ b/packages/insomnia/src/main/cloud-sync/initialization.ts
@@ -2,7 +2,7 @@ import { models, services } from 'insomnia-data';
 
 import { fetchAndCacheOrganizationStorageRule } from '~/common/organization-storage-rules';
 import { invariant } from '~/common/utils/invariant';
-import { getMainVCS } from '~/main/cloud-sync/vcs';
+import { getVCSForWorkspace } from '~/main/cloud-sync/vcs';
 import {
   initializeLocalBackendProjectAndMarkForSync,
   pushSnapshotOnInitialize,
@@ -22,7 +22,7 @@ export const initializeWorkspaceBackendProject = async ({ workspaceId }: { works
     return;
   }
 
-  const vcs = getMainVCS();
+  const vcs = getVCSForWorkspace(workspaceId);
   await initializeLocalBackendProjectAndMarkForSync({
     vcs,
     workspace,
@@ -53,7 +53,7 @@ export const syncNewWorkspaceIfNeeded = async ({ workspaceId }: { workspaceId: s
   await services.workspaceMeta.getOrCreateByParentId(workspace._id);
 
   try {
-    const vcs = getMainVCS();
+    const vcs = getVCSForWorkspace(workspaceId);
     await initializeLocalBackendProjectAndMarkForSync({
       vcs,
       workspace,
diff --git a/packages/insomnia/src/main/cloud-sync/ipc.ts b/packages/insomnia/src/main/cloud-sync/ipc.ts
index 855ea66f39..d5c8a18a58 100644
--- a/packages/insomnia/src/main/cloud-sync/ipc.ts
+++ b/packages/insomnia/src/main/cloud-sync/ipc.ts
@@ -15,49 +15,65 @@ import type { Operation } from '../../common/database';
 import { ipcMainHandle, ipcMainOn } from '../ipc/electron';
 import {
   cancelPendingSyncConflict,
-  invokeMainVCS,
+  invokeGlobalVCS,
+  invokeVCSForWorkspace,
+  pullRemoteBackendProject,
   type PullRemoteBackendProjectOptions,
-  pullRemoteBackendProjectWithSingleton,
   resolvePendingSyncConflict,
 } from './vcs';
 
+// Methods scoped to a single workspace's VCS instance — every call must say which workspace.
 export interface SyncBridgeMethods {
-  archiveProject: () => Promise<void>;
-  checkout: (candidates: StatusCandidate[], branchName: string) => Promise<Operation>;
-  compareRemoteBranch: () => Promise<Compare>;
-  fork: (newBranchName: string) => Promise<void>;
-  getBranchNames: () => Promise<string[]>;
-  getCurrentBranchName: () => Promise<string>;
-  getHistory: (count?: number) => Promise<Snapshot[]>;
-  getHistoryCount: () => Promise<number>;
-  getRemoteBranchNames: () => Promise<string[]>;
-  getVersion: () => Promise<string>;
-  localBackendProjects: () => Promise<BackendProject[]>;
-  merge: (candidates: StatusCandidate[], otherBranchName: string, snapshotMessage?: string) => Promise<Operation>;
-  pull: (options: {
-    candidates: StatusCandidate[];
-    teamId: string;
-    teamProjectId: string;
-    projectId: string;
-  }) => Promise<Operation>;
-  push: (options: { teamId: string; teamProjectId: string }) => Promise<void>;
-  remoteBackendProjects: (options: { teamId: string; teamProjectId: string }) => Promise<BackendProjectWithTeam[]>;
-  remoteBackendProjectsOfTeam: (options: { teamId: string }) => Promise<BackendProjectWithTeamsAndTeamProjectId[]>;
-  removeBackendProjectsForRoot: (rootDocumentId: string) => Promise<void>;
-  removeBranch: (branchName: string) => Promise<void>;
-  removeRemoteBranch: (branchName: string) => Promise<void>;
-  rollback: (snapshotId: string, candidates: StatusCandidate[]) => Promise<Operation>;
-  rollbackToLatest: (candidates: StatusCandidate[]) => Promise<Operation>;
-  stage: (stageEntries: StageEntry[]) => Promise<Stage>;
-  status: (candidates: StatusCandidate[]) => Promise<Status>;
-  switchAndCreateBackendProjectIfNotExist: (rootDocumentId: string, name: string) => Promise<void>;
-  takeSnapshot: (name: string) => Promise<void>;
-  unstage: (stageEntries: StageEntry[]) => Promise<Stage>;
+  archiveProject: (workspaceId: string) => Promise<void>;
+  checkout: (workspaceId: string, candidates: StatusCandidate[], branchName: string) => Promise<Operation>;
+  compareRemoteBranch: (workspaceId: string) => Promise<Compare>;
+  fork: (workspaceId: string, newBranchName: string) => Promise<void>;
+  getBranchNames: (workspaceId: string) => Promise<string[]>;
+  getCurrentBranchName: (workspaceId: string) => Promise<string>;
+  getHistory: (workspaceId: string, count?: number) => Promise<Snapshot[]>;
+  getHistoryCount: (workspaceId: string) => Promise<number>;
+  getRemoteBranchNames: (workspaceId: string) => Promise<string[]>;
+  getVersion: (workspaceId: string) => Promise<string>;
+  merge: (
+    workspaceId: string,
+    candidates: StatusCandidate[],
+    otherBranchName: string,
+    snapshotMessage?: string,
+  ) => Promise<Operation>;
+  pull: (
+    workspaceId: string,
+    options: {
+      candidates: StatusCandidate[];
+      teamId: string;
+      teamProjectId: string;
+      projectId: string;
+    },
+  ) => Promise<Operation>;
+  push: (workspaceId: string, options: { teamId: string; teamProjectId: string }) => Promise<void>;
+  removeBranch: (workspaceId: string, branchName: string) => Promise<void>;
+  removeRemoteBranch: (workspaceId: string, branchName: string) => Promise<void>;
+  rollback: (workspaceId: string, snapshotId: string, candidates: StatusCandidate[]) => Promise<Operation>;
+  rollbackToLatest: (workspaceId: string, candidates: StatusCandidate[]) => Promise<Operation>;
+  stage: (workspaceId: string, stageEntries: StageEntry[]) => Promise<Stage>;
+  status: (workspaceId: string, candidates: StatusCandidate[]) => Promise<Status>;
+  switchAndCreateBackendProjectIfNotExist: (workspaceId: string, rootDocumentId: string, name: string) => Promise<void>;
+  takeSnapshot: (workspaceId: string, name: string) => Promise<void>;
+  unstage: (workspaceId: string, stageEntries: StageEntry[]) => Promise<Stage>;
+  getActiveBackendProject: (workspaceId: string) => Promise<BackendProject | null>;
+  hasBackendProject: (workspaceId: string) => Promise<boolean>;
 }
 
-export interface SyncBridgeAPI extends SyncBridgeMethods {
-  getActiveBackendProject: () => Promise<BackendProject | null>;
-  hasBackendProject: () => Promise<boolean>;
+// Methods that never read a VCS instance's active backend project — no workspaceId needed.
+export interface GlobalSyncBridgeMethods {
+  localBackendProjects: () => Promise<BackendProject[]>;
+  remoteBackendProjects: (options: { teamId: string; teamProjectId: string }) => Promise<BackendProjectWithTeam[]>;
+  remoteBackendProjectsOfTeam: (options: { teamId: string }) => Promise<BackendProjectWithTeamsAndTeamProjectId[]>;
+  hasBackendProjectForRootDocument: (rootDocumentId: string) => Promise<boolean>;
+  removeBackendProjectsForRoot: (rootDocumentId: string) => Promise<void>;
+  archiveBackendProject: (backendProjectId: string) => Promise<void>;
+}
+
+export interface SyncBridgeAPI extends SyncBridgeMethods, GlobalSyncBridgeMethods {
   pullRemoteBackendProject: (options: PullRemoteBackendProjectOptions) => Promise<{
     projectId: string;
     workspaceId: string;
@@ -67,12 +83,16 @@ export interface SyncBridgeAPI extends SyncBridgeMethods {
 }
 
 export const registerSyncHandlers = () => {
-  ipcMainHandle('sync.invoke', (event, methodName: string, ...args: unknown[]) => {
-    return invokeMainVCS(event.sender, methodName, ...args);
+  ipcMainHandle('sync.invoke', (event, workspaceId: string, methodName: string, ...args: unknown[]) => {
+    return invokeVCSForWorkspace(event.sender, workspaceId, methodName, ...args);
+  });
+
+  ipcMainHandle('sync.invokeGlobal', (_event, methodName: string, ...args: unknown[]) => {
+    return invokeGlobalVCS(methodName, ...args);
   });
 
   ipcMainHandle('sync.pullRemoteBackendProject', (event, options: PullRemoteBackendProjectOptions) => {
-    return pullRemoteBackendProjectWithSingleton(event.sender, options);
+    return pullRemoteBackendProject(event.sender, options);
   });
 
   ipcMainOn('sync.resolveConflict', (event, options: { handlerId: string; conflicts: MergeConflict[] }) => {
diff --git a/packages/insomnia/src/main/cloud-sync/vcs.ts b/packages/insomnia/src/main/cloud-sync/vcs.ts
index e35e002df9..2bca0e3cbe 100644
--- a/packages/insomnia/src/main/cloud-sync/vcs.ts
+++ b/packages/insomnia/src/main/cloud-sync/vcs.ts
@@ -5,7 +5,17 @@ import { app, type WebContents } from 'electron';
 import type { RemoteProject } from 'insomnia-data';
 import { services } from 'insomnia-data';
 import type { BackendProjectWithTeam, MergeConflict } from 'insomnia-vcs';
-import { VCS } from 'insomnia-vcs';
+import {
+  archiveBackendProject,
+  configureStore,
+  FileSystemDriver,
+  hasBackendProjectForRootDocument,
+  localBackendProjects,
+  remoteBackendProjects,
+  remoteBackendProjectsOfTeam,
+  removeBackendProjectsForRoot,
+  VCS,
+} from 'insomnia-vcs';
 
 import { PLAYWRIGHT_TEST } from '~/common/constants';
 import { invariant } from '~/common/utils/invariant';
@@ -31,7 +41,18 @@ export interface PullRemoteBackendProjectOptions {
 const syncInvocationContext = new AsyncLocalStorage<SyncInvocationContext>();
 const pendingConflictResolutions = new Map<string, PendingConflictResolution>();
 
-let mainVCS: VCS | null = null;
+// One VCS instance per workspace, so a `_backendProject` mutation triggered by one workspace's
+// sync.invoke call can never bleed into another workspace's concurrently in-flight operation.
+const vcsByWorkspaceId = new Map<string, VCS>();
+
+let storeConfigured = false;
+const ensureStoreConfigured = () => {
+  if (!storeConfigured) {
+    const dataPath = process.env['INSOMNIA_DATA_PATH'] || app.getPath('userData');
+    configureStore(FileSystemDriver.create(dataPath));
+    storeConfigured = true;
+  }
+};
 
 const requestConflictResolution = (conflicts: MergeConflict[], labels: { ours: string; theirs: string }) => {
   const context = syncInvocationContext.getStore();
@@ -53,28 +74,33 @@ const requestConflictResolution = (conflicts: MergeConflict[], labels: { ours: s
   });
 };
 
-function createVCS() {
-  return new VCS({
-    dataPath: process.env['INSOMNIA_DATA_PATH'] || app.getPath('userData'),
-    conflictHandler: requestConflictResolution,
-    testMode: !!PLAYWRIGHT_TEST,
-  });
-}
+export const getVCSForWorkspace = (workspaceId: string): VCS => {
+  ensureStoreConfigured();
+  let vcs = vcsByWorkspaceId.get(workspaceId);
 
-export const getMainVCS = () => {
-  if (mainVCS) {
-    return mainVCS;
+  if (!vcs) {
+    vcs = new VCS({
+      workspaceId,
+      conflictHandler: requestConflictResolution,
+      testMode: !!PLAYWRIGHT_TEST,
+    });
+    vcsByWorkspaceId.set(workspaceId, vcs);
   }
-  mainVCS = createVCS();
-  return mainVCS;
+
+  return vcs;
 };
 
 export const runWithSyncRenderer = <T>(sender: WebContents, callback: () => Promise<T> | T) => {
   return syncInvocationContext.run({ sender }, callback);
 };
 
-export const invokeMainVCS = async (sender: WebContents, methodName: string, ...args: unknown[]) => {
-  const vcs = getMainVCS();
+export const invokeVCSForWorkspace = async (
+  sender: WebContents,
+  workspaceId: string,
+  methodName: string,
+  ...args: unknown[]
+) => {
+  const vcs = getVCSForWorkspace(workspaceId);
   const method = vcs[methodName as keyof VCS];
 
   if (typeof method !== 'function') {
@@ -84,6 +110,29 @@ export const invokeMainVCS = async (sender: WebContents, methodName: string, ...
   return runWithSyncRenderer(sender, () => (method as (...args: unknown[]) => unknown).apply(vcs, args));
 };
 
+// Methods that never read a VCS instance's active `_backendProject` — they don't need a
+// workspace-scoped instance at all, so they're dispatched straight to insomnia-vcs's exported
+// functions instead of through the reflective, workspace-keyed `invokeVCSForWorkspace`.
+const GLOBAL_VCS_METHODS = {
+  localBackendProjects,
+  remoteBackendProjects,
+  remoteBackendProjectsOfTeam,
+  hasBackendProjectForRootDocument,
+  removeBackendProjectsForRoot,
+  archiveBackendProject,
+};
+
+export const invokeGlobalVCS = async (methodName: string, ...args: unknown[]) => {
+  ensureStoreConfigured();
+  const method = GLOBAL_VCS_METHODS[methodName as keyof typeof GLOBAL_VCS_METHODS];
+
+  if (typeof method !== 'function') {
+    throw new TypeError(`Unknown global VCS method: ${methodName}`);
+  }
+
+  return (method as (...args: unknown[]) => unknown)(...args);
+};
+
 export const resolvePendingSyncConflict = ({
   handlerId,
   sender,
@@ -116,21 +165,17 @@ export const cancelPendingSyncConflict = ({ handlerId, sender }: { handlerId: st
   pendingConflictResolution.reject(new UserAbortResolveMergeConflictError());
 };
 
-export const pullRemoteBackendProjectWithSingleton = async (
+export const pullRemoteBackendProject = async (
   sender: WebContents,
   { organizationId, backendProjectId, remoteId }: PullRemoteBackendProjectOptions,
 ) => {
   return runWithSyncRenderer(sender, async () => {
-    // Use the singleton only for the remote listing (read-only network call).
-    // The actual pull uses an isolated VCS instance so the singleton's active
-    // backend project is never mutated, preventing cross-workspace interference
-    // with concurrent sync.invoke calls.
-    const vcs = getMainVCS();
-    const remoteBackendProjects = await vcs.remoteBackendProjects({
+    ensureStoreConfigured();
+    const projects = await remoteBackendProjects({
       teamId: organizationId,
       teamProjectId: remoteId,
     });
-    const backendProject = remoteBackendProjects.find(project => project.id === backendProjectId) as
+    const backendProject = projects.find(project => project.id === backendProjectId) as
       | BackendProjectWithTeam
       | undefined;
 
@@ -139,11 +184,13 @@ export const pullRemoteBackendProjectWithSingleton = async (
     const project = await services.project.getByRemoteId(remoteId);
     invariant(project?.remoteId, 'Project is not a remote project');
 
-    const pullVCS = createVCS();
-
-    await pullVCS.removeBackendProjectsForRoot(backendProject.rootDocumentId);
+    // backendProject.rootDocumentId is the target workspace's id, so the pull runs on that
+    // workspace's own VCS instance directly — no need for a separate isolated instance to shield
+    // a singleton's mutable state from other concurrent sync.invoke calls.
+    await removeBackendProjectsForRoot(backendProject.rootDocumentId);
+    const vcs = getVCSForWorkspace(backendProject.rootDocumentId);
     const { workspaceId } = await pullBackendProject({
-      vcs: pullVCS,
+      vcs,
       backendProject,
       remoteProject: project as RemoteProject,
     });
diff --git a/packages/insomnia/src/main/git-service.ts b/packages/insomnia/src/main/git-service.ts
index d96953c247..fee937e305 100644
--- a/packages/insomnia/src/main/git-service.ts
+++ b/packages/insomnia/src/main/git-service.ts
@@ -850,12 +850,17 @@ export async function loadGitRepository({ projectId, workspaceId }: { projectId:
 
       // GitVCS.init() opens the local repo without a network call, so explicitly
       // verify credentials here to surface revoked tokens as HTTP 4xx errors.
-      await validateGitCredentials({ credentialsId, uri });
+      // Local-only repositories have no remote to validate.
+      if (uri) {
+        await validateGitCredentials({ credentialsId, uri });
+      }
     }
 
     // Configure basic info
     await GitVCS.setAuthor();
-    await GitVCS.addRemote(uri);
+    if (uri) {
+      await GitVCS.addRemote(uri);
+    }
 
     // Start file watcher for project-scoped repos so external YAML edits
     // (native git CLI, VS Code, etc.) flow back into the database.
@@ -1116,7 +1121,7 @@ async function containsLegacyInsomniaDir({ fsClient }: { fsClient: PromiseFsClie
  * @param projectId - The project ID to associate migrated workspaces with
  * @returns Object containing changes made during migration or errors
  */
-async function importLegacyInsomniaFolder({ fsClient, projectId }: { fsClient: PromiseFsClient; projectId: string }) {
+export async function importLegacyInsomniaFolder({ fsClient, projectId }: { fsClient: PromiseFsClient; projectId: string }) {
   const changes: { path: string; status: Status }[] = [];
   try {
     // Check if the legacy .insomnia directory exists
@@ -1178,6 +1183,15 @@ async function importLegacyInsomniaFolder({ fsClient, projectId }: { fsClient: P
         throw new Error(`Doc type does not match file path [${doc.type} != ${type || 'null'}]`);
       }
 
+      // Only types explicitly marked as syncable may be migrated from a legacy
+      // .insomnia folder. A folder named after a non-syncable/global-singleton
+      // type (e.g. Settings) is skipped, even though its path and id/type
+      // fields are well-formed.
+      if (!models.canSync(doc)) {
+        console.log(`[git] Ignoring non-syncable document type ${doc.type} at ${legacyInsomniaFile.filePath}`);
+        continue;
+      }
+
       // Special handling for workspaces: ensure they're associated with the correct project
       if (models.workspace.isWorkspace(doc)) {
         console.log('[git] setting workspace parent to be that of the active project', {
@@ -3516,7 +3530,10 @@ const getRepositoryDirectoryTree = async ({
 
   const gitRepository = await getGitRepository({ projectId });
 
-  const emptyTree = { repositoryTree: { id: '', name: 'Repository', type: 'root' as const, children: [] }, folderList: {} };
+  const emptyTree = {
+    repositoryTree: { id: '', name: 'Repository', type: 'root' as const, children: [] },
+    folderList: {},
+  };
 
   let fs: Awaited<ReturnType<typeof getGitFSClient>>;
   try {
diff --git a/packages/insomnia/src/main/importers/importers/postman.test.ts b/packages/insomnia/src/main/importers/importers/postman.test.ts
index 3222e11624..de34de1f44 100644
--- a/packages/insomnia/src/main/importers/importers/postman.test.ts
+++ b/packages/insomnia/src/main/importers/importers/postman.test.ts
@@ -565,4 +565,48 @@ describe('postman', () => {
       expect(baseEnvironment?.data).toEqual(variables);
     });
   });
+
+  describe('descriptions', () => {
+    it('unwraps the object form and keeps raw text as-is', () => {
+      const schema = postmanSchema();
+      schema.info.description = { content: 'Collection docs', type: 'text/markdown' };
+      const postman = new ImportPostman(schema);
+
+      const folder = { name: 'Users', description: { content: 'Folder docs', type: 'text/markdown' }, item: [] };
+
+      expect(postman.importCollection()[0].description).toBe('Collection docs');
+      expect(postman.importFolderItem(folder, 'n/a').description).toBe('Folder docs');
+      expect(postman.importRequestItem({ request: { description: folder.description } }, 'n/a').description).toBe(
+        'Folder docs',
+      );
+
+      expect(postman.importFolderItem({ ...folder, description: 'User folder' }, 'n/a').description).toBe(
+        'User folder',
+      );
+      expect(postman.importRequestItem({ request: { description: 'Lists users' } }, 'n/a').description).toBe(
+        'Lists users',
+      );
+    });
+
+    it('unwraps the object form for header descriptions', () => {
+      const postman = new ImportPostman(postmanSchema());
+      const header = {
+        key: 'Accept',
+        value: 'application/json',
+        description: { content: 'Accept docs', type: 'text/markdown' },
+      };
+
+      expect(postman.importRequestItem({ request: { header: [header] } }, 'n/a').headers).toEqual([
+        { name: 'Accept', value: 'application/json', description: 'Accept docs' },
+      ]);
+    });
+
+    it('falls back to empty text for a description without text', () => {
+      const postman = new ImportPostman(postmanSchema());
+      const folder = { name: 'Users', description: { type: 'text/markdown' }, item: [] };
+
+      expect(postman.importFolderItem(folder, 'n/a').description).toBe('');
+      expect(postman.importRequestItem({ request: { description: null } }, 'n/a').description).toBe('');
+    });
+  });
 });
diff --git a/packages/insomnia/src/main/importers/importers/postman.ts b/packages/insomnia/src/main/importers/importers/postman.ts
index a4ce41a40a..b4f9eb4779 100644
--- a/packages/insomnia/src/main/importers/importers/postman.ts
+++ b/packages/insomnia/src/main/importers/importers/postman.ts
@@ -66,6 +66,21 @@ const postmanToNunjucksLookup = fakerTags
   .map(tag => ({ [tag]: `{% faker '${tag}' %}` }))
   .reduce((acc, obj) => ({ ...acc, ...obj }), {});
 
+// Postman allows a description to be either raw text or an object holding the text and its
+// format. Docs only ever hold text, so unwrap the object form.
+const postmanDescriptionToString = (description: unknown): string => {
+  if (typeof description === 'string') {
+    return description;
+  }
+  if (description !== null && typeof description === 'object' && 'content' in description) {
+    const { content } = description;
+    if (typeof content === 'string') {
+      return content;
+    }
+  }
+  return '';
+};
+
 export const transformPostmanToNunjucksString = (inputString?: string | null) => {
   if (!inputString) {
     return '';
@@ -141,7 +156,6 @@ export class ImportPostman {
   };
 
   importItems = (items: PostmanCollection['item'], parentId = '__WORKSPACE_ID__'): ImportRequest[] => {
-    // @ts-expect-error this is because there are devergent behaviors for how the function treats this collection.  This is handled appropriately in the function itself in different branches.
     return items.reduce((accumulator: ImportRequest[], item: Item | Folder) => {
       if (Object.prototype.hasOwnProperty.call(item, 'request')) {
         return [...accumulator, this.importRequestItem(item as Item, parentId)];
@@ -240,7 +254,7 @@ export class ImportPostman {
       _id: `__REQ_${requestCount++}__`,
       _type: 'request',
       name,
-      description: (request.description as string) || '',
+      description: postmanDescriptionToString(request.description),
       url: transformPostmanToNunjucksString(this.importUrl(request.url)),
       parameters: parameters,
       pathParameters,
@@ -249,7 +263,7 @@ export class ImportPostman {
         name: transformPostmanToNunjucksString(key),
         value: transformPostmanToNunjucksString(value),
         ...(disabled !== undefined ? { disabled } : {}),
-        ...(description !== undefined ? { description } : {}),
+        ...(description !== undefined ? { description: postmanDescriptionToString(description) } : {}),
       })),
       body,
       authentication,
@@ -294,7 +308,7 @@ export class ImportPostman {
       _id: `__GRP_${requestGroupCount++}__`,
       _type: 'request_group',
       name,
-      description: description || '',
+      description: postmanDescriptionToString(description),
       preRequestScript,
       afterResponseScript,
       authentication,
@@ -320,7 +334,7 @@ export class ImportPostman {
       _id: `__GRP_${requestGroupCount++}__`,
       _type: 'request_group',
       name,
-      description: typeof description === 'string' ? description : '',
+      description: postmanDescriptionToString(description),
       authentication,
       preRequestScript,
       afterResponseScript,
diff --git a/packages/insomnia/src/main/install-plugin.ts b/packages/insomnia/src/main/install-plugin.ts
index 7cb8b6f1d8..ccdfa1b0a2 100644
--- a/packages/insomnia/src/main/install-plugin.ts
+++ b/packages/insomnia/src/main/install-plugin.ts
@@ -213,34 +213,48 @@ export async function getPluginInfo(lookupName: string, allowScopedPackageNames
 
   console.log('[plugins] Fetching module info from npm');
 
-  const registryUrl = await getRegistryUrl();
-  const stdout = await runYarnCommand(['info', lookupName, '--json', '--registry', registryUrl]);
-
-  let yarnOutput;
+  // Run yarn in a directory we control: inheriting the Electron process
+  // working directory lets yarn read an unrelated package.json there, and a
+  // missing license field turns into a fatal "No license field" warning.
+  const infoDir = await mkdtemp(path.resolve(tmpdir(), `insomnia-plugin-info-${Date.now()}`));
   try {
-    yarnOutput = JSON.parse(stdout);
-  } catch (err) {
-    throw new Error(`Invalid JSON received from yarn: ${(err as Error).message}`);
-  }
+    await writeFile(
+      path.resolve(infoDir, 'package.json'),
+      JSON.stringify({ license: 'ISC', workspaces: [] }, null, 2),
+      'utf8',
+    );
 
-  const data = yarnOutput.data;
-  if (!data || typeof data !== 'object') {
-    throw new Error(`Unexpected yarn output structure`);
-  }
+    const registryUrl = await getRegistryUrl();
+    const stdout = await runYarnCommand(['info', lookupName, '--json', '--registry', registryUrl], infoDir);
 
-  if (!data.insomnia) {
-    throw new Error(`Package "${lookupName}" is not an Insomnia plugin (missing "insomnia" attribute)`);
-  }
+    let yarnOutput;
+    try {
+      yarnOutput = JSON.parse(stdout);
+    } catch (err) {
+      throw new Error(`Invalid JSON received from yarn: ${(err as Error).message}`);
+    }
 
-  return {
-    insomnia: data.insomnia,
-    name: data.name,
-    version: data.version,
-    dist: {
-      shasum: data.dist.shasum,
-      tarball: data.dist.tarball,
-    },
-  };
+    const data = yarnOutput.data;
+    if (!data || typeof data !== 'object') {
+      throw new Error(`Unexpected yarn output structure`);
+    }
+
+    if (!data.insomnia) {
+      throw new Error(`Package "${lookupName}" is not an Insomnia plugin (missing "insomnia" attribute)`);
+    }
+
+    return {
+      insomnia: data.insomnia,
+      name: data.name,
+      version: data.version,
+      dist: {
+        shasum: data.dist.shasum,
+        tarball: data.dist.tarball,
+      },
+    };
+  } finally {
+    await rm(infoDir, { recursive: true, force: true });
+  }
 }
 
 /**
diff --git a/packages/insomnia/src/main/ipc/electron.ts b/packages/insomnia/src/main/ipc/electron.ts
index 98c55840a2..225a51e36e 100644
--- a/packages/insomnia/src/main/ipc/electron.ts
+++ b/packages/insomnia/src/main/ipc/electron.ts
@@ -179,6 +179,7 @@ export type HandleChannels =
   | 'socketIO.event.send'
   | 'syncNewWorkspaceIfNeeded'
   | 'sync.invoke'
+  | 'sync.invokeGlobal'
   | 'sync.pullRemoteBackendProject'
   | 'templatingDb.getAuthToken'
   | 'socketIO.open'
diff --git a/packages/insomnia/src/main/network/curl.test.ts b/packages/insomnia/src/main/network/curl.test.ts
index b0bf1f9835..0202c1263e 100644
--- a/packages/insomnia/src/main/network/curl.test.ts
+++ b/packages/insomnia/src/main/network/curl.test.ts
@@ -1,4 +1,8 @@
 // @ts-nocheck
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
 import { Curl } from '@getinsomnia/node-libcurl';
 import electron from 'electron';
 import { services } from 'insomnia-data';
@@ -10,11 +14,14 @@ import { registerCurlHandlers } from './curl';
 // register the real handlers once and pull the handler function out of the mocked
 // `electron.ipcMain.handle` calls instead of exporting an internal for tests only.
 let openCurlConnection: (event: unknown, options: unknown) => Promise<void>;
+let findCurlEvents: (event: unknown, options: { responseId: string }) => Promise<unknown[]>;
 
 beforeAll(() => {
   registerCurlHandlers();
   const call = electron.ipcMain.handle.mock.calls.find(([channel]) => channel === 'curl.open');
   openCurlConnection = call[1];
+  const findManyCall = electron.ipcMain.handle.mock.calls.find(([channel]) => channel === 'curl.event.findMany');
+  findCurlEvents = findManyCall[1];
 });
 
 const baseRenderedRequest = (overrides: Record<string, unknown> = {}) => ({
@@ -110,3 +117,52 @@ describe('openCurlConnection', () => {
     expect(setOptCallsFor(setOptSpy, Curl.option.HTTPHEADER)).toHaveLength(1);
   });
 });
+
+describe('curl.event.findMany', () => {
+  // The streaming connection writes its NDJSON event log to the response's `bodyPath`, exactly where
+  // the plain HTTP send path stores a raw body, so the content is what tells the two apart.
+  const createResponseWithBody = async (body: string) => {
+    const bodyPath = path.join(fs.mkdtempSync(path.join(os.tmpdir(), 'insomnia-curl-events-')), 'body.response');
+    fs.writeFileSync(bodyPath, body);
+    const response = await services.response.create({ parentId: 'req_find_many_test', bodyPath }, 20);
+    return response._id;
+  };
+
+  const messageEvent = (id: string, data: string) => ({
+    _id: id,
+    requestId: 'req_find_many_test',
+    type: 'message',
+    timestamp: 1,
+    data,
+    direction: 'INCOMING',
+  });
+
+  it('returns the events written by the streaming connection', async () => {
+    const first = messageEvent('evt_1', 'hello');
+    const second = messageEvent('evt_2', 'world');
+    const responseId = await createResponseWithBody(`${JSON.stringify(first)}\n${JSON.stringify(second)}\n`);
+
+    // Newest first.
+    await expect(findCurlEvents({}, { responseId })).resolves.toEqual([second, first]);
+  });
+
+  it('never reads a plain HTTP response body as events', async () => {
+    // Regression: flipping the request to `Accept: text/event-stream` while an HTTP response is
+    // active used to hand that JSON body to the event log table, which then threw
+    // "Could not determine key for item" and blanked the whole response pane.
+    const responseId = await createResponseWithBody(JSON.stringify({ id: '1' }));
+
+    await expect(findCurlEvents({}, { responseId })).resolves.toEqual([]);
+  });
+
+  it('skips lines that are not events', async () => {
+    // Pretty printed bodies, a line being appended while the stream is still open, and any other
+    // junk must be dropped rather than parsed into keyless "events".
+    const event = messageEvent('evt_1', 'hello');
+    const responseId = await createResponseWithBody(
+      `{\n  "id": "1"\n}\n${JSON.stringify(event)}\n{"_id":"evt_2","requestId":"req_find_many_test","ty`,
+    );
+
+    await expect(findCurlEvents({}, { responseId })).resolves.toEqual([event]);
+  });
+});
diff --git a/packages/insomnia/src/main/network/curl.ts b/packages/insomnia/src/main/network/curl.ts
index 09ef5ccf4b..ca7098e980 100644
--- a/packages/insomnia/src/main/network/curl.ts
+++ b/packages/insomnia/src/main/network/curl.ts
@@ -397,21 +397,46 @@ const closeCurlConnection = (_event: Electron.IpcMainInvokeEvent, options: { req
 
 const closeAllCurlConnections = (): void => CurlConnections.forEach(curl => curl.isOpen && curl.close());
 
+/**
+ * A streamed Event Stream response stores its NDJSON event log in `bodyPath`, but the same field holds
+ * the raw body of a plain HTTP response, so what an event is has to be decided by the content: a JSON
+ * object carrying the fields every curl event has. Anything else (a JSON response body, a pretty
+ * printed one, a half written line) is not an event.
+ */
+const isCurlEvent = (value: unknown): value is CurlEvent => {
+  if (!value || typeof value !== 'object') {
+    return false;
+  }
+  const { _id, requestId, type } = value as Partial<CurlEvent>;
+  return (
+    typeof _id === 'string' &&
+    typeof requestId === 'string' &&
+    (type === 'open' || type === 'message' || type === 'close' || type === 'error')
+  );
+};
+
 const findMany = async (options: { responseId: string }): Promise<CurlEvent[]> => {
   const response = await services.response.getById(options.responseId);
-  if (!response || !response.bodyPath) {
+  if (!response?.bodyPath) {
     return [];
   }
   const body = await insecureReadFile(response.bodyPath);
-  return (
-    body
-      .split('\n')
-      .filter(e => e?.trim())
-      // Parse the message
-      .map(e => JSON.parse(e))
-      // Reverse the list of messages so that we get the latest message first
-      .reverse() || []
-  );
+  const events: CurlEvent[] = [];
+  for (const line of body.split('\n')) {
+    if (!line.trim()) {
+      continue;
+    }
+    try {
+      const parsed: unknown = JSON.parse(line);
+      if (isCurlEvent(parsed)) {
+        events.push(parsed);
+      }
+    } catch {
+      // Not an event: the body of a request that was never streamed, or a line still being written.
+    }
+  }
+  // Reverse the list of messages so that we get the latest message first
+  return events.reverse();
 };
 
 export interface CurlBridgeAPI {
diff --git a/packages/insomnia/src/main/secure-read-file.ts b/packages/insomnia/src/main/secure-read-file.ts
index 68c567d98e..88cf3aaaaa 100644
--- a/packages/insomnia/src/main/secure-read-file.ts
+++ b/packages/insomnia/src/main/secure-read-file.ts
@@ -12,28 +12,77 @@ import { SECURITY_SETTINGS_PATH_LABEL } from '../common/misc';
 export const isPathAllowed = (filePath: string, userAllowList: string[]) => {
   const allowList = getSecuredFolderAllowList(userAllowList);
   const securedPath = securePath(filePath);
-  const isAllowed = allowList.some(f => path.resolve(f) !== '' && securedPath.startsWith(path.resolve(f)));
+  const isAllowed = allowList.some(f => {
+    const resolvedRoot = path.resolve(f);
+    // Avoid a doubled separator (e.g. '//') when resolvedRoot is already a filesystem root.
+    const rootPrefix = resolvedRoot.endsWith(path.sep) ? resolvedRoot : resolvedRoot + path.sep;
+    return resolvedRoot !== '' && (securedPath === resolvedRoot || securedPath.startsWith(rootPrefix));
+  });
   return { isAllowed, securedPath };
 };
 const securePath = (filePath: string) => path.resolve(decodeURIComponent(filePath));
+// Only responses/ and version-control/ subdirectories are in scope for this file-read surface;
+// the rest of userData (cookies, caches, etc.) is Electron/Chromium's own runtime state, not
+// something templates, plugins, or scripts have a reason to read.
+const USERDATA_ALLOWED_SUBDIRS = ['responses', 'version-control'];
 const getSecuredFolderAllowList = (userAllowList: string[]) => {
   const userdataDirectory = process.env.INSOMNIA_DATA_PATH || electron.app.getPath('userData');
   // we use tmpdir for buildMultipart
-  // we put the db in userData
   // the user can also specifiy other folders
-  return [os.tmpdir(), userdataDirectory, ...userAllowList];
+  return [
+    os.tmpdir(),
+    ...USERDATA_ALLOWED_SUBDIRS.map(subdir => path.join(userdataDirectory, subdir)),
+    ...userAllowList,
+  ];
+};
+// NeDB stores every model as `insomnia.<Model>.db` directly inside the userData directory
+// (see database-nedb.ts), so the templating/plugin/script file-read surface must never be
+// allowed to reach those files even though that directory is otherwise an allowed root.
+const isReservedDatabaseFile = (filePath: string) => /^insomnia\..+\.db.*$/i.test(path.basename(filePath));
+const cannotAccessFileError = (securedPath: string) =>
+  `Insomnia cannot access the file "${securedPath}". You must specify which directories Insomnia can access in ${SECURITY_SETTINGS_PATH_LABEL}`;
+const resolveRealPath = async (filePath: string) => fs.promises.realpath(filePath).catch(() => filePath);
+const statOrNull = async (filePath: string) => fs.promises.stat(filePath).catch(() => null);
+const getUserdataDirectory = () => process.env.INSOMNIA_DATA_PATH || electron.app.getPath('userData');
+// A hard link lets a file be read through a second, innocuously-named path without ever going
+// through a symlink, so `realpath()` (which only resolves symlinks) won't reveal that it's the
+// same file on disk as a reserved NeDB database file. Compare filesystem identity (device +
+// inode) against the actual reserved files present in the userData directory to catch this,
+// since two different paths can point at the same underlying file.
+const isDatabaseFileAlias = async (realPath: string) => {
+  const target = await statOrNull(realPath);
+  if (!target) {
+    return false;
+  }
+  const userdataDirectory = getUserdataDirectory();
+  const entries = await fs.promises.readdir(userdataDirectory).catch(() => []);
+  const reservedNames = entries.filter(isReservedDatabaseFile);
+  for (const name of reservedNames) {
+    const reserved = await statOrNull(path.join(userdataDirectory, name));
+    if (reserved && reserved.dev === target.dev && reserved.ino === target.ino) {
+      return true;
+    }
+  }
+  return false;
 };
 // For reading files specified by plugins, environment variables, and scripts which could come from an imported collection
 export const secureReadFile = async (filePath: string): Promise<string> => {
   const settings = await services.settings.getOrCreate();
   const { isAllowed, securedPath } = isPathAllowed(filePath, settings.dataFolders);
+  invariant(isAllowed && !isReservedDatabaseFile(securedPath), cannotAccessFileError(securedPath));
 
+  // Re-check against the resolved real path (of both the target file and the allowed roots,
+  // since e.g. macOS symlinks /var to /private/var) so a symlink can't be used to point an
+  // allowed directory at a reserved database file or a location outside the allowlist.
+  const realPath = await resolveRealPath(securedPath);
+  const realAllowList = await Promise.all(getSecuredFolderAllowList(settings.dataFolders).map(resolveRealPath));
+  const { isAllowed: isRealPathAllowed } = isPathAllowed(realPath, realAllowList);
   invariant(
-    isAllowed,
-    `Insomnia cannot access the file "${securedPath}". You must specify which directories Insomnia can access in ${SECURITY_SETTINGS_PATH_LABEL}`,
+    isRealPathAllowed && !isReservedDatabaseFile(realPath) && !(await isDatabaseFileAlias(realPath)),
+    cannotAccessFileError(securedPath),
   );
 
-  return fs.promises.readFile(securedPath, { encoding: 'utf8' });
+  return fs.promises.readFile(realPath, { encoding: 'utf8' });
 };
 // For reading files selected by the user via a file dialog
 export const insecureReadFile = async (filePath: string): Promise<string> => {
diff --git a/packages/insomnia/src/main/templating-worker-database.ts b/packages/insomnia/src/main/templating-worker-database.ts
index e5662ec02b..cc91557508 100644
--- a/packages/insomnia/src/main/templating-worker-database.ts
+++ b/packages/insomnia/src/main/templating-worker-database.ts
@@ -8,6 +8,7 @@ import { app, BrowserWindow, clipboard, dialog, shell } from 'electron';
 import iconv from 'iconv-lite';
 import type { AllTypes, CloudProviderCredential, Request as DBRequest, RequestGroup, Workspace } from 'insomnia-data';
 import { services } from 'insomnia-data';
+import { ProxyScopes } from 'insomnia-data/common';
 import { v4 as uuidv4 } from 'uuid';
 
 import { jarFromCookies } from '~/common/cookies';
@@ -63,7 +64,7 @@ export const resolveDbByKey = async (request: Request) => {
   try {
     // We expect this to throw if a db call returns undefined
     body = JSON.parse(await request.text(), stripDangerousKeysReviver);
-  } catch { }
+  } catch {}
   // url get normalized to lowercase, so we need to normalize the keys to lower case as well
   const withLowercasedKeys = Object.fromEntries(
     Object.entries(pluginToMainAPI).map(([key, value]) => [key.toLowerCase(), value]),
@@ -802,6 +803,10 @@ export const pluginToMainAPI: Record<PluginToMainAPIPaths, (...args: any[]) => P
   }) => {
     const requestId = uuidv4();
     const settings = await services.settings.get();
+    if (settings.proxyScope !== ProxyScopes.all) {
+      // Disable proxying unless user chooses "All traffic sent by Insomnia" (all).
+      settings.proxyEnabled = false;
+    }
     const settingFollowRedirects = settings?.followRedirects ? 'on' : 'off';
     const { request: originRequest } = body.options;
     const response = await curlRequest({
diff --git a/packages/insomnia/src/network/__tests__/network.test.ts b/packages/insomnia/src/network/__tests__/network.test.ts
index 9733766db7..d8c71b3616 100644
--- a/packages/insomnia/src/network/__tests__/network.test.ts
+++ b/packages/insomnia/src/network/__tests__/network.test.ts
@@ -1170,6 +1170,127 @@ describe('getOrInheritHeaders', () => {
   });
 });
 
+describe('cookie template rendering by source', () => {
+  // getRenderedRequestAndContext renders the whole cookie jar before every send (it's how
+  // {{ _.var }} works in a manually-typed cookie), so a response-sourced cookie's value must
+  // never reach the renderer here, or a template placed in a cookie by a response would be
+  // re-executed on every later request to that host.
+  const templateCookieValue = "{% uuid 'v4' %}";
+
+  it('does not render a response-sourced cookie value when preparing a request to send', async () => {
+    const workspace = await services.workspace.create();
+    const cookieJar = await services.cookieJar.getOrCreateForParentId(workspace._id);
+    await services.cookieJar.update(cookieJar, {
+      cookies: [
+        {
+          id: 'c1',
+          key: 'tracking',
+          value: templateCookieValue,
+          domain: 'localhost',
+          path: '/',
+          secure: false,
+          httpOnly: false,
+          source: 'response',
+        },
+      ],
+    });
+    const request = Object.assign(models.request.init(), {
+      _id: 'req_response_cookie',
+      parentId: workspace._id,
+      url: 'http://localhost',
+    });
+
+    const renderedRequest = await getRenderedRequest({ request });
+    const responseCookie = renderedRequest.cookieJar.cookies.find(c => c.key === 'tracking');
+
+    expect(responseCookie?.value).toBe(templateCookieValue);
+  });
+
+  it('still renders a manually-authored cookie value when preparing a request to send', async () => {
+    const workspace = await services.workspace.create();
+    const cookieJar = await services.cookieJar.getOrCreateForParentId(workspace._id);
+    await services.cookieJar.update(cookieJar, {
+      cookies: [
+        {
+          id: 'c2',
+          key: 'session',
+          value: templateCookieValue,
+          domain: 'localhost',
+          path: '/',
+          secure: false,
+          httpOnly: false,
+          source: 'manual',
+        },
+      ],
+    });
+    const request = Object.assign(models.request.init(), {
+      _id: 'req_manual_cookie',
+      parentId: workspace._id,
+      url: 'http://localhost',
+    });
+
+    const renderedRequest = await getRenderedRequest({ request });
+    const sessionCookie = renderedRequest.cookieJar.cookies.find(c => c.key === 'session');
+
+    expect(sessionCookie?.value).not.toBe(templateCookieValue);
+    expect(sessionCookie?.value).toMatch(/^[0-9a-f-]{36}$/);
+  });
+});
+
+describe('response tag template rendering', () => {
+  // A stored response's body/headers can contain template syntax. The {% response %} tag pulls
+  // that raw content into another request's field, so render() must not treat the tag's
+  // returned content as a second template pass, or a value that only reached the render
+  // context via a prior response would be evaluated as a live template.
+  const nestedTemplateHeaderValue = "{% set x = 'value' %}{{x}}";
+
+  it('does not re-render template syntax pulled in from a stored response header', async () => {
+    const workspace = await services.workspace.create();
+    const sourceRequest = await services.request.create({
+      parentId: workspace._id,
+      url: 'http://localhost/source',
+    });
+    await services.response.create({
+      parentId: sourceRequest._id,
+      statusCode: 200,
+      statusMessage: 'OK',
+      headers: [{ name: 'X-Source', value: nestedTemplateHeaderValue }],
+      contentType: 'text/plain',
+    });
+
+    const request = Object.assign(models.request.init(), {
+      _id: 'req_response_tag_test',
+      parentId: workspace._id,
+      url: 'http://localhost/target',
+      headers: [{ name: 'X-Forwarded', value: `{% response 'header', '${sourceRequest._id}', 'X-Source', 'never', 60 %}` }],
+    });
+
+    const renderedRequest = await getRenderedRequest({ request });
+    const forwardedHeader = renderedRequest.headers.find(h => h.name === 'X-Forwarded');
+
+    expect(forwardedHeader?.value).toBe(nestedTemplateHeaderValue);
+  });
+
+  it('does not re-render template syntax pulled in from an OAuth2 access token via the request tag', async () => {
+    const workspace = await services.workspace.create();
+    const maliciousAccessToken = "{% set x = 'pwned' %}{{x}}";
+    const request = await services.request.create({
+      parentId: workspace._id,
+      url: 'http://localhost/target',
+      headers: [{ name: 'X-Forwarded-Token', value: "{% request 'oauth2' %}" }],
+    });
+    await services.oAuth2Token.create({
+      parentId: request._id,
+      accessToken: maliciousAccessToken,
+    });
+
+    const renderedRequest = await getRenderedRequest({ request });
+    const forwardedHeader = renderedRequest.headers.find(h => h.name === 'X-Forwarded-Token');
+
+    expect(forwardedHeader?.value).toBe(maliciousAccessToken);
+  });
+});
+
 describe('getRenderedRequest suppressUserAgent', () => {
   it('suppresses default user-agent when a custom user-agent header is disabled', async () => {
     const workspace = await services.workspace.create();
diff --git a/packages/insomnia/src/network/concurrency.renderer.ts b/packages/insomnia/src/network/concurrency.renderer.ts
index 38da83219a..bc5fdd062a 100644
--- a/packages/insomnia/src/network/concurrency.renderer.ts
+++ b/packages/insomnia/src/network/concurrency.renderer.ts
@@ -11,7 +11,7 @@ import type {
 } from 'insomnia-data';
 
 import type { RequestContext } from '../../../insomnia-scripting-environment/src/objects';
-import { runScriptInQuickJs } from '../scripting/run-script-quickjs';
+import { QUICKJS_SANDBOX_ENABLED, runScriptInQuickJs } from '../scripting/run-script-quickjs';
 import { cancellableExecution } from './cancellation.renderer';
 
 export interface ExecuteScriptContext {
@@ -61,8 +61,10 @@ async function asyncWorker(arg: Task): Promise<any> {
     setTimeout(resolve, timeoutValue, { error: `Executing script timeout: ${timeoutValue}` }),
   );
   // Proof of concept: opt-in path that runs the script in a QuickJS-WASM sandbox instead of the
-  // hidden Electron BrowserWindow. Defaults to off (see settings.useQuickJsScriptSandbox).
-  const runScript = arg.context.settings.useQuickJsScriptSandbox
+  // hidden Electron BrowserWindow. Defaults to off (see settings.useQuickJsScriptSandbox), and
+  // gated behind QUICKJS_SANDBOX_ENABLED while sandbox support is paused.
+  const useQuickJsSandbox = QUICKJS_SANDBOX_ENABLED && arg.context.settings.useQuickJsScriptSandbox;
+  const runScript = useQuickJsSandbox
     ? runScriptInQuickJs({ script: arg.script, context: arg.context })
     : window.main.hiddenBrowserWindow.runScript({ script: arg.script, context: arg.context });
   const executionPromise = Promise.race([runScript, timeoutPromise]);
diff --git a/packages/insomnia/src/network/network.ts b/packages/insomnia/src/network/network.ts
index 4ae546d87c..8e014946aa 100644
--- a/packages/insomnia/src/network/network.ts
+++ b/packages/insomnia/src/network/network.ts
@@ -424,10 +424,14 @@ export async function savePatchesMadeByScript(patches: {
 
   // persist updated cookieJar if needed
   if (mutatedContext.cookieJar) {
-    // merge cookies from response to the cookiejar, or cookies from response will not be persisted
-    await services.cookieJar.update(mutatedContext.cookieJar, {
-      cookies: [...(responseCookies || []), ...mutatedContext.cookieJar.cookies],
-    });
+    // merge cookies from response to the cookiejar, or cookies from response will not be persisted.
+    // responseCookies already carry their own 'manual'/'response' tag; anything in
+    // mutatedContext.cookieJar.cookies without one was created/edited directly by the script,
+    // which is trusted like a manual edit.
+    const cookies = [...(responseCookies || []), ...mutatedContext.cookieJar.cookies].map(cookie =>
+      cookie.source ? cookie : { ...cookie, source: 'manual' as const },
+    );
+    await services.cookieJar.update(mutatedContext.cookieJar, { cookies });
   }
   // when base environment is activated, `mutatedContext.environment` points to it
   const isActiveEnvironmentBase = mutatedContext.environment?._id === baseEnvironment._id;
diff --git a/packages/insomnia/src/network/set-cookie-util.test.ts b/packages/insomnia/src/network/set-cookie-util.test.ts
index 91fdbfbe83..39f1b06f85 100644
--- a/packages/insomnia/src/network/set-cookie-util.test.ts
+++ b/packages/insomnia/src/network/set-cookie-util.test.ts
@@ -28,4 +28,55 @@ describe('addSetCookiesToToughCookieJar', () => {
 
     expect(cookies.map(c => c.key)).toEqual(expect.arrayContaining(['a', 'b']));
   });
+
+  // A cookie value set via a response may contain Nunjucks/Liquid template syntax. Only
+  // 'manual' cookies are ever rendered as templates (see cookies-modal.tsx), so every cookie
+  // a response actually sets/updates must always come out tagged 'response' here, even if a
+  // same-named cookie was previously tagged 'manual', so a later response can't relabel a
+  // cookie it controls as 'manual' and have its value rendered.
+  describe('cookie provenance', () => {
+    it('tags a brand-new cookie as response-sourced', async () => {
+      const { cookies } = await addSetCookiesToToughCookieJar({
+        setCookieStrings: ['tracking=a={{ _.some_secret }}; Path=/'],
+        currentUrl: 'http://localhost:3000/',
+        cookieJar: { cookies: [] },
+      });
+
+      expect(cookies.find(c => c.key === 'tracking')?.source).toBe('response');
+    });
+
+    it('downgrades a same-name manually-tagged cookie to response-sourced when a response sets it', async () => {
+      const manualCookie = {
+        id: 'cookie_1', key: 'tracking', value: 'safe', domain: 'localhost', path: '/',
+        secure: false, httpOnly: false, source: 'manual' as const,
+      };
+
+      const { cookies } = await addSetCookiesToToughCookieJar({
+        setCookieStrings: ['tracking=a={{ _.some_secret }}; Path=/'],
+        currentUrl: 'http://localhost:3000/',
+        cookieJar: { cookies: [manualCookie] },
+      });
+
+      expect(cookies.find(c => c.key === 'tracking')?.source).toBe('response');
+    });
+
+    it('preserves an untouched manual cookie across an unrelated Set-Cookie response', async () => {
+      const manualCookie = {
+        id: 'cookie_1', key: 'untouched', value: '{{ _.base_url }}', domain: 'localhost', path: '/',
+        secure: false, httpOnly: false, source: 'manual' as const,
+      };
+
+      const { cookies } = await addSetCookiesToToughCookieJar({
+        setCookieStrings: ['other=1; Path=/'],
+        currentUrl: 'http://localhost:3000/',
+        cookieJar: { cookies: [manualCookie] },
+      });
+
+      const untouched = cookies.find(c => c.key === 'untouched');
+      expect(untouched?.source).toBe('manual');
+      expect(untouched?.id).toBe('cookie_1');
+      const fresh = cookies.find(c => c.key === 'other');
+      expect(fresh?.source).toBe('response');
+    });
+  });
 });
diff --git a/packages/insomnia/src/network/set-cookie-util.ts b/packages/insomnia/src/network/set-cookie-util.ts
index 58fedea532..49372c8885 100644
--- a/packages/insomnia/src/network/set-cookie-util.ts
+++ b/packages/insomnia/src/network/set-cookie-util.ts
@@ -2,18 +2,44 @@ import type { Cookie } from 'insomnia-data';
 
 import { cookiesFromJar, jarFromCookies } from '../common/cookies';
 
+const cookieIdentityKey = (cookie: Pick<Cookie, 'domain' | 'path' | 'key'>) =>
+  `${cookie.domain}\0${cookie.path}\0${cookie.key}`;
+
 export const addSetCookiesToToughCookieJar = async ({ setCookieStrings, currentUrl, cookieJar }: any) => {
   const rejectedCookies: string[] = [];
   const jar = jarFromCookies(cookieJar.cookies);
+  const touchedByThisResponse = new Set<string>();
   for (const setCookieStr of setCookieStrings) {
     try {
-      jar.setCookieSync(setCookieStr, currentUrl);
+      // The vendored tough-cookie type augmentation (types/tough-cookie.d.ts) mistypes
+      // setCookieSync as returning void; it actually returns the Cookie that was set.
+      const setCookie = jar.setCookieSync(setCookieStr, currentUrl) as unknown as
+        | Pick<Cookie, 'domain' | 'path' | 'key'>
+        | undefined;
+      if (setCookie) {
+        touchedByThisResponse.add(cookieIdentityKey(setCookie));
+      }
     } catch (err) {
       if (err instanceof Error) {
         rejectedCookies.push(err.message);
       }
     }
   }
-  const cookies = (await cookiesFromJar(jar)) as Cookie[];
+
+  // tough-cookie's serialization round-trip only preserves its own known cookie fields, so
+  // `id`/`source` are lost and must be reconciled by hand: any cookie this response actually
+  // set is always (re-)stamped 'response', regardless of what it was tagged before, so a
+  // cookie's origin always reflects the most recent write to it — everything else keeps its
+  // prior identity and origin.
+  const previousById = new Map((cookieJar.cookies as Cookie[]).map(cookie => [cookieIdentityKey(cookie), cookie]));
+  const cookies = ((await cookiesFromJar(jar)) as Cookie[]).map(cookie => {
+    const key = cookieIdentityKey(cookie);
+    const previous = previousById.get(key);
+    if (touchedByThisResponse.has(key)) {
+      return { ...cookie, id: previous?.id ?? cookie.id, source: 'response' as const };
+    }
+    return { ...cookie, id: previous?.id ?? cookie.id, source: previous?.source ?? 'response' };
+  });
+
   return { cookies, rejectedCookies };
 };
diff --git a/packages/insomnia/src/plugins/context/network.ts b/packages/insomnia/src/plugins/context/network.ts
index b9082fbf3b..44f308658f 100644
--- a/packages/insomnia/src/plugins/context/network.ts
+++ b/packages/insomnia/src/plugins/context/network.ts
@@ -1,4 +1,5 @@
 import { services } from 'insomnia-data';
+import { ProxyScopes } from 'insomnia-data/common';
 import { v4 as uuidv4 } from 'uuid';
 
 import type { NodeCurlRequestOptions, NodeCurlResponseType, PluginTemplateTagContext } from '~/common/templating/types';
@@ -56,6 +57,10 @@ export function init(): {
       async sendRequestWithoutSideEffects(options: NodeCurlRequestOptions): Promise<NodeCurlResponseType> {
         const requestId = uuidv4();
         const settings = await services.settings.get();
+        if (settings.proxyScope !== ProxyScopes.all) {
+          // Disable proxying unless user chooses "All traffic sent by Insomnia" (all).
+          settings.proxyEnabled = false;
+        }
         const settingFollowRedirects = settings?.followRedirects ? 'on' : 'off';
         const { request: originRequest, caCertficatePath = null } = options;
         const curlRequest = __IS_RENDERER__
diff --git a/packages/insomnia/src/root.tsx b/packages/insomnia/src/root.tsx
index 8edd4d4a20..ac7e335ba2 100644
--- a/packages/insomnia/src/root.tsx
+++ b/packages/insomnia/src/root.tsx
@@ -442,7 +442,7 @@ const Root = () => {
           },
         });
       }
-      // Supports params: uri, curl, origin
+      // Supports params: uri, mcp, curl, clipboard, file, origin, endpoint, operationId
       if (urlWithoutParams === 'insomnia://app/import') {
         // Clean up the flag set during deep-link replay so it never leaks
         // into later modal evaluations within the same session.
@@ -470,8 +470,13 @@ const Root = () => {
         if (!resource) {
           return;
         }
-        // Only cURL gates auto-scan on async validation
-        const autoScan = resource.type === 'curl' ? (await validateCurl(resource.defaultValue)).isValid : true;
+        // Only value-bearing uri/mcp/cURL resources auto-scan; bare params
+        // (e.g. `?clipboard`) just open the modal with the tab selected.
+        const autoScan =
+          !!resource.defaultValue &&
+          (resource.type === 'curl'
+            ? (await validateCurl(resource.defaultValue)).isValid
+            : resource.type === 'uri' || resource.type === 'mcp');
         return setImportObject({
           ...resource,
           autoScan,
@@ -745,7 +750,7 @@ const Root = () => {
       <Modals />
       <AppHooks />
       {/* triggered by insomnia://app/import */}
-      {importObject.defaultValue && (
+      {importObject.startedAt && (
         <ImportModal
           key={importObject.startedAt}
           onHide={() => setImportObject({ type: 'clipboard', defaultValue: '' })}
diff --git a/packages/insomnia/src/routes/git-credentials.$id.related-projects.tsx b/packages/insomnia/src/routes/git-credentials.$id.related-projects.tsx
index a03e79fe57..49f78524d1 100644
--- a/packages/insomnia/src/routes/git-credentials.$id.related-projects.tsx
+++ b/packages/insomnia/src/routes/git-credentials.$id.related-projects.tsx
@@ -35,6 +35,7 @@ export async function clientLoader({ params }: Route.ClientLoaderArgs) {
   const currentUserOrganizationIds = new Set([
     ...organizations.map(o => o.id),
     models.organization.SCRATCHPAD_ORGANIZATION_ID,
+    models.organization.getKonnectOrganizationId(accountId),
   ]);
 
   const currentUserProjects = relatedProjects.filter(p => currentUserOrganizationIds.has(p.parentId));
diff --git a/packages/insomnia/src/routes/onboarding.$.tsx b/packages/insomnia/src/routes/onboarding.$.tsx
index e501744be4..aaba8cc9eb 100644
--- a/packages/insomnia/src/routes/onboarding.$.tsx
+++ b/packages/insomnia/src/routes/onboarding.$.tsx
@@ -1,56 +1,46 @@
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Link, Route, Routes, useLocation } from 'react-router';
 
+import { HAS_SEEN_ONBOARDING_KEY, ONBOARDING_VERSION } from '~/common/constants';
+import { docsPreRequestAndAfterResponseScripts } from '~/common/documentation';
 import { InsomniaLogo } from '~/ui/components/insomnia-icon';
-import { KongLogo } from '~/ui/components/kong-logo';
 import { TrailLinesContainer } from '~/ui/components/trail-lines-container';
-import custom_linting from '~/ui/images/onboarding/custom_linting.png';
-import first_request from '~/ui/images/onboarding/first_request.png';
-import konnect_integration from '~/ui/images/onboarding/konnect_integration.png';
-import sidebar_navigation from '~/ui/images/onboarding/sidebar_navigation.png';
+import new_api_collection from '~/ui/images/onboarding/new_api_collection.png';
+import scripts_for_unit_test from '~/ui/images/onboarding/scripts_for_unit_test.png';
 
 const features = [
   {
-    id: 'navigation_ux',
-    icon: <FontAwesomeIcon icon={['fas', 'mouse-pointer']} className="text-xl" />,
-    label: 'Updated sidebar navigation',
-    title: 'Introducing a simpler way to navigate',
-    description: 'The new sidebar experience makes it easier than ever to get to the resources you are working with.',
-    image: sidebar_navigation,
+    id: 'combine_collections_and_documents',
+    icon: <FontAwesomeIcon icon={['fas', 'bars']} className="text-xl" />,
+    label: 'New API Collection to combine Documents and Collections',
+    title: 'New API Collection to combine documents and collections',
+    description:
+      'For simplicity, we’ve combined documents and collections into API Collections. No functionality has changed - just the UI. You can now access your OpenAPI Specs right from the main API Collection screen.',
+    image: new_api_collection,
   },
   {
-    id: 'konnect_integration',
-    icon: <KongLogo />,
-    label: 'Konnect Integration',
-    title: 'Auto-sync your gateway service routes from Konnect',
-    description:
-      'Get right into testing your gateway configuration in Insomnia with the new Konnect platform integration.',
-    image: konnect_integration,
-  },
-  {
-    id: 'first_request_ux',
-    icon: <FontAwesomeIcon icon={['fas', 'add']} className="text-xl" />,
-    label: 'New Create Request Experience',
-    title: 'Need to send a new request? No problem!',
-    description:
-      'The new project home page provides you with a quick way to configure and send a new request -- all while saving it automatically for when you need it later.',
-    image: first_request,
-  },
-  {
-    id: 'custom_linting',
-    icon: <FontAwesomeIcon icon={['fas', 'file']} className="text-xl" />,
-    label: 'Custom Spec Linting',
-    title: 'Upload custom spec linting rules',
-    description:
-      'Now you can user your own spectral linting rules to help you edit API design files in Insomnia with confidence.',
-    image: custom_linting,
+    id: 'disable_legacy_unit_tests_by_default',
+    icon: <FontAwesomeIcon icon={['fas', 'code']} className="text-xl" />,
+    label: 'Document Unit Tests Disabled By Default',
+    title: 'Legacy documents unit tests functionality is no longer available by default',
+    description: (
+      <>
+        Best practice for both new and existing users continues to be testing via{' '}
+        <a href={docsPreRequestAndAfterResponseScripts} className="underline">
+          pre request and post-response scripts
+        </a>
+        . There is a new user setting to enable/disable it. Existing Unit Test users are not affected and we continue to
+        support this functionality.
+      </>
+    ),
+    image: scripts_for_unit_test,
   },
 ] satisfies {
   id: string;
   icon: React.ReactNode;
   label: string;
   title: string;
-  description: string;
+  description: React.ReactNode;
   image: string;
 }[];
 
@@ -136,15 +126,15 @@ const Component = () => {
   return (
     <div className="relative flex h-full w-full bg-(--color-bg) text-left">
       <TrailLinesContainer>
-        <div className="flex h-full min-h-[500px] w-[600px] flex-col items-center justify-center">
+        <div className="flex h-full min-h-125 w-150 flex-col items-center justify-center">
           <div className="relative flex h-auto w-full flex-col items-center justify-center gap-(--padding-sm) rounded-md border border-solid border-(--hl-sm) bg-(--hl-xs) p-(--padding-lg) pt-12">
             <InsomniaLogo className="absolute top-0 left-1/2 h-16 w-16 translate-x-[-50%] translate-y-[-50%] transform" />
             <div className="flex h-full flex-col gap-6 text-(--color-font)">
               <div className="flex flex-col gap-4 py-4">
-                <h1 className="text-center text-xl">🚀 Welcome to Insomnia 13!</h1>
+                <h1 className="text-center text-xl">🚀 Welcome to Insomnia {ONBOARDING_VERSION}!</h1>
                 <p className="text-center">
-                  A faster, more connected API workflow with unified navigation, Konnect gateway sync, and custom API
-                  governance support.
+                  API Collections now combine Documents and Collections, with OpenAPI Specs accessible directly, while
+                  legacy Unit Tests are hidden by default.
                 </p>
               </div>
               <div className="relative w-full flex-1">
@@ -162,7 +152,7 @@ const Component = () => {
                 <Link
                   className="rounded-xs border border-solid border-(--hl-md) bg-(--color-surprise) px-3 py-2 text-sm text-(--color-font-surprise) transition-colors hover:bg-(--color-surprise)/90 hover:no-underline"
                   to={window.localStorage.getItem('prefers-project-type') ? '/organization' : '/onboarding/migrate'}
-                  onClick={() => window.localStorage.setItem('hasSeenOnboardingV13', 'true')}
+                  onClick={() => window.localStorage.setItem(HAS_SEEN_ONBOARDING_KEY, 'true')}
                 >
                   Continue
                 </Link>
diff --git a/packages/insomnia/src/routes/organization.$organizationId._index.tsx b/packages/insomnia/src/routes/organization.$organizationId._index.tsx
index acbb9f88e1..65946d584d 100644
--- a/packages/insomnia/src/routes/organization.$organizationId._index.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId._index.tsx
@@ -1,6 +1,7 @@
 import { redirect } from 'react-router';
 
 import { syncProjects } from '~/common/project';
+import { getKonnectOrganizationEscapeRoute } from '~/ui/organization-utils';
 import { getInitialRouteForOrganization } from '~/ui/utils/router';
 
 import type { Route } from './+types/organization.$organizationId._index';
@@ -8,6 +9,14 @@ import type { Route } from './+types/organization.$organizationId._index';
 export async function clientLoader({ params }: Route.ClientLoaderArgs) {
   const { organizationId } = params;
 
+  // Every "no reachable project in this organization" fallback redirects here (deleting the last
+  // Konnect project one at a time, or the bulk Disconnect action) — this is where it's decided
+  // whether to land inside the organization normally or escape it because it just became invisible.
+  const escapeRoute = await getKonnectOrganizationEscapeRoute(organizationId);
+  if (escapeRoute) {
+    return redirect(escapeRoute);
+  }
+
   try {
     await syncProjects(organizationId);
   } catch {
diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators-check-seats.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators-check-seats.tsx
index f4419f21e3..bcbc9e5ade 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.collaborators-check-seats.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators-check-seats.tsx
@@ -1,5 +1,5 @@
 import { checkSeats } from 'insomnia-api';
-import { services } from 'insomnia-data';
+import { models, services } from 'insomnia-data';
 import { href } from 'react-router';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -12,6 +12,10 @@ export async function clientLoader({ params }: Route.ClientLoaderArgs) {
 
   const { organizationId } = params;
 
+  if (models.organization.isLocalOrganizationId(organizationId)) {
+    return { isAllowed: false };
+  }
+
   try {
     // Check whether the user can add a new collaborator
     // Use a random email to avoid hitting any existing member emails
diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators-search.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators-search.tsx
index e71e698f2b..cecbf3b846 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.collaborators-search.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators-search.tsx
@@ -1,5 +1,5 @@
 import { searchCollaborators } from 'insomnia-api';
-import { services } from 'insomnia-data';
+import { models, services } from 'insomnia-data';
 import { href } from 'react-router';
 
 import { createFetcherLoadHook } from '~/ui/utils/router';
@@ -11,6 +11,10 @@ export async function clientLoader({ params, request }: Route.ClientLoaderArgs)
 
   const { organizationId } = params;
 
+  if (models.organization.isLocalOrganizationId(organizationId)) {
+    return [];
+  }
+
   try {
     const requestUrl = new URL(request.url);
     const searchParams = Object.fromEntries(requestUrl.searchParams.entries());
diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.reinvite.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.reinvite.tsx
index 5dfe4d7eb8..df1bfbb125 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.reinvite.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.reinvite.tsx
@@ -1,7 +1,8 @@
 import { reinvite } from 'insomnia-api';
-import { services } from 'insomnia-data';
+import { models, services } from 'insomnia-data';
 import { href } from 'react-router';
 
+import { invariant } from '~/common/utils/invariant';
 import { createFetcherSubmitHook } from '~/ui/utils/router';
 
 import type { Route } from './+types/organization.$organizationId.collaborators.invites.$invitationId.reinvite';
@@ -9,6 +10,11 @@ import type { Route } from './+types/organization.$organizationId.collaborators.
 export async function clientAction({ params }: Route.ClientActionArgs) {
   const { organizationId, invitationId } = params;
 
+  invariant(
+    !models.organization.isLocalOrganizationId(organizationId),
+    'Invitations are not available for this organization',
+  );
+
   try {
     const user = await services.userSession.get();
     const sessionId = user.id;
diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.tsx
index 3e4a46d0e8..1765127c79 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.tsx
@@ -1,5 +1,5 @@
 import { updateInvitationRole } from 'insomnia-api';
-import { services } from 'insomnia-data';
+import { models, services } from 'insomnia-data';
 import { href } from 'react-router';
 
 import { invariant } from '~/common/utils/invariant';
@@ -10,6 +10,11 @@ import type { Route } from './+types/organization.$organizationId.collaborators.
 export async function clientAction({ request, params }: Route.ClientActionArgs) {
   const { organizationId, invitationId } = params;
 
+  invariant(
+    !models.organization.isLocalOrganizationId(organizationId),
+    'Invitations are not available for this organization',
+  );
+
   const formData = await request.formData();
 
   const roleId = formData.get('roleId');
diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators.tsx
index 12bc8b5b18..83e93c2038 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.collaborators.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators.tsx
@@ -1,5 +1,5 @@
 import { getCollaborators } from 'insomnia-api';
-import { services } from 'insomnia-data';
+import { models, services } from 'insomnia-data';
 import { href } from 'react-router';
 
 import { createFetcherLoadHook } from '~/ui/utils/router';
@@ -11,6 +11,10 @@ export async function clientLoader({ params, request }: Route.ClientLoaderArgs)
 
   const { organizationId } = params;
 
+  if (models.organization.isLocalOrganizationId(organizationId)) {
+    return { collaborators: [], start: 0, limit: 0, length: 0, total: 0, next: '' };
+  }
+
   try {
     const requestUrl = new URL(request.url);
     const searchParams = Object.fromEntries(requestUrl.searchParams.entries());
diff --git a/packages/insomnia/src/routes/organization.$organizationId.insomnia-sync.delete-remote-file.tsx b/packages/insomnia/src/routes/organization.$organizationId.insomnia-sync.delete-remote-file.tsx
new file mode 100644
index 0000000000..a4c3d78a94
--- /dev/null
+++ b/packages/insomnia/src/routes/organization.$organizationId.insomnia-sync.delete-remote-file.tsx
@@ -0,0 +1,44 @@
+import { href } from 'react-router';
+
+import { invariant } from '~/common/utils/invariant';
+import uiEventBus, { CLOUD_SYNC_FILE_CHANGE } from '~/ui/event-bus';
+import { createFetcherSubmitHook } from '~/ui/utils/router';
+
+import type { Route } from './+types/organization.$organizationId.insomnia-sync.delete-remote-file';
+
+export async function clientAction({ request }: Route.ClientActionArgs) {
+  try {
+    const formData = await request.formData();
+
+    const backendProjectId = formData.get('backendProjectId');
+    invariant(typeof backendProjectId === 'string', 'Backend project Id is required');
+
+    await window.main.sync.archiveBackendProject(backendProjectId);
+    uiEventBus.emit(CLOUD_SYNC_FILE_CHANGE);
+
+    return { error: null };
+  } catch (e) {
+    console.warn('Failed to delete remote file', e);
+    return {
+      error: e instanceof Error ? e.message : 'Failed to delete remote file',
+    };
+  }
+}
+
+export const useInsomniaSyncDeleteRemoteFileActionFetcher = createFetcherSubmitHook(
+  submit =>
+    ({ organizationId, backendProjectId }: { organizationId: string; backendProjectId: string }) => {
+      const url = href('/organization/:organizationId/insomnia-sync/delete-remote-file', {
+        organizationId,
+      });
+
+      const formData = new FormData();
+      formData.set('backendProjectId', backendProjectId);
+
+      return submit(formData, {
+        action: url,
+        method: 'POST',
+      });
+    },
+  clientAction,
+);
diff --git a/packages/insomnia/src/routes/organization.$organizationId.members.$userId.roles.tsx b/packages/insomnia/src/routes/organization.$organizationId.members.$userId.roles.tsx
index 6318a4a03e..769720e428 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.members.$userId.roles.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.members.$userId.roles.tsx
@@ -1,5 +1,5 @@
 import { updateUserRoles } from 'insomnia-api';
-import { services } from 'insomnia-data';
+import { models, services } from 'insomnia-data';
 import { href } from 'react-router';
 
 import { invariant } from '~/common/utils/invariant';
@@ -10,6 +10,10 @@ import type { Route } from './+types/organization.$organizationId.members.$userI
 export async function clientAction({ request, params }: Route.ClientActionArgs) {
   const { organizationId, userId } = params;
 
+  if (models.organization.isLocalOrganizationId(organizationId)) {
+    return { error: 'Organization members are not available for this organization' };
+  }
+
   const formData = await request.formData();
 
   const roleId = formData.get('roleId');
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx
index f3adfc6339..d623e8f3c2 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx
@@ -33,7 +33,6 @@ import { getAllLocalFiles } from '~/common/project';
 import { sortMethodMap } from '~/common/sorting';
 import { invariant } from '~/common/utils/invariant';
 import { useRootLoaderData } from '~/root';
-import { useOrganizationLoaderData } from '~/routes/organization';
 import { useInsomniaSyncPullRemoteFileActionFetcher } from '~/routes/organization.$organizationId.insomnia-sync.pull-remote-file';
 import { useProjectLoaderData, useProjectRouteContext } from '~/routes/organization.$organizationId.project.$projectId';
 import { useWorkspaceNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.new';
@@ -52,7 +51,9 @@ import { ProjectEmptyView } from '~/ui/components/project/project-empty-view';
 import { OrganizationTabList } from '~/ui/components/tabs/tab-list';
 import { TimeFromNow } from '~/ui/components/time-from-now';
 import { showResourceNotFoundToast } from '~/ui/components/toast-notification';
+import { UnsyncedFileDeleteButton } from '~/ui/components/unsynced-file-delete-button';
 import { useInsomniaEventStreamContext } from '~/ui/context/app/insomnia-event-stream-context';
+import { useOrganizations } from '~/ui/hooks/use-account-server-data';
 import { useGitFileIssues } from '~/ui/hooks/use-git-file-issues';
 import { useTabNavigate } from '~/ui/hooks/use-insomnia-tab';
 import { useOrganizationData } from '~/ui/hooks/use-organization-data';
@@ -78,7 +79,7 @@ export async function clientLoader({ params }: Route.ClientLoaderArgs) {
 const Component = ({ loaderData }: Route.ComponentProps) => {
   const { localFiles } = loaderData;
   const { activeProject, activeProjectGitRepository } = useProjectLoaderData()!;
-  const { activeSidebarTab } = useProjectRouteContext();
+  const { isKonnectOrganization } = useProjectRouteContext();
   const { organizationId, projectId } = useParams() as {
     organizationId: string;
     projectId: string;
@@ -97,7 +98,7 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
     )
     .map(f => f.formData?.get('backendProjectId'));
 
-  const organizationData = useOrganizationLoaderData();
+  const organizations = useOrganizations();
   const { presence } = useInsomniaEventStreamContext();
   const { issuesByWorkspaceId } = useGitFileIssues();
   const storageRules = useOrganizationStorageRule(organizationId);
@@ -120,7 +121,7 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
   const [importModalType, setImportModalType] = useState<'file' | 'clipboard' | 'uri' | null>(null);
   const [isNewProjectModalOpen, setIsNewProjectModalOpen] = useState(false);
   const [isUpdateProjectModalOpen, setIsUpdateProjectModalOpen] = useState(false);
-  const organization = organizationData?.organizations.find(o => o.id === organizationId);
+  const organization = organizations.find(o => o.id === organizationId);
   const isUserOwner = Boolean(organization?.is_owner);
   const collectionItems = useMemo(
     () =>
@@ -236,7 +237,8 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
     [setNewWorkspaceModalState],
   );
   const createNewDocument = useCallback(
-    (source: string) => setNewWorkspaceModalState({ scope: 'design', isOpen: true, source }),
+    // Create collection instead of design document for now.
+    (source: string) => setNewWorkspaceModalState({ scope: 'collection', isOpen: true, source }),
     [setNewWorkspaceModalState],
   );
   const createNewMockServer = useCallback(
@@ -280,18 +282,11 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
     () => [
       {
         id: 'new-collection',
-        name: 'Collection',
+        name: 'API Collection',
         icon: 'bars',
         action: () => createNewCollection('navbar'),
         scope: 'collection',
       },
-      {
-        id: 'new-document',
-        name: 'Document',
-        icon: 'file',
-        action: () => createNewDocument('navbar'),
-        scope: 'design',
-      },
       {
         id: 'new-mcp-client',
         name: 'MCP Client',
@@ -318,14 +313,7 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
         scope: 'environment',
       },
     ],
-    [
-      canCreateMockServer,
-      createNewCollection,
-      createNewDocument,
-      createNewGlobalEnvironment,
-      createNewMcpClient,
-      createNewMockServer,
-    ],
+    [canCreateMockServer, createNewCollection, createNewGlobalEnvironment, createNewMcpClient, createNewMockServer],
   );
 
   const isRemoteProjectInconsistent =
@@ -345,7 +333,7 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
       <Fragment>
         <OrganizationTabList showActiveStatus={false} />
         <div className="px-4 pt-4">
-          {activeSidebarTab === 'projects' && (
+          {!isKonnectOrganization && (
             <FirstRequestCreation
               collectionItems={collectionItems}
               selectedCollectionId={selectedCollectionId}
@@ -610,7 +598,7 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
                       onPress={e => {
                         item.action(isPrimaryClickModifier(e));
                       }}
-                      className={`flex aspect-square w-full flex-1 flex-col overflow-hidden rounded-md p-(--padding-md) ring-1 ring-(--hl-md) outline-hidden transition-all select-none hover:bg-(--hl-xs) hover:shadow-md hover:ring-(--hl-sm) focus:bg-(--hl-sm) focus:ring-(--hl-lg) ${item.loading ? 'animate-pulse' : ''}`}
+                      className={`group flex aspect-square w-full flex-1 flex-col overflow-hidden rounded-md p-(--padding-md) ring-1 ring-(--hl-md) outline-hidden transition-all select-none hover:bg-(--hl-xs) hover:shadow-md hover:ring-(--hl-sm) focus:bg-(--hl-sm) focus:ring-(--hl-lg) ${item.loading ? 'animate-pulse' : ''}`}
                     >
                       <div className="flex h-5 gap-2">
                         <div className="flex h-full shrink-0 items-center gap-2 rounded-xs bg-(--hl-xs) pr-2 text-sm text-(--color-font)">
@@ -635,6 +623,13 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
                             project={activeProject}
                           />
                         )}
+                        {item.scope === 'unsynced' && item.remoteId && (
+                          <UnsyncedFileDeleteButton
+                            organizationId={organizationId}
+                            backendProjectId={item.remoteId}
+                            name={item.name}
+                          />
+                        )}
                       </div>
                       <TooltipTrigger>
                         <span className="line-clamp-4 pt-4 text-base font-bold outline-hidden">{item.name}</span>
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete.tsx
index b61d6cf204..41705cf7ad 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete.tsx
@@ -6,6 +6,7 @@ import { database } from '~/common/database';
 import { projectLock } from '~/common/project';
 import { invariant } from '~/common/utils/invariant';
 import { reportGitProjectCount } from '~/routes/organization.$organizationId.project.new';
+import { getKonnectOrganizationEscapeRoute } from '~/ui/organization-utils';
 import { createFetcherSubmitHook, getInitialRouteForOrganization } from '~/ui/utils/router';
 
 import type { Route } from './+types/organization.$organizationId.project.$projectId.delete';
@@ -68,6 +69,14 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
           }),
         );
       }
+
+      // That was the last Konnect project — check whether the organization just became invisible
+      // (no entitlement to fall back on) before falling through to the generic redirect below,
+      // which would otherwise land back inside it via `getInitialRouteForOrganization`.
+      const escapeRoute = await getKonnectOrganizationEscapeRoute(organizationId);
+      if (escapeRoute) {
+        return redirect(escapeRoute);
+      }
     }
 
     // When redirect to `/organizations/:organizationId`, it sometimes doesn't reload the index loader, so manually redirect to the initial route for the organization
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx
index 87e9fd9672..dfb6fb3d86 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx
@@ -1,29 +1,9 @@
-import { getLearningFeature } from 'insomnia-api';
 import { models, services } from 'insomnia-data';
-import { type Dispatch, type SetStateAction, useEffect, useRef, useState } from 'react';
-import { Button, Heading } from 'react-aria-components';
-import { type ImperativePanelHandle, Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels';
-import { href, Outlet, redirect, useOutletContext, useParams, useRouteLoaderData, useSearchParams } from 'react-router';
-import * as reactUse from 'react-use';
+import { href, Outlet, redirect, useOutletContext, useParams, useRouteLoaderData } from 'react-router';
 
-import { Icon } from '~/basic-components/icon';
-import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants';
 import { invariant } from '~/common/utils/invariant';
 import { logout } from '~/ui/account/session';
-import { ProjectModal } from '~/ui/components/modals/project-modal';
-import { ScratchPadTutorialPanel } from '~/ui/components/panes/scratchpad-tutorial-pane';
-import {
-  ProjectNavigationSidebar,
-  type ProjectNavigationSidebarHandle,
-  type ProjectNavigationSidebarTabId,
-} from '~/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar';
-import { SyncBar } from '~/ui/components/sidebar/sync-bar';
-import { useSidebarContext } from '~/ui/context/app/insomnia-sidebar-context';
 import { GitFileIssuesProvider, useProjectGitFileIssues } from '~/ui/hooks/use-git-file-issues';
-import { useOrganizationPermissions } from '~/ui/hooks/use-organization-features';
-import { useOrganizationStorageRule } from '~/ui/hooks/use-organization-storage-rule';
-import { useServerQuery } from '~/ui/hooks/use-query';
-import { useRemoteBackendProjectsInvalidation } from '~/ui/hooks/use-remote-files';
 
 import type { Route } from './+types/organization.$organizationId.project.$projectId';
 
@@ -43,27 +23,16 @@ export async function clientLoader({ params }: Route.ClientLoaderArgs) {
   const project = await services.project.getById(projectId);
 
   if (!project) {
-    // When a project is not found (e.g., after deletion), check if user was on Konnect tab
-    // and try to redirect to another Konnect project to avoid switching tabs
-    const storedTab = localStorage.getItem(`${organizationId}:sidebar-tab`);
-    if (storedTab) {
-      try {
-        const parsedTab = JSON.parse(storedTab);
-        if (parsedTab === 'konnect') {
-          const allProjects = await services.project.listByOrganizationIds(organizationId);
-          const konnectProjects = models.project.sortProjects(allProjects.filter(p => p.konnectControlPlaneId != null));
-          if (konnectProjects.length > 0) {
-            return redirect(
-              href('/organization/:organizationId/project/:projectId', {
-                organizationId,
-                projectId: konnectProjects[0]._id,
-              }),
-            );
-          }
-        }
-      } catch {
-        // ignore parse errors
-      }
+    // The project was deleted; stay inside the current organization rather than bouncing the user out.
+    const allProjects = await services.project.listByOrganizationIds(organizationId);
+    const [fallbackProject] = models.project.sortProjects(allProjects);
+    if (fallbackProject) {
+      return redirect(
+        href('/organization/:organizationId/project/:projectId', {
+          organizationId,
+          projectId: fallbackProject._id,
+        }),
+      );
     }
     return redirect(href('/organization/:organizationId', { organizationId }));
   }
@@ -96,56 +65,29 @@ export function useProjectLoaderData() {
 }
 
 export interface ProjectRouteContextValue {
-  activeSidebarTab: ProjectNavigationSidebarTabId;
-  setActiveSidebarTab: Dispatch<SetStateAction<ProjectNavigationSidebarTabId | undefined>>;
+  isKonnectOrganization: boolean;
 }
 
 export function useProjectRouteContext() {
   return useOutletContext<ProjectRouteContextValue>();
 }
 
+/**
+ * The shell around this route (sidebar, panels, project modal) lives in the parent
+ * `organization.$organizationId.project` layout so it survives the transition between having and
+ * not having a selected project. This route only contributes the parts that need the active
+ * project itself.
+ */
 const Component = ({ loaderData }: Route.ComponentProps) => {
   const { organizationId } = useParams() as {
     organizationId: string;
     projectId: string;
   };
 
-  const [searchParams] = useSearchParams();
   const { activeProject } = loaderData;
 
-  const [isLearningFeatureDismissed, setIsLearningFeatureDismissed] = reactUse.useLocalStorage(
-    'learning-feature-dismissed',
-    '',
-  );
-  const storageRules = useOrganizationStorageRule(organizationId);
-  const { data: learningFeature } = useServerQuery({
-    queryKey: ['learning-feature'],
-    queryFn: getLearningFeature,
-    enabled: !isLearningFeatureDismissed,
-    staleTime: 1000 * 60 * 60 * 24, // 1 day
-    refetchOnWindowFocus: true,
-  });
-  const sidebarPanelRef = useRef<ImperativePanelHandle>(null);
-  const { isSidebarCollapsed } = useSidebarContext();
+  const isKonnectOrganization = models.organization.isKonnectOrganizationId(organizationId);
 
-  const [isNewProjectModalOpen, setIsNewProjectModalOpen] = useState(false);
-
-  useEffect(() => {
-    if (isSidebarCollapsed) {
-      sidebarPanelRef.current?.collapse();
-    } else {
-      sidebarPanelRef.current?.expand();
-    }
-  }, [isSidebarCollapsed]);
-
-  const { features } = useOrganizationPermissions();
-  const [storedSidebarTab, setActiveSidebarTab] = reactUse.useLocalStorage<ProjectNavigationSidebarTabId>(
-    `${organizationId}:sidebar-tab`,
-    'projects',
-  );
-  const activeSidebarTab = !features.konnectSync.enabled ? 'projects' : (storedSidebarTab ?? 'projects');
-
-  const isScratchPad = models.project.isScratchpadProject(activeProject);
   const gitRepositoryId =
     activeProject && models.project.isConnectedGitProject(activeProject)
       ? models.project.getEffectiveRepoId(activeProject)
@@ -155,89 +97,14 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
     gitRepositoryId,
   });
 
-  const navigationSidebarRef = useRef<ProjectNavigationSidebarHandle>(null);
-
-  useEffect(() => {
-    const isExpanded = searchParams.get('isExpanded') === 'true';
-    if (navigationSidebarRef.current && isExpanded && activeProject) {
-      navigationSidebarRef.current.expandProject(activeProject._id);
-    }
-  }, [searchParams, activeProject]);
-
-  useRemoteBackendProjectsInvalidation(organizationId);
-
   return (
-    <>
-      <PanelGroup
-        autoSaveId="insomnia-global-sidebar"
-        id="wrapper"
-        className="new-sidebar h-full w-full text-(--color-font)"
-        direction="horizontal"
-      >
-        <Panel
-          ref={sidebarPanelRef}
-          id="insomnia-global-navigation-sidebar"
-          className="sidebar theme--sidebar"
-          defaultSize={DEFAULT_SIDEBAR_SIZE}
-          maxSize={40}
-          minSize={10}
-          collapsible
-        >
-          <div className="flex flex-1 flex-col divide-y divide-solid divide-(--hl-md) overflow-hidden">
-            <ProjectNavigationSidebar
-              activeTab={activeSidebarTab}
-              storageRules={storageRules}
-              konnectSyncEnabled={features.konnectSync.enabled}
-              onCreateProject={() => setIsNewProjectModalOpen(true)}
-              setActiveTab={setActiveSidebarTab}
-              ref={navigationSidebarRef}
-            />
-            {isScratchPad && <ScratchPadTutorialPanel />}
-            {!isLearningFeatureDismissed && learningFeature?.active && (
-              <div className="flex shrink-0 flex-col gap-2 p-(--padding-sm)">
-                <div className="flex items-center justify-between gap-2">
-                  <Heading className="text-base">
-                    <Icon icon="graduation-cap" />
-                    <span className="ml-2">{learningFeature.title}</span>
-                  </Heading>
-                  <Button
-                    onPress={() => {
-                      setIsLearningFeatureDismissed('true');
-                    }}
-                  >
-                    <Icon icon="close" />
-                  </Button>
-                </div>
-                <p className="text-sm text-(--hl)">{learningFeature.message}</p>
-                <a href={learningFeature.url} className="flex items-center gap-2 text-sm underline">
-                  {learningFeature.cta}
-                  <Icon icon="arrow-up-right-from-square" />
-                </a>
-              </div>
-            )}
-            <SyncBar />
-          </div>
-        </Panel>
-        <PanelResizeHandle className="relative z-10 h-full w-px bg-(--hl-md)" />
-        <Panel id="pane-one" className="pane-one theme--pane flex flex-col">
-          <GitFileIssuesProvider value={gitFileIssues}>
-            <Outlet
-              context={{
-                activeSidebarTab,
-                setActiveSidebarTab,
-              }}
-            />
-          </GitFileIssuesProvider>
-        </Panel>
-      </PanelGroup>
-      {isNewProjectModalOpen && (
-        <ProjectModal
-          isOpen={isNewProjectModalOpen}
-          onOpenChange={setIsNewProjectModalOpen}
-          storageRules={storageRules}
-        />
-      )}
-    </>
+    <GitFileIssuesProvider value={gitFileIssues}>
+      <Outlet
+        context={{
+          isKonnectOrganization,
+        }}
+      />
+    </GitFileIssuesProvider>
   );
 };
 export default Component;
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tutorial.$panel.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tutorial.$panel.tsx
index 6eb4480df4..7d08058f6c 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tutorial.$panel.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tutorial.$panel.tsx
@@ -13,19 +13,11 @@ export const scratchPadTutorialList: {
   learnMoreLink: string;
   icon: IconName | [IconPrefix, IconName];
 }[] = [
-  {
-    id: 'document',
-    title: `Documents`,
-    name: 'documents',
-    desc: 'Design or test an API by adding a document.',
-    learnMoreLink: 'https://developer.konghq.com/insomnia/documents/',
-    icon: 'file',
-  },
   {
     id: 'collection',
-    title: `Collections`,
+    title: `API Collections`,
     name: 'collections',
-    desc: 'Use collections to tests APIs and run automated tests.',
+    desc: 'Use API collections to design, test APIs and run automated tests.',
     learnMoreLink: 'https://developer.konghq.com/insomnia/collections/',
     icon: 'bars',
   },
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx
index 73497bb066..329ee3b249 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx
@@ -35,6 +35,11 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
 
   const { organizationId, projectId } = params;
 
+  invariant(
+    storageType === 'local' || !models.organization.isLocalOrganizationId(organizationId),
+    'Projects in this organization can only be stored locally',
+  );
+
   const project = await services.project.getById(projectId);
   invariant(project, 'Project not found');
 
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder.tsx
index cc56e3c5c3..d9596aa258 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder.tsx
@@ -17,7 +17,7 @@ const getCollectionItem = async (id: string) => {
 };
 
 export async function clientAction({ request }: Route.ClientActionArgs) {
-  const { id, targetId, dropPosition, metaSortKey } = await request.json();
+  const { id, targetId, dropPosition, metaSortKey, parentId: requestedParentId } = await request.json();
   invariant(typeof id === 'string', 'ID is required');
   invariant(typeof targetId === 'string', 'Target ID is required');
 
@@ -53,7 +53,15 @@ export async function clientAction({ request }: Route.ClientActionArgs) {
   const item = await getCollectionItem(id);
   const targetItem = await getCollectionItem(targetId);
 
-  const parentId = dropPosition === 'after' && isRequestGroup(targetItem) ? targetItem._id : targetItem.parentId;
+  // The sidebar resolves its own destination and sends it outright, from the
+  // same value its drop indicator renders. Other callers (debug.tsx onReorder)
+  // omit it and get the old "after a folder means into it" inference.
+  const parentId =
+    typeof requestedParentId === 'string'
+      ? requestedParentId
+      : dropPosition === 'after' && isRequestGroup(targetItem)
+        ? targetItem._id
+        : targetItem.parentId;
 
   await (isRequestGroup(item)
     ? services.requestGroup.update(item, { parentId, metaSortKey })
@@ -79,6 +87,8 @@ export const useDebugReorderActionFetcher = createFetcherSubmitHook(
             targetId: string;
             dropPosition: string;
             metaSortKey: number;
+            // Destination parent, when the caller resolved it itself.
+            parentId?: string;
           }
         | {
             type: 'move-workspace';
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx
index bd6548f6a6..2a728ff1c6 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx
@@ -33,7 +33,6 @@ import { buildRunnerItemKey, type RunnerItemStatus, type RunnerLiveItem } from '
 import { invariant } from '~/common/utils/invariant';
 import { defaultSendActionRuntime } from '~/network/network';
 import { useRootLoaderData } from '~/root';
-import { useOrganizationLoaderData } from '~/routes/organization';
 import type { CollectionRunnerContext } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send';
 import { sendActionImplementation } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send';
 import { AnalyticsEvent } from '~/ui/analytics';
@@ -55,6 +54,7 @@ import { Tooltip } from '~/ui/components/tooltip';
 import { ResponseTimelineViewer } from '~/ui/components/viewers/response-timeline-viewer';
 import { useInsomniaTabContext } from '~/ui/context/app/insomnia-tab-context';
 import { useRunnerContext } from '~/ui/context/app/runner-context';
+import { useCurrentPlan } from '~/ui/hooks/use-account-server-data';
 import { buildRunnerTabId } from '~/ui/hooks/use-insomnia-tab';
 import { useRunnerRequestList } from '~/ui/hooks/use-runner-request-list';
 import {
@@ -155,7 +155,7 @@ export const Runner: FC = () => {
   const [searchParams] = useSearchParams();
   const [errorMsg, setErrorMsg] = useState<null | string>(null);
 
-  const organizationData = useOrganizationLoaderData();
+  const currentPlan = useCurrentPlan();
   const targetFolderId = searchParams.get('folder') || '';
 
   const { organizationId, projectId, workspaceId } = useParams() as {
@@ -290,7 +290,7 @@ export const Runner: FC = () => {
 
     window.main.trackAnalyticsEvent({
       event: AnalyticsEvent.collectionRunExecute,
-      properties: { plan: organizationData?.currentPlan?.type || 'scratchpad', iterations: iterationCount },
+      properties: { plan: currentPlan?.type || 'scratchpad', iterations: iterationCount },
     });
 
     updateTabById?.(buildRunnerTabId(workspaceId, targetFolderId), { temporary: false });
@@ -681,7 +681,7 @@ export const Runner: FC = () => {
                     onSelectionChange={keys => {
                       updateRunnerState(organizationId, runnerId, { selectedKeys: keys });
                     }}
-                    aria-label="Request Collection"
+                    aria-label="Request API Collection"
                     dragAndDropHooks={requestsDnD}
                     className="h-full w-full overflow-auto text-base leading-8"
                     disabledKeys={disabledKeys}
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tsx
index 583e7ced75..c0cbb26ae2 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tsx
@@ -1,71 +1,29 @@
-import type { IconName } from '@fortawesome/fontawesome-svg-core';
 import type { ServiceError, StatusObject } from '@grpc/grpc-js';
-import { useVirtualizer } from '@tanstack/react-virtual';
-import type {
-  ChangeBufferEvent,
-  Environment,
-  GrpcRequest,
-  Project,
-  Request,
-  RequestGroup,
-  SocketIORequest,
-  WebSocketRequest,
-  Workspace,
-} from 'insomnia-data';
+import type { ChangeBufferEvent, Request } from 'insomnia-data';
 import { models, services } from 'insomnia-data';
-import type { PlatformKeyCombinations } from 'insomnia-data/common';
-import React, { Fragment, useCallback, useEffect, useRef, useState } from 'react';
-import {
-  Button,
-  Collection,
-  DropIndicator,
-  GridList,
-  GridListItem,
-  Header,
-  Input,
-  ListBox,
-  ListBoxItem,
-  Menu,
-  MenuItem,
-  MenuSection,
-  MenuTrigger,
-  Popover,
-  SearchField,
-  Select,
-  ToggleButton,
-  Tooltip,
-  TooltipTrigger,
-  useDragAndDrop,
-} from 'react-aria-components';
+import type { OpenAPIV3 } from 'openapi-types';
+import React, { useEffect, useRef, useState } from 'react';
 import { type ImperativePanelGroupHandle, Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels';
-import { href, redirect, useFetchers, useMatch, useParams, useSearchParams } from 'react-router';
-import * as reactUse from 'react-use';
+import { href, redirect, useLoaderData, useMatch, useParams } from 'react-router';
+import YAML from 'yaml';
 
-import { DEFAULT_SIDEBAR_SIZE, getProductName, SORT_ORDERS, type SortOrder, sortOrderName } from '~/common/constants';
+import { getProductName } from '~/common/constants';
 import { generateId } from '~/common/misc';
 import type { GrpcMethodInfo } from '~/main/ipc/grpc';
 import { useRootLoaderData } from '~/root';
 import {
-  type Child,
   useWorkspaceLoaderData,
   WORKSPACE_CONTENT_WRAPPER,
 } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
-import { useDebugReorderActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder';
 import { useRequestLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId';
 import { useRequestDuplicateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.duplicate';
 import { useRequestDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.delete';
 import { useRequestNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new';
 import { useRequestGroupNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.new';
 import Runner from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner';
-import { useToggleExpandAllActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.toggle-expand-all';
 import { AnalyticsEvent } from '~/ui/analytics';
-import { DropdownHint } from '~/ui/components/base/dropdown/dropdown-hint';
-import { DocumentTab } from '~/ui/components/document-tab';
-import { RequestActionsDropdown } from '~/ui/components/dropdowns/request-actions-dropdown';
-import { RequestGroupActionsDropdown } from '~/ui/components/dropdowns/request-group-actions-dropdown';
-import { EditableInput } from '~/ui/components/editable-input';
+import { CollectionTab } from '~/ui/components/collection-tab';
 import { ErrorBoundary } from '~/ui/components/error-boundary';
-import { Icon } from '~/ui/components/icon';
 import { useDocBodyKeyboardShortcuts } from '~/ui/components/keydown-binder';
 import { McpPane } from '~/ui/components/mcp/mcp-pane';
 import { showModal } from '~/ui/components/modals';
@@ -78,36 +36,25 @@ import { PromptModal } from '~/ui/components/modals/prompt-modal';
 import { RequestSettingsModal } from '~/ui/components/modals/request-settings-modal';
 import { GrpcRequestPane } from '~/ui/components/panes/grpc-request-pane';
 import { GrpcResponsePane } from '~/ui/components/panes/grpc-response-pane';
-import { PlaceholderRequestPane } from '~/ui/components/panes/placeholder-request-pane';
 import { RequestGroupPane } from '~/ui/components/panes/request-group-pane';
 import { RequestPane } from '~/ui/components/panes/request-pane';
 import { ResponsePane } from '~/ui/components/panes/response-pane';
 import { SocketIORequestPane } from '~/ui/components/socket-io/request-pane';
+import { SpecView } from '~/ui/components/spec-view';
 import { OrganizationTabList } from '~/ui/components/tabs/tab-list';
-import { getMethodShortHand } from '~/ui/components/tags/method-tag';
 import { showResourceNotFoundToast } from '~/ui/components/toast-notification';
 import { RealtimeResponsePane } from '~/ui/components/websockets/realtime-response-pane';
 import { WebSocketRequestPane } from '~/ui/components/websockets/websocket-request-pane';
 import WorkspacePaneHeader from '~/ui/components/workspace/workspace-pane-header';
-import { useExecutionState } from '~/ui/hooks/use-execution-state';
-import { useFilteredRequests } from '~/ui/hooks/use-filtered-requests';
 import { useTabNavigate } from '~/ui/hooks/use-insomnia-tab';
-import { useReadyState } from '~/ui/hooks/use-ready-state';
-import {
-  type CreateRequestType,
-  useRequestGroupMetaPatcher,
-  useRequestGroupPatcher,
-  useRequestMetaPatcher,
-  useRequestPatcher,
-} from '~/ui/hooks/use-request';
-import { isPrimaryClickModifier } from '~/ui/utils';
-import { scrollElementIntoView } from '~/ui/utils';
+import { type CreateRequestType, useRequestMetaPatcher } from '~/ui/hooks/use-request';
+import { resolveGitRepoBaseDir } from '~/ui/utils/git-repo-path';
 import { getGrpcConnectionErrorDetails, isGrpcConnectionError } from '~/ui/utils/grpc';
 
 import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug';
 
 const { isEventStreamRequest, isGraphqlSubscriptionRequest, isRequest, isRequestId } = models.request;
-const { isRequestGroup, isRequestGroupId } = models.requestGroup;
+const { isRequestGroupId } = models.requestGroup;
 
 export interface GrpcMessage {
   id: string;
@@ -135,77 +82,84 @@ const INITIAL_GRPC_REQUEST_STATE = {
 };
 
 export async function clientLoader({ params }: Route.ClientLoaderArgs) {
+  const { organizationId, projectId, workspaceId } = params;
+
+  const activeProject = await services.project.getById(projectId);
+  if (!activeProject) {
+    showResourceNotFoundToast(`Project not found: ${projectId}`);
+    throw redirect(href('/organization/:organizationId/project', { organizationId }));
+  }
+
   if (!params.requestId && !params.requestGroupId) {
     const { projectId, workspaceId, organizationId } = params;
 
-    const activeProject = await services.project.getById(projectId);
-    if (!activeProject) {
-      showResourceNotFoundToast(`Project not found: ${projectId}`);
-      throw redirect(href('/organization/:organizationId/project', { organizationId }));
-    }
-
     const activeWorkspace = await services.workspace.getById(workspaceId);
     if (!activeWorkspace) {
       showResourceNotFoundToast(`Workspace not found: ${workspaceId}`);
       throw redirect(href('/organization/:organizationId/project/:projectId', { organizationId, projectId }));
     }
   }
-  return null;
+
+  // Add spec & test suites to the debug loader data
+  const workspaceMeta = await services.workspaceMeta.getByParentId(workspaceId);
+  const isConnectedGitProject = models.project.isConnectedGitProject(activeProject);
+
+  const gitRepositoryId = isConnectedGitProject
+    ? models.project.getEffectiveRepoId(activeProject)
+    : workspaceMeta?.gitRepositoryId;
+  // we don't run the lint here because it is expensive and slows first render too much
+  // TODO: add this in once we run this loader outside the renderer
+  // Honour user-chosen repo locations: the ruleset lives at the repo root, which
+  // is the GitRepository's `directory` when set, else the managed location.
+  const gitRepository = gitRepositoryId ? await services.gitRepository.getById(gitRepositoryId) : null;
+  const gitSyncRulesetPath = gitRepository
+    ? window.path.join(resolveGitRepoBaseDir(gitRepository), '.spectral.yaml')
+    : '';
+
+  // The ProjectLintRuleset record is the source of truth for both git and cloud projects.
+  // For git, the RepoFileWatcher keeps .spectral.yaml in sync with this record.
+  const projectLintRuleset = await services.projectLintRuleset.getByParentId(projectId);
+  const rulesetContent = projectLintRuleset?.rulesetContent || '';
+  const rulesetLastCompiledAt = projectLintRuleset?.modified ?? null;
+
+  // For git projects, surface a committed .spectral.yaml that was rejected as
+  // invalid on import (so the user learns it wasn't applied and why, instead of
+  // silently falling back to the default ruleset). Refreshed automatically via
+  // the git.db-synced → revalidate flow in root.tsx.
+  const rulesetImportIssue =
+    isConnectedGitProject && gitRepositoryId
+      ? await window.main.git.getProjectRulesetImportIssue({ projectId, gitRepositoryId })
+      : null;
+
+  const apiSpec = await services.apiSpec.getByParentId(workspaceId);
+  let parsedSpec: OpenAPIV3.Document | undefined;
+  try {
+    if (apiSpec) {
+      parsedSpec = YAML.parse(apiSpec.contents) as OpenAPIV3.Document;
+    }
+  } catch {}
+
+  const hasLegacyUnitTests = (await services.unitTestSuite.count({ parentId: workspaceId })) > 0;
+
+  return {
+    apiSpec,
+    gitSyncRulesetPath,
+    isConnectedGitProject,
+    parsedSpec,
+    rulesetContent,
+    rulesetLastCompiledAt,
+    rulesetImportIssue,
+    hasLegacyUnitTests,
+  };
 }
 
-const WebSocketSpinner = ({ requestId }: { requestId: string }) => {
-  const readyState = useReadyState({ requestId, protocol: 'webSocket' });
-  return readyState ? (
-    <div
-      className="mr-(--padding-sm) h-2.5 w-2.5 shrink-0 rounded-full bg-(--color-success)"
-      data-testid="WebSocketSpinner__Connected"
-    />
-  ) : null;
-};
-
-const SocketIOSpinner = ({ requestId }: { requestId: string }) => {
-  const readyState = useReadyState({ requestId, protocol: 'socketIO' });
-  return readyState ? (
-    <div
-      className="mr-(--padding-sm) h-2.5 w-2.5 shrink-0 rounded-full bg-(--color-success)"
-      data-testid="SocketIOSpinner__Connected"
-    />
-  ) : null;
-};
-
-const EventStreamSpinner = ({ requestId }: { requestId: string }) => {
-  const readyState = useReadyState({ requestId, protocol: 'curl' });
-  return readyState ? (
-    <div
-      className="mr-(--padding-sm) h-2.5 w-2.5 shrink-0 rounded-full bg-(--color-success)"
-      data-testid="EventStreamSpinner__Connected"
-    />
-  ) : null;
-};
-
-const getRequestNameOrFallback = (
-  doc: Request | RequestGroup | GrpcRequest | WebSocketRequest | SocketIORequest,
-): string => {
-  return !isRequestGroup(doc) ? doc.name || doc.url || 'Untitled request' : doc.name || 'Untitled folder';
-};
-
-const RequestTiming = ({ requestId }: { requestId: string }) => {
-  const { isExecuting } = useExecutionState({ requestId });
-  return isExecuting ? (
-    <div
-      className="mr-(--padding-sm) h-2.5 w-2.5 shrink-0 rounded-full bg-(--color-success)"
-      data-testid="WebSocketSpinner__Connected"
-    />
-  ) : null;
-};
-
 const DebugEntry = () => {
   const { activeWorkspace } = useWorkspaceLoaderData()!;
-
   if (activeWorkspace.scope === 'mcp') {
     // MCP request under mcp workspace has different layout so we need to render a different component
     return <McpPane />;
   }
+
   return <Debug />;
 };
 
@@ -217,6 +171,16 @@ const Debug = () => {
     grpcRequests,
     collection: _collection,
   } = useWorkspaceLoaderData()!;
+  const {
+    gitSyncRulesetPath,
+    isConnectedGitProject,
+    rulesetContent,
+    rulesetLastCompiledAt,
+    rulesetImportIssue,
+    parsedSpec,
+    apiSpec,
+    hasLegacyUnitTests,
+  } = useLoaderData<typeof clientLoader>();
 
   const requestData = useRequestLoaderData();
   const { activeRequest } = requestData || {};
@@ -242,10 +206,6 @@ const Debug = () => {
     useMatch('/organization/:organizationId/project/:projectId/workspace/:workspaceId/debug/runner'),
   );
 
-  const [filter, setFilter] = reactUse.useLocalStorage<string>(`${workspaceId}:collection-list-filter`);
-  const collection = useFilteredRequests(_collection, filter ?? '');
-  const isDesignWorkspace = models.workspace.isDesign(activeWorkspace);
-
   const [grpcStates, setGrpcStates] = useState<GrpcRequestState[]>(
     grpcRequests.map(r => ({
       requestId: r._id,
@@ -255,8 +215,6 @@ const Debug = () => {
   const [isRequestSettingsModalOpen, setIsRequestSettingsModalOpen] = useState(false);
   const [isImportModalOpen, setIsImportModalOpen] = useState(false);
 
-  const patchRequest = useRequestPatcher();
-  const patchGroup = useRequestGroupPatcher();
   const patchRequestMeta = useRequestMetaPatcher();
   useEffect(() => {
     const unsubscribe = window.main.on('db.changes', async (_, changes: ChangeBufferEvent[]) => {
@@ -474,11 +432,6 @@ const Debug = () => {
       isGraphqlSubscriptionRequest(activeRequest) ||
       models.socketIORequest.isSocketIORequest(activeRequest));
 
-  const [searchParams, setSearchParams] = useSearchParams();
-
-  const sortOrder = (searchParams.get('sortOrder') as SortOrder) || 'type-manual';
-  const { hotKeyRegistry } = settings;
-
   const createRequest = ({
     requestType,
     parentId,
@@ -500,258 +453,6 @@ const Debug = () => {
       },
     });
 
-  const reorderFetcher = useDebugReorderActionFetcher();
-
-  const collectionDragAndDrop = useDragAndDrop({
-    getItems: keys => [...keys].map(key => ({ 'text/plain': key.toString() })),
-    onReorder(event) {
-      const [firstKey] = event.keys.values();
-      const id = firstKey.toString();
-      const targetId = event.target.key.toString();
-
-      const dropItem = collection.find(r => r.doc._id === id);
-      const targetItem = collection.find(r => r.doc._id === targetId);
-
-      if (!dropItem || !targetItem) {
-        return;
-      }
-
-      // If the item we move is a folder we cannot move it inside it's ancestor folders so we must check the ancestry
-      const isMovingFolderInsideItsChildren =
-        isRequestGroup(dropItem.doc) && targetItem.ancestors?.includes(dropItem.doc._id);
-      if (isMovingFolderInsideItsChildren) {
-        return;
-      }
-
-      let metaSortKey = 0;
-      // If the target is a folder and we insert after it we want to add that item to the folder
-      const isMovingItemInsideFolder = isRequestGroup(targetItem.doc) && event.target.dropPosition === 'after';
-      if (isMovingItemInsideFolder) {
-        // there is no item before we move the item to the beginning
-        // If there are children find the first child key and use a lower one
-        // otherwise use whatever
-        const children = collection.filter(r => r.doc.parentId === targetId);
-
-        if (children.length > 0) {
-          const firstChild = children[0];
-          const firstChildKey = firstChild?.doc.metaSortKey;
-
-          const keyBeforeFirstChildKey = firstChildKey - 100;
-
-          metaSortKey = keyBeforeFirstChildKey;
-        } else {
-          // Doesn't matter what key we give since it's the first item in the folder
-          // This is how we construct the default metaSortKey in the database so sorting will be loosely time based
-          const defaultMetaSortKey = -1 * Date.now();
-          metaSortKey = defaultMetaSortKey;
-        }
-      } else {
-        // Everything is going to be moving the item besides the other items
-        const targetSiblingsCollections = collection.filter(r => r.doc.parentId === targetItem.doc.parentId);
-        const targetIndexInSiblingsCollection = targetSiblingsCollections.findIndex(r => r.doc._id === targetId);
-        if (event.target.dropPosition === 'after') {
-          const beforeItem = targetItem;
-          const afterItem = targetSiblingsCollections[targetIndexInSiblingsCollection + 1];
-
-          metaSortKey =
-            beforeItem && afterItem
-              ? beforeItem.doc.metaSortKey - (beforeItem.doc.metaSortKey - afterItem.doc.metaSortKey) / 2
-              : beforeItem.doc.metaSortKey + 100;
-        } else {
-          const beforeItem = targetSiblingsCollections[targetIndexInSiblingsCollection - 1];
-          const afterItem = targetItem;
-
-          metaSortKey =
-            beforeItem && afterItem
-              ? afterItem.doc.metaSortKey - (afterItem.doc.metaSortKey - beforeItem.doc.metaSortKey) / 2
-              : afterItem.doc.metaSortKey - 100;
-        }
-      }
-
-      if (metaSortKey) {
-        reorderFetcher.submit({
-          organizationId,
-          projectId,
-          workspaceId,
-          params: {
-            targetId,
-            id,
-            dropPosition: event.target.dropPosition,
-            metaSortKey,
-          },
-        });
-      }
-    },
-    renderDropIndicator(target) {
-      if (target.type === 'item') {
-        const item = virtualizer.getVirtualItems().find(i => i.key === target.key);
-        if (item) {
-          return (
-            <DropIndicator
-              target={target}
-              className="absolute top-0 left-0 z-10 w-full outline-1 outline-(--color-surprise) outline-solid"
-              style={{
-                transform: `translateY(${target.dropPosition === 'before' ? item?.start : item.end}px)`,
-              }}
-            />
-          );
-        }
-      }
-
-      return (
-        <DropIndicator
-          target={target}
-          className="absolute top-0 left-0 outline-1 outline-(--color-surprise) outline-solid"
-        />
-      );
-    },
-  });
-
-  const createInCollectionActionList: {
-    name: string;
-    id: string;
-    icon: IconName;
-    items: {
-      id: string;
-      name: string;
-      icon: IconName;
-      hint?: PlatformKeyCombinations;
-      action: () => void;
-    }[];
-  }[] = [
-    {
-      name: 'Create',
-      id: 'create',
-      icon: 'plus',
-      items: [
-        {
-          id: 'New Folder',
-          name: 'New Folder',
-          icon: 'folder',
-          hint: hotKeyRegistry.request_showCreateFolder,
-          action: () =>
-            showModal(PromptModal, {
-              title: 'New Folder',
-              defaultValue: 'My Folder',
-              submitName: 'Create',
-              label: 'Name',
-              selectText: true,
-              onComplete: name =>
-                createRequestGroupFetcher.submit({
-                  organizationId,
-                  projectId,
-                  workspaceId,
-                  parentId: workspaceId,
-                  name,
-                }),
-            }),
-        },
-        {
-          id: 'HTTP',
-          name: 'HTTP Request',
-          icon: 'plus-circle',
-          hint: hotKeyRegistry.request_createHTTP,
-          action: () => {
-            createRequest({
-              requestType: 'HTTP',
-              parentId: workspaceId,
-            });
-          },
-        },
-        {
-          id: 'Event Stream',
-          name: 'Event Stream Request (SSE)',
-          icon: 'plus-circle',
-          action: () => {
-            createRequest({
-              requestType: 'Event Stream',
-              parentId: workspaceId,
-            });
-          },
-        },
-        {
-          id: 'GraphQL Request',
-          name: 'GraphQL Request',
-          icon: 'plus-circle',
-          action: () => {
-            createRequest({
-              requestType: 'GraphQL',
-              parentId: workspaceId,
-            });
-          },
-        },
-        {
-          id: 'gRPC Request',
-          name: 'gRPC Request',
-          icon: 'plus-circle',
-          action: () => {
-            createRequest({
-              requestType: 'gRPC',
-              parentId: workspaceId,
-            });
-          },
-        },
-        {
-          id: 'WebSocket Request',
-          name: 'WebSocket Request',
-          icon: 'plus-circle',
-          action: () => {
-            createRequest({
-              requestType: 'WebSocket',
-              parentId: workspaceId,
-            });
-          },
-        },
-        {
-          id: 'Socket.IO Request',
-          name: 'Socket.IO Request',
-          icon: 'plus-circle',
-          action: () => {
-            createRequest({
-              requestType: 'SocketIO',
-              parentId: workspaceId,
-            });
-          },
-        },
-      ],
-    },
-    {
-      name: 'Import',
-      id: 'import',
-      icon: 'file-import',
-      items: [
-        {
-          id: 'From Curl',
-          name: 'From Curl',
-          icon: 'terminal',
-          action: () => setPasteCurlModalOpen(true),
-        },
-        {
-          id: 'from-file',
-          name: 'From File',
-          icon: 'file-import',
-          action: () => setIsImportModalOpen(true),
-        },
-      ],
-    },
-  ];
-
-  // const allCollapsed = collection.every(item => item.hidden);
-  const [allExpanded, setAllExpanded] = useState(false);
-
-  const toggleExpandAllFetcher = useToggleExpandAllActionFetcher();
-
-  const visibleCollection = collection.filter(item => !item.hidden);
-
-  const parentRef = useRef<HTMLDivElement>(null);
-  const virtualizer = useVirtualizer<HTMLDivElement, Element>({
-    getScrollElement: () => parentRef.current,
-    count: visibleCollection.length,
-    estimateSize: React.useCallback(() => 32, []),
-    overscan: 30,
-    getItemKey: index => visibleCollection[index].doc._id,
-  });
-
   const [direction, setDirection] = useState<'horizontal' | 'vertical'>(
     settings.forceVerticalLayout ? 'vertical' : 'horizontal',
   );
@@ -791,342 +492,6 @@ const Debug = () => {
         className="new-sidebar min-h-0 flex-1 text-(--color-font)"
         direction="horizontal"
       >
-        {/* Design page has a collection view with legacy collection list */}
-        {isDesignWorkspace && (
-          <>
-            <Panel
-              id="sidebar"
-              order={1}
-              className="sidebar theme--sidebar"
-              defaultSize={DEFAULT_SIDEBAR_SIZE}
-              maxSize={40}
-              minSize={10}
-              collapsible
-            >
-              <div className="flex flex-1 flex-col divide-y divide-solid divide-(--hl-md) overflow-hidden">
-                <div className="flex flex-col items-start divide-y divide-solid divide-(--hl-md)">
-                  {models.workspace.isDesign(activeWorkspace) && (
-                    <DocumentTab organizationId={organizationId} projectId={projectId} workspaceId={workspaceId} />
-                  )}
-                </div>
-                <div className="flex flex-1 flex-col overflow-hidden">
-                  <div className="flex justify-between gap-1 p-(--padding-sm)">
-                    <SearchField
-                      aria-label="Request filter"
-                      className="group relative flex-1"
-                      value={filter ?? ''}
-                      onChange={value => {
-                        setFilter(value);
-
-                        if (value.trim() !== '') {
-                          window.main.trackAnalyticsEvent({
-                            event: AnalyticsEvent.filterCreatedRequests,
-                          });
-                        }
-                      }}
-                    >
-                      <Input
-                        placeholder="Filter"
-                        className="w-full rounded-xs border border-solid border-(--hl-sm) bg-(--color-bg) py-1 pr-7 pl-2 text-(--color-font) transition-colors focus:ring-1 focus:ring-(--hl-md) focus:outline-hidden"
-                      />
-                      <div className="absolute top-0 right-0 flex h-full items-center px-2">
-                        <Button className="flex aspect-square w-5 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all group-data-empty:hidden hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)">
-                          <Icon icon="close" />
-                        </Button>
-                      </div>
-                    </SearchField>
-                    <Select
-                      aria-label="Sort order"
-                      className="aspect-square h-full"
-                      selectedKey={sortOrder}
-                      onSelectionChange={order => {
-                        if (order) {
-                          window.main.trackAnalyticsEvent({
-                            event: AnalyticsEvent.requestListSortClicked,
-                          });
-                          setSearchParams({
-                            ...Object.fromEntries(searchParams.entries()),
-                            sortOrder: order.toString(),
-                          });
-                        }
-                      }}
-                    >
-                      <Button
-                        aria-label="Select sort order"
-                        className="flex aspect-square h-full shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
-                      >
-                        <Icon icon="sort" />
-                      </Button>
-                      <Popover className="flex min-w-max flex-col overflow-y-hidden">
-                        <ListBox
-                          items={SORT_ORDERS.map(order => {
-                            return {
-                              id: order,
-                              name: sortOrderName[order],
-                            };
-                          })}
-                          className="min-w-max overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) py-2 text-sm shadow-lg select-none focus:outline-hidden"
-                        >
-                          {item => (
-                            <ListBoxItem
-                              id={item.id}
-                              key={item.id}
-                              className="flex h-(--line-height-xs) w-full items-center gap-2 bg-transparent px-(--padding-md) whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden disabled:cursor-not-allowed aria-selected:font-bold"
-                              aria-label={item.name}
-                              textValue={item.name}
-                              value={item}
-                            >
-                              {({ isSelected }) => (
-                                <Fragment>
-                                  <span>{item.name}</span>
-                                  {isSelected && (
-                                    <Icon icon="check" className="justify-self-end text-(--color-success)" />
-                                  )}
-                                </Fragment>
-                              )}
-                            </ListBoxItem>
-                          )}
-                        </ListBox>
-                      </Popover>
-                    </Select>
-
-                    <TooltipTrigger>
-                      <ToggleButton
-                        aria-label="Expand All/Collapse all"
-                        defaultSelected={allExpanded}
-                        onChange={() => {
-                          setAllExpanded(!allExpanded);
-                          window.main.trackAnalyticsEvent({
-                            event: AnalyticsEvent.requestListExpandCollapseClicked,
-                          });
-                          toggleExpandAllFetcher.submit({
-                            organizationId,
-                            projectId,
-                            workspaceId,
-                            toggle: allExpanded ? 'collapse-all' : 'expand-all',
-                          });
-                        }}
-                        className="flex aspect-square h-full items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset"
-                      >
-                        {({ isSelected }) => (
-                          <Icon
-                            icon={
-                              isSelected ? 'down-left-and-up-right-to-center' : 'up-right-and-down-left-from-center'
-                            }
-                          />
-                        )}
-                      </ToggleButton>
-                      <Tooltip
-                        offset={8}
-                        className="max-h-[85vh] max-w-xs overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-4 py-2 text-sm text-(--color-font) shadow-lg select-none focus:outline-hidden"
-                      >
-                        <span>{allExpanded ? 'Collapse all' : 'Expand all'}</span>
-                      </Tooltip>
-                    </TooltipTrigger>
-
-                    <MenuTrigger>
-                      <Button
-                        aria-label="Create in collection"
-                        className="flex aspect-square h-full items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
-                      >
-                        <Icon icon="plus-circle" />
-                      </Button>
-                      <Popover className="flex min-w-max flex-col overflow-y-hidden">
-                        <Menu
-                          aria-label="Create a new request"
-                          selectionMode="single"
-                          onAction={key =>
-                            createInCollectionActionList
-                              .find(i => i.items.find(a => a.id === key))
-                              ?.items.find(a => a.id === key)
-                              ?.action()
-                          }
-                          items={createInCollectionActionList}
-                          className="min-w-max overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) py-2 text-sm shadow-lg select-none focus:outline-hidden"
-                        >
-                          {section => (
-                            <MenuSection className="flex flex-1 flex-col">
-                              <Header className="flex items-center gap-2 py-1 pl-2 text-xs text-(--hl) uppercase">
-                                <Icon icon={section.icon} /> <span>{section.name}</span>
-                              </Header>
-                              <Collection items={section.items}>
-                                {item => (
-                                  <MenuItem
-                                    key={item.id}
-                                    id={item.id}
-                                    className="flex h-(--line-height-xs) w-full items-center gap-2 bg-transparent px-(--padding-md) whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden disabled:cursor-not-allowed aria-selected:font-bold"
-                                    aria-label={item.name}
-                                  >
-                                    <Icon icon={item.icon} />
-                                    <span>{item.name}</span>
-                                    {item.hint && <DropdownHint keyBindings={item.hint} />}
-                                  </MenuItem>
-                                )}
-                              </Collection>
-                            </MenuSection>
-                          )}
-                        </Menu>
-                      </Popover>
-                    </MenuTrigger>
-                  </div>
-
-                  <GridList
-                    id="sidebar-pinned-request-gridlist"
-                    className="max-h-[50%] overflow-y-auto border-t border-b border-solid border-(--hl-sm) py-(--padding-sm) data-empty:border-none data-empty:py-0"
-                    items={collection.filter(item => item.pinned)}
-                    aria-label="Pinned Requests"
-                    disallowEmptySelection
-                    selectedKeys={requestId ? [requestId] : []}
-                    selectionMode="single"
-                  >
-                    {item => {
-                      return (
-                        <GridListItem
-                          key={item.doc._id}
-                          id={item.doc._id}
-                          className="group outline-hidden select-none"
-                          textValue={item.doc.name}
-                          data-testid={item.doc.name}
-                          onAuxClick={e => {
-                            if (e.button === 1) {
-                              e.preventDefault();
-                              tabNavigate(
-                                {
-                                  organization: organizationId,
-                                  project: activeProject,
-                                  workspace: activeWorkspace,
-                                  item: item.doc,
-                                },
-                                { withTab: true, shouldNavigate: true, searchParams },
-                              );
-                            }
-                          }}
-                          onPress={e => {
-                            tabNavigate(
-                              {
-                                organization: organizationId,
-                                project: activeProject,
-                                workspace: activeWorkspace,
-                                item: item.doc,
-                              },
-                              { withTab: isPrimaryClickModifier(e), shouldNavigate: true, searchParams },
-                            );
-                          }}
-                        >
-                          <div className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none group-hover:bg-(--hl-xs) group-focus:bg-(--hl-sm) group-aria-selected:text-(--color-font)">
-                            <span className="absolute top-0 left-0 h-full w-0.5 bg-transparent transition-colors group-aria-selected:bg-(--color-surprise)" />
-                            {isRequest(item.doc) && (
-                              <span
-                                className={`flex w-10 shrink-0 items-center justify-center rounded-xs border border-solid border-(--hl-sm) text-[0.65rem] ${
-                                  {
-                                    GET: 'bg-[rgba(var(--color-surprise-rgb),0.5)] text-(--color-font-surprise)',
-                                    POST: 'bg-[rgba(var(--color-success-rgb),0.5)] text-(--color-font-success)',
-                                    HEAD: 'bg-[rgba(var(--color-info-rgb),0.5)] text-(--color-font-info)',
-                                    OPTIONS: 'bg-[rgba(var(--color-info-rgb),0.5)] text-(--color-font-info)',
-                                    QUERY: 'bg-[rgba(var(--color-surprise-rgb),0.5)] text-(--color-font-surprise)',
-                                    DELETE: 'bg-[rgba(var(--color-danger-rgb),0.5)] text-(--color-font-danger)',
-                                    PUT: 'bg-[rgba(var(--color-warning-rgb),0.5)] text-(--color-font-warning)',
-                                    PATCH: 'bg-[rgba(var(--color-notice-rgb),0.5)] text-(--color-font-notice)',
-                                  }[item.doc.method] || 'bg-(--hl-md) text-(--color-font)'
-                                }`}
-                              >
-                                {getMethodShortHand(item.doc)}
-                              </span>
-                            )}
-                            {models.webSocketRequest.isWebSocketRequest(item.doc) && (
-                              <span className="flex w-10 shrink-0 items-center justify-center rounded-xs border border-solid border-(--hl-sm) bg-[rgba(var(--color-notice-rgb),0.5)] text-[0.65rem] text-(--color-font-notice)">
-                                WS
-                              </span>
-                            )}
-                            {models.socketIORequest.isSocketIORequest(item.doc) && (
-                              <span className="flex w-10 shrink-0 items-center justify-center rounded-xs border border-solid border-(--hl-sm) bg-[rgba(var(--color-notice-rgb),0.5)] text-[0.65rem] text-(--color-font-notice)">
-                                IO
-                              </span>
-                            )}
-                            {models.grpcRequest.isGrpcRequest(item.doc) && (
-                              <span className="flex w-10 shrink-0 items-center justify-center rounded-xs border border-solid border-(--hl-sm) bg-[rgba(var(--color-info-rgb),0.5)] text-[0.65rem] text-(--color-font-info)">
-                                gRPC
-                              </span>
-                            )}
-                            <EditableInput
-                              value={getRequestNameOrFallback(item.doc)}
-                              name="request name"
-                              ariaLabel="request name"
-                              className="flex-1 px-1"
-                              onSubmit={newName => {
-                                if (isRequestGroup(item.doc)) {
-                                  patchGroup(item.doc._id, { name: newName });
-                                } else {
-                                  patchRequest(item.doc._id, { name: newName });
-                                }
-                              }}
-                            />
-                            {item.pinned && (
-                              <Icon
-                                className="text-(--font-size-sm)"
-                                icon="thumb-tack"
-                                onDoubleClick={() => patchRequestMeta(item.doc._id, { pinned: !item.pinned })}
-                              />
-                            )}
-                          </div>
-                        </GridListItem>
-                      );
-                    }}
-                  </GridList>
-
-                  <div className="flex-1 overflow-y-auto" ref={parentRef}>
-                    <GridList
-                      id="sidebar-request-gridlist"
-                      style={{ height: virtualizer.getTotalSize() }}
-                      items={virtualizer.getVirtualItems()}
-                      className="relative"
-                      aria-label="Request Collection"
-                      key={sortOrder}
-                      dragAndDropHooks={
-                        sortOrder === 'type-manual' ? collectionDragAndDrop.dragAndDropHooks : undefined
-                      }
-                    >
-                      {virtualItem => {
-                        const item = visibleCollection[virtualItem.index];
-                        let label = item.doc.name;
-                        if (isRequest(item.doc)) {
-                          label = `${getMethodShortHand(item.doc)} ${label}`;
-                        } else if (models.webSocketRequest.isWebSocketRequest(item.doc)) {
-                          label = `WS ${label}`;
-                        } else if (models.grpcRequest.isGrpcRequest(item.doc)) {
-                          label = `gRPC ${label}`;
-                        }
-
-                        return (
-                          <CollectionGridListItem
-                            {...{
-                              label,
-                              item,
-                              style: {
-                                height: `${virtualItem.size}`,
-                                transform: `translateY(${virtualItem.start}px)`,
-                              },
-                              organizationId,
-                              projectId,
-                              workspaceId,
-                              searchParams,
-                              patchGroup,
-                              patchRequest,
-                              activeEnvironment,
-                              activeProject,
-                              activeWorkspace,
-                            }}
-                          />
-                        );
-                      }}
-                    </GridList>
-                  </div>
-                </div>
-              </div>
-            </Panel>
-            <PanelResizeHandle className="h-full w-px bg-(--hl-md)" />
-          </>
-        )}
         <Panel id="workspace-content" order={2} className="flex flex-col">
           <PanelGroup autoSaveId="insomnia-panels" id="insomnia-panels" direction={direction}>
             {isRunner ? (
@@ -1163,7 +528,32 @@ const Debug = () => {
                           }}
                         />
                       )}
-                      {Boolean(!requestId && !requestGroupId) && <PlaceholderRequestPane />}
+                      {Boolean(!requestId && !requestGroupId) && (
+                        <div className="flex h-full w-full flex-col">
+                          <CollectionTab
+                            organizationId={organizationId}
+                            projectId={projectId}
+                            workspaceId={workspaceId}
+                            activeItemId="spec"
+                            enableLegacyUnitTests={settings.enableLegacyUnitTests}
+                            hasLegacyUnitTests={hasLegacyUnitTests}
+                          />
+                          <div className="min-h-0 flex-1">
+                            <SpecView
+                              organizationId={organizationId}
+                              projectId={projectId}
+                              workspaceId={workspaceId}
+                              gitSyncRulesetPath={gitSyncRulesetPath}
+                              isConnectedGitProject={isConnectedGitProject}
+                              rulesetContent={rulesetContent}
+                              rulesetLastCompiledAt={rulesetLastCompiledAt}
+                              rulesetImportIssue={rulesetImportIssue}
+                              parsedSpec={parsedSpec}
+                              apiSpec={apiSpec}
+                            />
+                          </div>
+                        </div>
+                      )}
                       {isRequestSettingsModalOpen && activeRequest && (
                         <RequestSettingsModal
                           request={activeRequest}
@@ -1225,233 +615,3 @@ const Debug = () => {
 };
 
 export default DebugEntry;
-
-const CollectionGridListItem = ({
-  label,
-  item,
-  style,
-  organizationId,
-  projectId,
-  workspaceId,
-  searchParams,
-  patchGroup,
-  patchRequest,
-  activeProject,
-  activeWorkspace,
-}: {
-  label: string;
-  item: Child;
-  style: React.CSSProperties;
-  organizationId: string;
-  projectId: string;
-  workspaceId: string;
-  searchParams: URLSearchParams;
-  patchGroup: (requestGroupId: string, patch: Partial<RequestGroup>) => void;
-  patchRequest: (requestId: string, patch: Partial<GrpcRequest> | Partial<Request> | Partial<WebSocketRequest>) => void;
-  activeEnvironment: Environment;
-  activeProject: Project;
-  activeWorkspace: Workspace;
-}): React.ReactNode => {
-  const [isEditable, setIsEditable] = useState(false);
-  const [isContextMenuOpen, setIsContextMenuOpen] = useState(false);
-  const triggerRef = useRef<HTMLDivElement>(null);
-  const patchRequestMeta = useRequestMetaPatcher();
-
-  const tabNavigate = useTabNavigate();
-  const groupMetaPatcher = useRequestGroupMetaPatcher();
-
-  const action = isRequestGroup(item.doc)
-    ? `/organization/${organizationId}/project/${projectId}/workspace/${workspaceId}/debug/request-group/${item.doc._id}/update`
-    : `/organization/${organizationId}/project/${projectId}/workspace/${workspaceId}/debug/request/${item.doc._id}/update`;
-
-  const patchFetcher = useFetchers().find(f => f.formAction === action);
-
-  const name =
-    patchFetcher?.json &&
-    typeof patchFetcher.json === 'object' &&
-    'name' in patchFetcher.json &&
-    typeof patchFetcher.json.name === 'string'
-      ? patchFetcher.json.name
-      : item.doc.name;
-
-  const params = useParams() as { requestId?: string; requestGroupId?: string };
-
-  const isSelected = item.doc._id === params.requestId || item.doc._id === params.requestGroupId;
-
-  const scrollIntoView = useCallback(
-    (node: HTMLDivElement) => {
-      if (isSelected && node) {
-        scrollElementIntoView(node, { behavior: 'instant' });
-      }
-    },
-    [isSelected],
-  );
-
-  return (
-    <GridListItem
-      id={item.doc._id}
-      className={`group absolute top-0 left-0 w-full outline-hidden select-none ${isRequestGroup(item.doc) ? 'data-drop-target:bg-(--hl-md)' : 'border-solid data-drop-target:border-b data-drop-target:border-(--color-surprise)'}`}
-      textValue={label}
-      data-testid={item.doc.name}
-      style={style}
-      onAction={() => {}}
-      onAuxClick={e => {
-        if (e.button === 1) {
-          e.preventDefault();
-          tabNavigate(
-            {
-              organization: organizationId,
-              project: activeProject,
-              workspace: activeWorkspace,
-              item: item.doc,
-            },
-            { withTab: true, shouldNavigate: true, searchParams },
-          );
-        }
-      }}
-      onPress={e => {
-        const id = item.doc._id;
-        // Toggle collapse if it's a request group
-        if (isRequestGroupId(id)) {
-          groupMetaPatcher(id, { collapsed: !item.collapsed });
-        }
-
-        tabNavigate(
-          {
-            organization: organizationId,
-            project: activeProject,
-            workspace: activeWorkspace,
-            item: item.doc,
-          },
-          {
-            withTab: isPrimaryClickModifier(e),
-            shouldNavigate: true,
-            searchParams,
-          },
-        );
-      }}
-      ref={triggerRef}
-    >
-      <div
-        ref={scrollIntoView}
-        onContextMenu={e => {
-          e.preventDefault();
-          setIsContextMenuOpen(true);
-        }}
-        onDoubleClick={() => setIsEditable(true)}
-        data-selected={isSelected}
-        className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden pr-2 pl-4 text-(--hl) outline-hidden transition-colors select-none group-hover:bg-(--hl-xs) group-focus:bg-(--hl-sm) data-[selected=true]:text-(--color-font)"
-        style={{
-          paddingLeft: `${item.level + 1}rem`,
-        }}
-      >
-        <span
-          data-selected={isSelected}
-          className="absolute top-0 left-0 h-full w-0.5 bg-transparent transition-colors data-[selected=true]:bg-(--color-surprise)"
-        />
-        <Button slot="drag" className="hidden" />
-        {isRequest(item.doc) && (
-          <span
-            aria-hidden
-            role="presentation"
-            className={`flex w-10 shrink-0 items-center justify-center rounded-xs border border-solid border-(--hl-sm) text-[0.65rem] ${
-              {
-                GET: 'bg-[rgba(var(--color-surprise-rgb),0.5)] text-(--color-font-surprise)',
-                POST: 'bg-[rgba(var(--color-success-rgb),0.5)] text-(--color-font-success)',
-                HEAD: 'bg-[rgba(var(--color-info-rgb),0.5)] text-(--color-font-info)',
-                OPTIONS: 'bg-[rgba(var(--color-info-rgb),0.5)] text-(--color-font-info)',
-                QUERY: 'bg-[rgba(var(--color-surprise-rgb),0.5)] text-(--color-font-surprise)',
-                DELETE: 'bg-[rgba(var(--color-danger-rgb),0.5)] text-(--color-font-danger)',
-                PUT: 'bg-[rgba(var(--color-warning-rgb),0.5)] text-(--color-font-warning)',
-                PATCH: 'bg-[rgba(var(--color-notice-rgb),0.5)] text-(--color-font-notice)',
-              }[item.doc.method] || 'bg-(--hl-md) text-(--color-font)'
-            }`}
-          >
-            {getMethodShortHand(item.doc)}
-          </span>
-        )}
-        {models.webSocketRequest.isWebSocketRequest(item.doc) && (
-          <span
-            aria-hidden
-            role="presentation"
-            className="flex w-10 shrink-0 items-center justify-center rounded-xs border border-solid border-(--hl-sm) bg-[rgba(var(--color-notice-rgb),0.5)] text-[0.65rem] text-(--color-font-notice)"
-          >
-            WS
-          </span>
-        )}
-        {models.socketIORequest.isSocketIORequest(item.doc) && (
-          <span
-            aria-hidden
-            role="presentation"
-            className="flex w-10 shrink-0 items-center justify-center rounded-xs border border-solid border-(--hl-sm) bg-[rgba(var(--color-notice-rgb),0.5)] text-[0.65rem] text-(--color-font-notice)"
-          >
-            IO
-          </span>
-        )}
-        {models.grpcRequest.isGrpcRequest(item.doc) && (
-          <span
-            aria-hidden
-            role="presentation"
-            className="flex w-10 shrink-0 items-center justify-center rounded-xs border border-solid border-(--hl-sm) bg-[rgba(var(--color-info-rgb),0.5)] text-[0.65rem] text-(--color-font-info)"
-          >
-            gRPC
-          </span>
-        )}
-        {isRequestGroup(item.doc) && (
-          <span>
-            <Icon className="w-6 shrink-0" icon={item.collapsed ? 'folder' : 'folder-open'} />
-          </span>
-        )}
-        <EditableInput
-          editable={isEditable}
-          onEditableChange={setIsEditable}
-          value={getRequestNameOrFallback({ ...item.doc, name })}
-          name="request name"
-          ariaLabel={label}
-          className="flex-1 hover:bg-transparent!"
-          onSubmit={newName => {
-            if (isRequestGroup(item.doc)) {
-              patchGroup(item.doc._id, { name: newName });
-            } else {
-              patchRequest(item.doc._id, { name: newName });
-            }
-          }}
-        />
-        {models.webSocketRequest.isWebSocketRequest(item.doc) && <WebSocketSpinner requestId={item.doc._id} />}
-        {models.socketIORequest.isSocketIORequest(item.doc) && <SocketIOSpinner requestId={item.doc._id} />}
-        {isGraphqlSubscriptionRequest(item.doc) && <WebSocketSpinner requestId={item.doc._id} />}
-        {isRequest(item.doc) && <RequestTiming requestId={item.doc._id} />}
-        {isEventStreamRequest(item.doc) && <EventStreamSpinner requestId={item.doc._id} />}
-        {item.pinned && (
-          <Icon
-            className="text-(--font-size-sm)"
-            icon="thumb-tack"
-            onDoubleClick={() => patchRequestMeta(item.doc._id, { pinned: !item.pinned })}
-          />
-        )}
-        {isRequestGroup(item.doc) ? (
-          <RequestGroupActionsDropdown
-            requestGroup={item.doc}
-            onRename={() => setIsEditable(true)}
-            isOpen={isContextMenuOpen}
-            activeProject={activeProject}
-            activeWorkspace={activeWorkspace}
-            onOpenChange={setIsContextMenuOpen}
-            triggerRef={triggerRef}
-          />
-        ) : (
-          <RequestActionsDropdown
-            request={item.doc}
-            onRename={() => setIsEditable(true)}
-            isPinned={item.pinned}
-            isOpen={isContextMenuOpen}
-            onOpenChange={setIsContextMenuOpen}
-            activeProject={activeProject}
-            activeWorkspace={activeWorkspace}
-            triggerRef={triggerRef}
-          />
-        )}
-      </div>
-    </GridListItem>
-  );
-};
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx
index 9eaa68ecb1..8b7adb83fd 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx
@@ -13,7 +13,6 @@ import {
   MenuItem,
   MenuTrigger,
   Popover,
-  Text,
   ToggleButton,
   useDragAndDrop,
 } from 'react-aria-components';
@@ -42,6 +41,7 @@ import { showModal } from '~/ui/components/modals';
 import { AlertModal } from '~/ui/components/modals/alert-modal';
 import { InputVaultKeyModal } from '~/ui/components/modals/input-vault-key-modal';
 import { OrganizationTabList } from '~/ui/components/tabs/tab-list';
+import { Tooltip } from '~/ui/components/tooltip';
 import WorkspacePaneHeader from '~/ui/components/workspace/workspace-pane-header';
 import { useOrganizationPermissions } from '~/ui/hooks/use-organization-features';
 import { useToggleEnvironmentType } from '~/ui/hooks/use-toggle-environment-type';
@@ -154,8 +154,8 @@ const Component = ({ loaderData, params }: Route.ComponentProps) => {
   }[] = [
     {
       id: 'shared',
-      name: 'Shared environment',
-      description: `${isUsingGitSync ? 'Synced with Git Sync and exportable' : isUsingInsomniaCloudSync ? 'Synced with Insomnia Sync and exportable' : 'Exportable'}`,
+      name: 'Add Sub Environment',
+      description: `Sub environments are additional nested environments that ${isUsingGitSync ? 'sync with Git Sync' : isUsingInsomniaCloudSync ? 'sync with Insomnia Sync' : 'can be exported'} and are shared with your team.`,
       icon: isUsingGitSync ? ['fab', 'git-alt'] : isUsingInsomniaCloudSync ? 'globe-americas' : 'file-arrow-down',
       action: async () => {
         createEnvironmentFetcher.submit({
@@ -171,8 +171,8 @@ const Component = ({ loaderData, params }: Route.ComponentProps) => {
     },
     {
       id: 'private',
-      name: 'Private environment',
-      description: 'Local and not exportable',
+      name: 'Add Private Sub Environment',
+      description: 'Private sub environments stay local to your machine and are never exported, synced, or committed.',
       icon: 'lock',
       action: async () => {
         createEnvironmentFetcher.submit({
@@ -291,6 +291,21 @@ const Component = ({ loaderData, params }: Route.ComponentProps) => {
           minSize={10}
           collapsible
         >
+          <div className="flex shrink-0 flex-col gap-1 border-b border-solid border-(--hl-sm) p-1">
+            {createEnvironmentActionsList.map(action => (
+              <Tooltip key={action.id} position="bottom" message={action.description}>
+                <Button
+                  aria-label={action.name}
+                  data-testid={action.id === 'private' ? 'AddPrivateSubEnvironment' : 'AddSubEnvironment'}
+                  onPress={() => action.action(baseEnvironment)}
+                  className="flex w-full items-center gap-2 rounded-xs border border-solid border-(--hl-sm) px-4 py-2 text-sm whitespace-nowrap text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset"
+                >
+                  <Icon className="w-3.5" icon={action.icon} />
+                  <span className="truncate">{action.name}</span>
+                </Button>
+              </Tooltip>
+            ))}
+          </div>
           <GridList
             aria-label="Environments"
             items={[baseEnvironment, ...subEnvironments]}
@@ -385,45 +400,6 @@ const Component = ({ loaderData, params }: Route.ComponentProps) => {
                         </Popover>
                       </MenuTrigger>
                     )}
-                    {item.parentId === workspaceId && (
-                      <MenuTrigger>
-                        <Button
-                          aria-label="Create Environment"
-                          data-testid="CreateEnvironmentDropdown"
-                          className="flex aspect-square h-6 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset data-pressed:bg-(--hl-sm)"
-                        >
-                          <Icon icon="plus-circle" />
-                        </Button>
-                        <Popover className="flex min-w-max flex-col overflow-y-hidden">
-                          <Menu
-                            aria-label="New Environment"
-                            selectionMode="single"
-                            onAction={key => {
-                              createEnvironmentActionsList.find(({ id }) => key === id)?.action(item);
-                            }}
-                            items={createEnvironmentActionsList}
-                            className="min-w-max overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) py-2 text-sm shadow-lg select-none focus:outline-hidden"
-                          >
-                            {item => (
-                              <MenuItem
-                                key={item.id}
-                                id={item.id}
-                                className="flex w-full flex-col gap-1 bg-transparent px-(--padding-md) py-2 whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden disabled:cursor-not-allowed aria-selected:font-bold"
-                                aria-label={item.name}
-                              >
-                                <div className="flex items-center gap-2">
-                                  <Icon className="w-5" icon={item.icon} />
-                                  <span>{item.name}</span>
-                                </div>
-                                <Text slot="description" className="text-xs text-(--hl)">
-                                  {item.description}
-                                </Text>
-                              </MenuItem>
-                            )}
-                          </Menu>
-                        </Popover>
-                      </MenuTrigger>
-                    )}
                   </div>
                 </GridListItem>
               );
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.checkout.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.checkout.tsx
index 5cbbf225f4..a1cd7ac5e9 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.checkout.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.checkout.tsx
@@ -20,7 +20,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
   const { syncItems } = await getSyncItems({ workspaceId });
 
   try {
-    const delta = (await window.main.sync.checkout(syncItems, branch)) as Operation;
+    const delta = (await window.main.sync.checkout(workspaceId, syncItems, branch)) as Operation;
     // This is to synchronize the local database with the branch changes
     await database.batchModifyDocs(reparentSyncDelta(delta, projectId));
     delete remoteCompareCache[workspaceId];
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.create.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.create.tsx
index 69d1bbc2ef..8824e85df8 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.create.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.create.tsx
@@ -19,9 +19,9 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
   const { syncItems } = await getSyncItems({ workspaceId });
 
   try {
-    await window.main.sync.fork(branchName);
+    await window.main.sync.fork(workspaceId, branchName);
     // Checkout new branch
-    const delta = (await window.main.sync.checkout(syncItems, branchName)) as Operation;
+    const delta = (await window.main.sync.checkout(workspaceId, syncItems, branchName)) as Operation;
     // This is to synchronize the local database with the branch changes
     await database.batchModifyDocs(reparentSyncDelta(delta, projectId));
     delete remoteCompareCache[workspaceId];
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.delete.tsx
index 1ab23676b3..54a24db6ba 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.delete.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.delete.tsx
@@ -15,9 +15,9 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
   invariant(typeof branch === 'string', 'Branch is required');
 
   try {
-    await window.main.sync.removeRemoteBranch(branch);
+    await window.main.sync.removeRemoteBranch(workspaceId, branch);
     try {
-      await window.main.sync.removeBranch(branch);
+      await window.main.sync.removeBranch(workspaceId, branch);
     } catch {
       // Branch doesn't exist locally, ignore
     }
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.merge.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.merge.tsx
index dd36afa63c..09e2ef1a67 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.merge.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.merge.tsx
@@ -18,7 +18,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
   const { syncItems } = await getSyncItems({ workspaceId });
   let delta;
   try {
-    delta = await window.main.sync.merge(syncItems, branch);
+    delta = await window.main.sync.merge(workspaceId, syncItems, branch);
   } catch (err) {
     if (err instanceof UserAbortResolveMergeConflictError) {
       return null;
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.create-snapshot.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.create-snapshot.tsx
index 707edadc1d..989c97f91e 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.create-snapshot.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.create-snapshot.tsx
@@ -20,13 +20,13 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
   invariant(typeof data.message === 'string', 'Message is required');
 
   try {
-    await window.main.sync.takeSnapshot(data.message);
+    await window.main.sync.takeSnapshot(workspaceId, data.message);
     if (data.push) {
       const project = await services.project.getById(projectId);
       invariant(project, 'Project not found');
       invariant(project.remoteId, 'Project is not remote');
 
-      await window.main.sync.push({
+      await window.main.sync.push(workspaceId, {
         teamId: project.parentId,
         teamProjectId: project.remoteId,
       });
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.fetch.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.fetch.tsx
index 38fcf8ba45..774d256709 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.fetch.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.fetch.tsx
@@ -9,7 +9,7 @@ import { createFetcherSubmitHook } from '~/ui/utils/router';
 import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.fetch';
 
 export async function clientAction({ request, params }: Route.ClientActionArgs) {
-  const { projectId } = params;
+  const { projectId, workspaceId } = params;
 
   const project = await services.project.getById(projectId);
   invariant(project, 'Project not found');
@@ -17,12 +17,12 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
   const formData = await request.formData();
   const branch = formData.get('branch');
   invariant(typeof branch === 'string', 'Branch is required');
-  const currentBranch = await window.main.sync.getCurrentBranchName();
+  const currentBranch = await window.main.sync.getCurrentBranchName(workspaceId);
 
   try {
     invariant(project.remoteId, 'Project is not remote');
-    await window.main.sync.checkout([], branch);
-    const delta = await window.main.sync.pull({
+    await window.main.sync.checkout(workspaceId, [], branch);
+    const delta = await window.main.sync.pull(workspaceId, {
       candidates: [],
       teamId: project.parentId,
       teamProjectId: project.remoteId,
@@ -32,7 +32,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
     // This is to synchronize the local database with the branch changes
     await database.batchModifyDocs(reparentSyncDelta(delta, projectId));
   } catch (err) {
-    await window.main.sync.checkout([], currentBranch);
+    await window.main.sync.checkout(workspaceId, [], currentBranch);
     const errorMessage = err instanceof Error ? err.message : 'Unknown error while fetching remote branch.';
     return {
       error: errorMessage,
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.pull.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.pull.tsx
index 2436697a13..7808a33d95 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.pull.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.pull.tsx
@@ -17,7 +17,7 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
   const { syncItems } = await getSyncItems({ workspaceId });
   try {
     invariant(project.remoteId, 'Project is not remote');
-    const delta = await window.main.sync.pull({
+    const delta = await window.main.sync.pull(workspaceId, {
       candidates: syncItems,
       teamId: project.parentId,
       teamProjectId: project.remoteId,
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.push.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.push.tsx
index 0dca7f4b45..72e6954a18 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.push.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.push.tsx
@@ -16,7 +16,7 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
   invariant(project.remoteId, 'Project is not remote');
 
   try {
-    await window.main.sync.push({
+    await window.main.sync.push(workspaceId, {
       teamId: project.parentId,
       teamProjectId: project.remoteId,
     });
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.restore.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.restore.tsx
index ce1026bc55..8c3de78348 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.restore.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.restore.tsx
@@ -17,7 +17,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
   invariant(typeof id === 'string', 'Id is required');
   try {
     const { syncItems } = await getSyncItems({ workspaceId });
-    const delta = (await window.main.sync.rollback(id, syncItems)) as unknown as Operation;
+    const delta = (await window.main.sync.rollback(workspaceId, id, syncItems)) as unknown as Operation;
     // This is to synchronize the local database with the branch changes
     await database.batchModifyDocs(reparentSyncDelta(delta, projectId));
     delete remoteCompareCache[workspaceId];
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.rollback.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.rollback.tsx
index b2066328b7..069720ea01 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.rollback.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.rollback.tsx
@@ -14,7 +14,7 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
 
   try {
     const { syncItems } = await getSyncItems({ workspaceId });
-    const delta = (await window.main.sync.rollbackToLatest(syncItems)) as unknown as Operation;
+    const delta = (await window.main.sync.rollbackToLatest(workspaceId, syncItems)) as unknown as Operation;
     // This is to synchronize the local database with the branch changes
     await database.batchModifyDocs(reparentSyncDelta(delta, projectId));
     delete remoteCompareCache[workspaceId];
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.stage.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.stage.tsx
index 1c0614b65d..a9cd53ece5 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.stage.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.stage.tsx
@@ -14,7 +14,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
   const keys = data.keys;
   invariant(Array.isArray(keys), 'Keys are required');
   const { syncItems } = await getSyncItems({ workspaceId });
-  const status = await window.main.sync.status(syncItems);
+  const status = await window.main.sync.status(workspaceId, syncItems);
   // Staging needs to happen since it creates blobs for the files
   const itemsToStage = keys
     .map(key => {
@@ -27,7 +27,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
     })
     .filter(isNotNullOrUndefined);
 
-  await window.main.sync.stage(itemsToStage);
+  await window.main.sync.stage(workspaceId, itemsToStage);
 
   return null;
 }
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.sync-data.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.sync-data.tsx
index cbd52f5111..25c4b5cfbe 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.sync-data.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.sync-data.tsx
@@ -14,17 +14,19 @@ export async function clientLoader({ params }: Route.ClientLoaderArgs) {
     invariant(project, 'Project not found');
     invariant(project.remoteId, 'Project is not remote');
     const { syncItems } = await getSyncItems({ workspaceId });
-    const localBranches = (await window.main.sync.getBranchNames()).sort();
-    const currentBranch = await window.main.sync.getCurrentBranchName();
-    const history = (await window.main.sync.getHistory()).sort((a, b) => (b.created > a.created ? 1 : -1));
-    const historyCount = await window.main.sync.getHistoryCount();
-    const status = await window.main.sync.status(syncItems);
+    const localBranches = (await window.main.sync.getBranchNames(workspaceId)).sort();
+    const currentBranch = await window.main.sync.getCurrentBranchName(workspaceId);
+    const history = (await window.main.sync.getHistory(workspaceId)).sort((a, b) => (b.created > a.created ? 1 : -1));
+    const historyCount = await window.main.sync.getHistoryCount(workspaceId);
+    const status = await window.main.sync.status(workspaceId, syncItems);
 
     let remoteBranches: string[] = [];
     let compare = { ahead: 0, behind: 0 };
     try {
-      remoteBranches = (remoteBranchesCache[workspaceId] || (await window.main.sync.getRemoteBranchNames())).sort();
-      compare = remoteCompareCache[workspaceId] || (await window.main.sync.compareRemoteBranch());
+      remoteBranches = (
+        remoteBranchesCache[workspaceId] || (await window.main.sync.getRemoteBranchNames(workspaceId))
+      ).sort();
+      compare = remoteCompareCache[workspaceId] || (await window.main.sync.compareRemoteBranch(workspaceId));
       const remoteBackendProjects =
         remoteBackendProjectsCache[project.remoteId] ||
         (await window.main.sync.remoteBackendProjects({
@@ -73,8 +75,8 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
   invariant(project.remoteId, 'Project is not remote');
 
   try {
-    const remoteBranches = (await window.main.sync.getRemoteBranchNames()).sort();
-    const compare = await window.main.sync.compareRemoteBranch();
+    const remoteBranches = (await window.main.sync.getRemoteBranchNames(workspaceId)).sort();
+    const compare = await window.main.sync.compareRemoteBranch(workspaceId);
     const remoteBackendProjects = await window.main.sync.remoteBackendProjects({
       teamId: project.parentId,
       teamProjectId: project.remoteId,
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.unstage.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.unstage.tsx
index a8e25ae01f..108da12f26 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.unstage.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.unstage.tsx
@@ -14,7 +14,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
   const keys = data.keys;
   invariant(Array.isArray(keys), 'Keys are required');
   const { syncItems } = await getSyncItems({ workspaceId });
-  const status = await window.main.sync.status(syncItems);
+  const status = await window.main.sync.status(workspaceId, syncItems);
   // Staging needs to happen since it creates blobs for the files
   const itemsToUnstage = keys
     .map(key => {
@@ -27,7 +27,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
     })
     .filter(isNotNullOrUndefined);
 
-  await window.main.sync.unstage(itemsToUnstage);
+  await window.main.sync.unstage(workspaceId, itemsToUnstage);
 
   return null;
 }
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection.tsx
index 463f99b8b0..9bf26fa727 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection.tsx
@@ -9,9 +9,13 @@ import { createFetcherSubmitHook } from '~/ui/utils/router';
 
 import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection';
 
-export async function clientAction({ params }: Route.ClientActionArgs) {
-  const { organizationId, projectId, workspaceId } = params;
-
+export async function generateRequestCollection({
+  projectId,
+  workspaceId,
+}: {
+  projectId: string;
+  workspaceId: string;
+}) {
   const project = await services.project.getById(projectId);
   invariant(project, 'Project not found');
 
@@ -56,6 +60,12 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
       count_requests: scannedResources.map(r => r.requests?.length ?? 0).reduce((a, b) => a + b, 0),
     },
   });
+}
+
+export async function clientAction({ params }: Route.ClientActionArgs) {
+  const { organizationId, projectId, workspaceId } = params;
+
+  await generateRequestCollection({ projectId, workspaceId });
 
   return redirect(
     href('/organization/:organizationId/project/:projectId/workspace/:workspaceId/debug', {
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx
index 3eb4f0d42d..27db3dd2c1 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx
@@ -1,1486 +1,17 @@
-import { type IRuleResult } from '@stoplight/spectral-core';
-import CodeMirror from 'codemirror';
-import { models, services } from 'insomnia-data';
-import type { OpenAPIV3 } from 'openapi-types';
-import { type ReactNode, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
-import {
-  Button,
-  Dialog,
-  GridList,
-  GridListItem,
-  Heading,
-  ListBox,
-  ListBoxItem,
-  Menu,
-  MenuItem,
-  MenuTrigger,
-  Modal,
-  ModalOverlay,
-  Popover,
-  ToggleButton,
-  Tooltip,
-  TooltipTrigger,
-} from 'react-aria-components';
-import {
-  type ImperativePanelGroupHandle,
-  type ImperativePanelHandle,
-  Panel,
-  PanelGroup,
-  PanelResizeHandle,
-} from 'react-resizable-panels';
-import { href, redirect, useLoaderData } from 'react-router';
-import * as reactUse from 'react-use';
-import { SwaggerUIBundle } from 'swagger-ui-dist';
-import YAML from 'yaml';
-
-import { parseApiSpec } from '~/common/api-specs';
-import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants';
-import { debounce } from '~/common/misc';
-import { utf8ByteLength } from '~/common/utils/utf8-bytes';
-import { useRootLoaderData } from '~/root';
-import { useDeleteProjectRulesetActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.delete-ruleset';
-import { useRefreshProjectRulesetActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.refresh-ruleset';
-import { useUpdateProjectRulesetActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.update-ruleset';
-import {
-  useWorkspaceLoaderData,
-  WORKSPACE_CONTENT_WRAPPER,
-} from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
-import { useSpecGenerateRequestCollectionActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection';
-import { useSpecUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update';
-import { AnalyticsEvent } from '~/ui/analytics';
-import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor';
-import { Badge } from '~/ui/components/base/badge';
-import { DesignEmptyState } from '~/ui/components/design-empty-state';
-import { DocumentTab } from '~/ui/components/document-tab';
-import { Icon } from '~/ui/components/icon';
-import { useDocBodyKeyboardShortcuts } from '~/ui/components/keydown-binder';
-import { showError, showModal } from '~/ui/components/modals';
-import { AskModal } from '~/ui/components/modals/ask-modal';
-import { CookiesModal } from '~/ui/components/modals/cookies-modal';
-import { NewWorkspaceModal } from '~/ui/components/modals/new-workspace-modal';
-import { CertificatesModal } from '~/ui/components/modals/workspace-certificates-modal';
-import { WorkspaceEnvironmentsEditModal } from '~/ui/components/modals/workspace-environments-edit-modal';
-import { OrganizationTabList } from '~/ui/components/tabs/tab-list';
-import { formatMethodName } from '~/ui/components/tags/method-tag';
-import { showResourceNotFoundToast, showToast } from '~/ui/components/toast-notification';
-import WorkspacePaneHeader from '~/ui/components/workspace/workspace-pane-header';
-import { useAIFeatureStatus } from '~/ui/hooks/use-organization-features';
-import { useOrganizationStorageRule } from '~/ui/hooks/use-organization-storage-rule';
-import { useGitVCSVersion } from '~/ui/hooks/use-vcs-version';
-import { resolveGitRepoBaseDir } from '~/ui/utils/git-repo-path';
-import { selectFileOrFolder } from '~/ui/utils/select-file-or-folder';
+import { href, redirect } from 'react-router';
 
 import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec';
 
+// The spec route has been merged into the debug route.
+// This route only exists to redirect old bookmarks/tabs/synced links to the merged page.
 export async function clientLoader({ params }: Route.ClientLoaderArgs) {
   const { organizationId, projectId, workspaceId } = params;
 
-  const project = await services.project.getById(projectId);
-  if (!project) {
-    showResourceNotFoundToast(`Project not found: ${projectId}`);
-    throw redirect(href('/organization/:organizationId/project', { organizationId }));
-  }
-
-  const workspace = await services.workspace.getById(workspaceId);
-  if (!workspace) {
-    showResourceNotFoundToast(`Workspace not found: ${workspaceId}`);
-    throw redirect(href('/organization/:organizationId/project/:projectId', { organizationId, projectId }));
-  }
-
-  const apiSpec = await services.apiSpec.getByParentId(workspaceId);
-  if (!apiSpec) {
-    showResourceNotFoundToast(`API Specification not found for workspace: ${workspaceId}`);
-    throw redirect(href('/organization/:organizationId/project/:projectId', { organizationId, projectId }));
-  }
-
-  const workspaceMeta = await services.workspaceMeta.getByParentId(workspaceId);
-  const isConnectedGitProject = models.project.isConnectedGitProject(project);
-
-  const gitRepositoryId = isConnectedGitProject
-    ? models.project.getEffectiveRepoId(project)
-    : workspaceMeta?.gitRepositoryId;
-  // we don't run the lint here because it is expensive and slows first render too much
-  // TODO: add this in once we run this loader outside the renderer
-  // Honour user-chosen repo locations: the ruleset lives at the repo root, which
-  // is the GitRepository's `directory` when set, else the managed location.
-  const gitRepository = gitRepositoryId ? await services.gitRepository.getById(gitRepositoryId) : null;
-  const gitSyncRulesetPath = gitRepository
-    ? window.path.join(resolveGitRepoBaseDir(gitRepository), '.spectral.yaml')
-    : '';
-
-  // The ProjectLintRuleset record is the source of truth for both git and cloud projects.
-  // For git, the RepoFileWatcher keeps .spectral.yaml in sync with this record.
-  const projectLintRuleset = await services.projectLintRuleset.getByParentId(projectId);
-  const rulesetContent = projectLintRuleset?.rulesetContent || '';
-  const rulesetLastCompiledAt = projectLintRuleset?.modified ?? null;
-
-  // For git projects, surface a committed .spectral.yaml that was rejected as
-  // invalid on import (so the user learns it wasn't applied and why, instead of
-  // silently falling back to the default ruleset). Refreshed automatically via
-  // the git.db-synced → revalidate flow in root.tsx.
-  const rulesetImportIssue =
-    isConnectedGitProject && gitRepositoryId
-      ? await window.main.git.getProjectRulesetImportIssue({ projectId, gitRepositoryId })
-      : null;
-
-  let parsedSpec: OpenAPIV3.Document | undefined;
-
-  try {
-    parsedSpec = YAML.parse(apiSpec.contents) as OpenAPIV3.Document;
-  } catch {}
-
-  return {
-    apiSpec,
-    gitSyncRulesetPath,
-    isConnectedGitProject,
-    parsedSpec,
-    rulesetContent,
-    rulesetLastCompiledAt,
-    rulesetImportIssue,
-  };
+  throw redirect(
+    `${href('/organization/:organizationId/project/:projectId/workspace/:workspaceId/debug', {
+      organizationId,
+      projectId,
+      workspaceId,
+    })}`,
+  );
 }
-
-const SwaggerUIDiv = ({ text }: { text: string }) => {
-  useEffect(() => {
-    let spec = {};
-    try {
-      spec = parseApiSpec(text).contents || {};
-    } catch {}
-    SwaggerUIBundle({ spec, dom_id: '#swagger-ui' });
-  }, [text]);
-  return (
-    <div
-      id="swagger-ui"
-      style={{
-        overflowY: 'auto',
-        height: '100%',
-        background: '#FFF',
-      }}
-    />
-  );
-};
-
-interface LintMessage {
-  type: 'error' | 'warning' | 'info';
-  message: string;
-  line: number;
-  range: IRuleResult['range'];
-  code: string;
-  path: string;
-}
-interface GroupedLintMessage {
-  code: string;
-  type: 'error' | 'warning' | 'info';
-  message: string;
-  occurrences: { line: number; range: IRuleResult['range']; path: string }[];
-}
-
-interface SpecActionItem {
-  id: string;
-  name: string;
-  icon?: ReactNode;
-  badge?: ReactNode;
-  isDisabled?: boolean;
-  tooltip?: string;
-  action: () => void;
-}
-
-const getMethodsFromOpenApiPathItem = (pathItem: OpenAPIV3.PathItemObject): string[] => {
-  const methods = ['get', 'put', 'post', 'delete', 'options', 'head', 'patch', 'trace'].filter(
-    method =>
-      // @ts-expect-error -- shrug I don't care what pathItem has in it
-      pathItem[method],
-  );
-
-  return methods;
-};
-
-const lintOptions = {
-  delay: 1000,
-};
-
-const Component = ({ params }: Route.ComponentProps) => {
-  const { organizationId, projectId, workspaceId } = params;
-  const { activeProject, vcsVersion } = useWorkspaceLoaderData()!;
-  const { settings } = useRootLoaderData()!;
-
-  const [isCookieModalOpen, setIsCookieModalOpen] = useState(false);
-  const [isEnvironmentModalOpen, setEnvironmentModalOpen] = useState(false);
-  const [_isEnvironmentPickerOpen, setIsEnvironmentPickerOpen] = useState(false);
-  const [isCertificatesModalOpen, setCertificatesModalOpen] = useState(false);
-  const [isNewMockServerModalOpen, setNewMockServerModalOpen] = useState(false);
-  const [isViewRulesetModalOpen, setIsViewRulesetModalOpen] = useState(false);
-
-  const storageRules = useOrganizationStorageRule(organizationId);
-
-  const { isGenerateMockServersWithAIEnabled } = useAIFeatureStatus();
-
-  const {
-    apiSpec,
-    gitSyncRulesetPath,
-    isConnectedGitProject,
-    parsedSpec,
-    rulesetContent,
-    rulesetLastCompiledAt,
-    rulesetImportIssue,
-  } = useLoaderData<typeof clientLoader>();
-
-  const [lintMessages, setLintMessages] = useState<LintMessage[]>([]);
-  const [expandedLintMessageCodes, setExpandedLintMessageCodes] = useState<string[]>([]);
-
-  const editor = useRef<CodeEditorHandle>(null);
-  const { submit: updateApiSpec } = useSpecUpdateActionFetcher();
-  const { submit: updateProjectRuleset } = useUpdateProjectRulesetActionFetcher();
-  const { submit: deleteProjectRuleset } = useDeleteProjectRulesetActionFetcher();
-  const { submit: refreshProjectRuleset } = useRefreshProjectRulesetActionFetcher();
-  const [isRefreshing, setIsRefreshing] = useState(false);
-  const generateRequestCollectionFetcher = useSpecGenerateRequestCollectionActionFetcher();
-  const gitVersion = useGitVCSVersion();
-  const [isLintPaneOpen, setIsLintPaneOpen] = useState(false);
-  const [isSpecPaneOpen, setIsSpecPaneOpen] = useState(Boolean(parsedSpec));
-  const [selectedRulesetPath, setSelectedRulesetPath] = useState<string>('');
-
-  // Spectral requires a file path on disk to lint with a ruleset. Ref: lint-process.mjs.
-  // Cloud/local projects have no RepoFileWatcher, so rulesetContent from NeDB is mirrored
-  // to this per-project scratch path. Git projects lint against gitSyncRulesetPath, which
-  // the RepoFileWatcher keeps in sync with the record.
-  const rulesetWritePath = useMemo(
-    () => window.path.join(window.app.getPath('userData'), `projects/${projectId}/.spectral.yaml`),
-    [projectId],
-  );
-
-  const rulesetHasRemoteExtendsEntries = useMemo(() => {
-    if (!rulesetContent) return false;
-
-    try {
-      const parsedRuleset = YAML.parse(rulesetContent);
-      if (!parsedRuleset.extends) return false;
-
-      const formattedRulesetExtendsEntries = Array.isArray(parsedRuleset.extends)
-        ? parsedRuleset.extends
-        : [parsedRuleset.extends];
-      return formattedRulesetExtendsEntries.some((entry: string) => entry.startsWith('https://'));
-    } catch {
-      return false;
-    }
-  }, [rulesetContent]);
-
-  const groupedLintMessages = useMemo<GroupedLintMessage[]>(() => {
-    const map = new Map<string, GroupedLintMessage>();
-    for (const msg of lintMessages) {
-      const key = msg.code;
-      const existing = map.get(key);
-      if (existing) {
-        existing.occurrences.push({ line: msg.line, range: msg.range, path: msg.path });
-      } else {
-        map.set(key, {
-          code: msg.code ?? '',
-          type: msg.type,
-          message: msg.message,
-          occurrences: [{ line: msg.line, range: msg.range, path: msg.path }],
-        });
-      }
-    }
-
-    return Array.from(map.values());
-  }, [lintMessages]);
-
-  const { components, info, servers, paths } = parsedSpec || {};
-  const { requestBodies, responses, parameters, headers, schemas, securitySchemes } = components || {};
-
-  const lintErrors = lintMessages.filter(message => message.type === 'error');
-  const lintWarnings = lintMessages.filter(message => message.type === 'warning');
-
-  const registerCodeMirrorLint = useCallback(
-    (rulesetContent: string) => {
-      CodeMirror.registerHelper('lint', 'openapi', async (contents: string) => {
-        try {
-          const { diagnostics, error, cancelled } = await window.main.lintSpec({
-            documentContent: contents,
-            projectId,
-            rulesetContent,
-          });
-          if (cancelled) {
-            return [];
-          }
-          if (error) {
-            console.log('Handled error detected while linting:', error);
-            setLintMessages([]);
-            showError({
-              title: 'Linting Error',
-              message: `An error occurred while linting the OpenAPI specification: ${error}`,
-            });
-            return [];
-          }
-          const lintResult = diagnostics?.map(({ severity, code, message, range, path }) => {
-            return {
-              from: CodeMirror.Pos(range.start.line, range.start.character),
-              to: CodeMirror.Pos(range.end.line, range.end.character),
-              code: String(code),
-              message,
-              severity: ['error', 'warning'][severity] ?? 'info',
-              type: (['error', 'warning'][severity] ?? 'info') as LintMessage['type'],
-              range,
-              line: range.start.line,
-              path: path.join('.'),
-            };
-          });
-          setLintMessages?.(lintResult || []);
-          return lintResult;
-        } catch (error) {
-          // return a rejected promise so that codemirror do nothing
-          console.log('Unhandled error while linting:', error);
-          setLintMessages([]);
-          showError({
-            title: 'Linting Error',
-            message: `An error occurred while linting the OpenAPI specification: ${error}`,
-          });
-          return [];
-        }
-      });
-    },
-    [projectId],
-  );
-
-  useEffect(() => {
-    registerCodeMirrorLint(rulesetContent);
-    // when first time into document editor, the lint helper register later than codemirror init, we need to trigger lint through execute setOption
-    editor.current?.tryToSetOption('lint', { ...lintOptions });
-  }, [rulesetContent, projectId, registerCodeMirrorLint]);
-
-  useEffect(() => {
-    setSelectedRulesetPath(
-      isConnectedGitProject && gitSyncRulesetPath && rulesetContent
-        ? gitSyncRulesetPath
-        : rulesetContent
-          ? rulesetWritePath
-          : '',
-    );
-  }, [gitSyncRulesetPath, isConnectedGitProject, rulesetWritePath, rulesetContent]);
-
-  reactUse.useUnmount(() => {
-    // delete the helper to avoid it run multiple times when user enter the page next time
-    CodeMirror.registerHelper('lint', 'openapi', () => {});
-  });
-
-  const onCodeEditorChange = useMemo(() => {
-    const handler = async (contents: string) => {
-      return updateApiSpec({
-        organizationId,
-        projectId,
-        workspaceId,
-        contents: contents,
-      });
-    };
-
-    return debounce(handler, 500);
-  }, [organizationId, projectId, updateApiSpec, workspaceId]);
-
-  const handleScrollToSelection = useCallback(
-    (chStart: number, chEnd: number, lineStart: number, lineEnd: number) => {
-      if (!editor.current) {
-        return;
-      }
-      editor.current.scrollToSelection(chStart, chEnd, lineStart, lineEnd);
-    },
-    [editor],
-  );
-
-  const handleScrollToLintMessage = useCallback(
-    (occurrence: GroupedLintMessage['occurrences'][number]) => {
-      if (!editor.current) {
-        return;
-      }
-      const { start, end } = occurrence.range;
-      editor.current.scrollToSelection(start.character, end.character, start.line, end.line);
-    },
-    [editor],
-  );
-
-  const [expandedKeys, setExpandedKeys] = useState<string[]>([]);
-
-  const navigateToPath = (path: string): void => {
-    const pathSegments = path.split('.');
-    const scrollPosition = {
-      start: { line: 0, col: 0 },
-      end: { line: 0, col: 200 },
-    };
-
-    try {
-      JSON.parse(apiSpec.contents);
-      // Account for JSON (as string) line number shift
-      scrollPosition.start.line = 1;
-    } catch {}
-
-    const lineCounter = new YAML.LineCounter();
-    const doc = YAML.parseDocument(apiSpec.contents, { lineCounter });
-    const astNode = doc.getIn(pathSegments, true) as YAML.Node;
-    const nodePosition = astNode.range && lineCounter.linePos(astNode.range[0]);
-    if (nodePosition) {
-      scrollPosition.start.line += nodePosition.line;
-    }
-    const isServersSection = pathSegments[0] === 'servers';
-    if (!isServersSection) {
-      scrollPosition.start.line -= 1;
-    }
-
-    scrollPosition.end.line = scrollPosition.start.line;
-    // NOTE: We're subtracting 1 from everything because YAML CST uses
-    //   1-based indexing and we use 0-based.
-    handleScrollToSelection(
-      scrollPosition.start.col - 1,
-      scrollPosition.end.col - 1,
-      scrollPosition.start.line - 1,
-      scrollPosition.end.line - 1,
-    );
-  };
-
-  const sidebarPanelRef = useRef<ImperativePanelGroupHandle>(null);
-  const lintPanelRef = useRef<ImperativePanelHandle>(null);
-
-  useDocBodyKeyboardShortcuts({
-    environment_showEditor: () => setEnvironmentModalOpen(true),
-    environment_showSwitchMenu: () => setIsEnvironmentPickerOpen(true),
-    showCookiesEditor: () => setIsCookieModalOpen(true),
-  });
-
-  const specFormat = useMemo((): 'json' | 'yaml' | null => {
-    const contents = apiSpec.contents?.trim();
-    if (!contents) {
-      return null;
-    }
-    try {
-      JSON.parse(contents);
-      return 'json';
-    } catch {
-      return 'yaml';
-    }
-  }, [apiSpec.contents]);
-
-  const switchFormat = (to: 'json' | 'yaml') => {
-    const editorValue = editor.current?.getValue();
-    if (!editorValue) {
-      return;
-    }
-    let parsedSpec: string | undefined;
-    try {
-      // yaml parses json correctly
-      parsedSpec = YAML.parse(editorValue);
-    } catch {
-      showToast({
-        title: 'Failed to convert spec format',
-        icon: 'circle-exclamation',
-        status: 'error',
-        description: `Spec is not valid, cannot convert to ${to.toUpperCase()}`,
-      });
-      return;
-    }
-    const contents = to === 'json' ? JSON.stringify(parsedSpec, null, 2) : YAML.stringify(parsedSpec);
-    editor.current?.setValue(contents);
-    updateApiSpec({ organizationId, projectId, workspaceId, contents });
-  };
-
-  const handleSelectSpectralFile = async () => {
-    const { filePath, canceled } = await selectFileOrFolder({
-      itemTypes: ['file'],
-      extensions: ['yaml', 'yml'],
-      showHiddenFiles: true,
-    });
-
-    if (canceled || !filePath) {
-      return;
-    }
-
-    // We bundle the ruleset to resolve any extended rulesets and to validate the content
-    const { content, error } = await window.main.bundleSpectralRuleset({ sourcePath: filePath });
-    if (error || !content) {
-      showError({
-        title: 'Invalid Spectral Ruleset',
-        message: error ?? 'Failed to bundle ruleset.',
-      });
-      return;
-    }
-
-    const RULESET_MAX_BYTES = 1 * 1024 * 1024; // 1 MB
-    if (utf8ByteLength(content) > RULESET_MAX_BYTES) {
-      showError({
-        title: 'Ruleset Too Large',
-        message: 'The selected ruleset exceeds the maximum allowed size of 1 MB.',
-      });
-      return;
-    }
-
-    await updateProjectRuleset({ organizationId, projectId, rulesetContent: content });
-
-    window.main.trackAnalyticsEvent({
-      event: AnalyticsEvent.uploadLintRulesetClicked,
-      properties: {
-        project_type: models.project.isGitProject(activeProject)
-          ? 'git'
-          : models.project.isRemoteProject(activeProject)
-            ? 'remote'
-            : 'local',
-      },
-    });
-
-    setSelectedRulesetPath(gitSyncRulesetPath || rulesetWritePath);
-  };
-
-  const handleRefreshRuleset = async () => {
-    if (!rulesetContent) {
-      return;
-    }
-    setIsRefreshing(true);
-    try {
-      await window.main.refreshCompiledRuleset({ projectId, rulesetContent });
-      refreshProjectRuleset({ organizationId, projectId });
-      editor.current?.tryToSetOption('lint', { ...lintOptions });
-    } catch (err) {
-      showError({
-        title: 'Refresh Failed',
-        message: `Failed to refresh ruleset: ${err instanceof Error ? err.message : String(err)}`,
-      });
-    } finally {
-      setIsRefreshing(false);
-    }
-  };
-
-  const handleUnselectSpectralFile = async () => {
-    showModal(AskModal, {
-      title: 'Remove Ruleset File',
-      message:
-        'Are you sure you want to remove this custom ruleset? This will disable all custom linting rules and use the default Spectral ruleset.',
-      yesText: 'Remove',
-      color: 'danger',
-      noText: 'Cancel',
-      onDone: async (confirmed: boolean) => {
-        if (confirmed) {
-          await deleteProjectRuleset({
-            organizationId,
-            projectId,
-          });
-          await window.main.deleteCompiledRuleset({ projectId });
-          setSelectedRulesetPath('');
-        }
-      },
-    });
-  };
-
-  const generateActionList: SpecActionItem[] = [
-    {
-      id: 'generate-request-collection',
-      name: 'Collection',
-      icon: (
-        <span className="flex h-5 w-5 items-center justify-center rounded-sm bg-(--color-surprise) text-(--color-font-surprise)">
-          <Icon className="w-3" icon="bars" />
-        </span>
-      ),
-      isDisabled: !apiSpec.contents || lintErrors.length > 0 || generateRequestCollectionFetcher.state !== 'idle',
-      tooltip:
-        lintErrors.length > 0
-          ? 'You cannot generate a collection when spec errors exist. Fix the errors or change the ruleset first.'
-          : undefined,
-      action: () =>
-        generateRequestCollectionFetcher.submit({
-          organizationId,
-          projectId,
-          workspaceId,
-        }),
-    },
-    {
-      id: 'generate-mock-server',
-      name: 'Mock Server',
-      icon: (
-        <span className="flex h-5 w-5 items-center justify-center rounded-sm bg-(--color-warning) text-(--color-font-warning)">
-          <Icon className="w-3" icon="server" />
-        </span>
-      ),
-      badge: <Badge icon="sparkles" color="surprise" label="AI" style={{ marginLeft: 'auto', marginRight: '0' }} />,
-      isDisabled: !apiSpec.contents || !isGenerateMockServersWithAIEnabled,
-      action: () => {
-        window.main.trackAnalyticsEvent({
-          event: AnalyticsEvent.designerGenerateMockClicked,
-        });
-        setNewMockServerModalOpen(true);
-      },
-    },
-  ];
-
-  const specFormatActionList: SpecActionItem[] = [
-    {
-      id: 'json',
-      name: 'JSON',
-      action: () => switchFormat('json'),
-    },
-    {
-      id: 'yaml',
-      name: 'YAML',
-      action: () => switchFormat('yaml'),
-    },
-  ];
-
-  const generateDisabledKeys = generateActionList.filter(item => item.isDisabled).map(item => item.id);
-
-  const historyKey = `${apiSpec?._id}::${apiSpec?.created}::${gitVersion}::${vcsVersion}`;
-
-  const [direction, setDirection] = useState<'horizontal' | 'vertical'>(
-    settings.forceVerticalLayout ? 'vertical' : 'horizontal',
-  );
-  useLayoutEffect(() => {
-    if (settings.forceVerticalLayout) {
-      setDirection('vertical');
-      return () => {};
-    }
-    // Listen on media query changes
-    const mediaQuery = window.matchMedia('(max-width: 880px)');
-    setDirection(mediaQuery.matches ? 'vertical' : 'horizontal');
-
-    const handleChange = (e: MediaQueryListEvent) => {
-      setDirection(e.matches ? 'vertical' : 'horizontal');
-    };
-
-    mediaQuery.addEventListener('change', handleChange);
-
-    return () => {
-      mediaQuery.removeEventListener('change', handleChange);
-    };
-  }, [settings.forceVerticalLayout, direction]);
-
-  const specEditor = (
-    <div className="relative flex h-full w-full overflow-hidden">
-      <CodeEditor
-        id="spec-editor"
-        key={historyKey}
-        showPrettifyButton
-        ref={editor}
-        lintOptions={lintOptions}
-        mode={apiSpec.contents ? 'openapi' : undefined}
-        defaultValue={apiSpec.contents || ''}
-        onChange={onCodeEditorChange}
-        historyKey={historyKey}
-      />
-      {apiSpec.contents ? null : (
-        <DesignEmptyState
-          onImport={value => {
-            updateApiSpec({
-              organizationId,
-              projectId,
-              workspaceId,
-              contents: value,
-              fromTemplate: true,
-            });
-          }}
-        />
-      )}
-    </div>
-  );
-
-  const specPaneToolbar = apiSpec.contents ? (
-    <div className="flex h-[40px] shrink-0 items-center gap-2 overflow-hidden border-b border-solid border-(--hl-md) px-(--padding-sm)">
-      <span className="truncate text-sm text-(--hl) italic">
-        {parsedSpec?.openapi ? `OpenAPI ${parsedSpec.openapi}` : ''}
-      </span>
-      <span className="flex-1" />
-      <MenuTrigger>
-        <Button
-          aria-label="Generate"
-          className="flex shrink-0 items-center justify-center gap-2 rounded-md border border-solid border-(--hl-md) px-2.5 py-1 text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
-        >
-          <span>Generate</span>
-          <Icon icon="chevron-down" className="w-2.5 text-(--hl)" />
-        </Button>
-        <Popover className="flex min-w-max flex-col overflow-y-hidden">
-          <Menu
-            aria-label="Generate menu"
-            selectionMode="single"
-            disabledKeys={generateDisabledKeys}
-            onAction={key => {
-              const item = generateActionList.find(item => item.id === key);
-              if (item) {
-                item.action();
-              }
-            }}
-            items={generateActionList}
-            className="min-w-max overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) py-2 text-sm shadow-lg select-none focus:outline-hidden"
-          >
-            {item => (
-              <TooltipTrigger delay={0} isDisabled={!item.tooltip}>
-                <MenuItem
-                  id={item.id}
-                  textValue={item.name}
-                  className="flex h-(--line-height-xs) w-full items-center gap-2 bg-transparent px-(--padding-sm) whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden disabled:cursor-not-allowed aria-disabled:cursor-not-allowed aria-disabled:text-(--hl-md) aria-selected:font-bold"
-                  aria-label={item.name}
-                >
-                  {item.icon}
-                  <span>{item.name}</span>
-                  {item.badge && (
-                    <span className="flex origin-left scale-90 items-center pl-2 text-xs">{item.badge}</span>
-                  )}
-                </MenuItem>
-                <Tooltip
-                  offset={8}
-                  className="max-w-xs rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-2 py-1 text-sm text-(--color-font) shadow-lg"
-                >
-                  {item.tooltip}
-                </Tooltip>
-              </TooltipTrigger>
-            )}
-          </Menu>
-        </Popover>
-      </MenuTrigger>
-      <MenuTrigger>
-        <Button
-          aria-label="Spec format"
-          className="flex shrink-0 items-center justify-center gap-2 rounded-md border border-solid border-(--hl-md) px-2.5 py-1 text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
-        >
-          <span>{specFormat ? specFormat.toUpperCase() : 'JSON'}</span>
-          <Icon icon="chevron-down" className="w-2.5 text-(--hl)" />
-        </Button>
-        <Popover className="flex min-w-max flex-col overflow-y-hidden">
-          <div className="min-w-max overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) py-2 text-sm shadow-lg select-none">
-            <span className="block px-(--padding-md) py-1 text-xs text-(--hl)">Spec format</span>
-            <Menu
-              aria-label="Spec format menu"
-              selectionMode="single"
-              selectedKeys={specFormat ? [specFormat] : []}
-              onAction={key => {
-                const item = specFormatActionList.find(item => item.id === key);
-                if (item) {
-                  item.action();
-                }
-              }}
-              items={specFormatActionList}
-              className="min-w-max focus:outline-hidden"
-            >
-              {item => (
-                <MenuItem
-                  className="flex h-(--line-height-xs) w-full items-center gap-2 bg-transparent px-(--padding-sm) whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden aria-selected:font-bold"
-                  aria-label={item.name}
-                >
-                  <span>{item.name}</span>
-                </MenuItem>
-              )}
-            </Menu>
-          </div>
-        </Popover>
-      </MenuTrigger>
-      <TooltipTrigger delay={0}>
-        <ToggleButton
-          aria-label="Toggle preview"
-          data-testid="preview-toggle"
-          isSelected={isSpecPaneOpen}
-          className="flex shrink-0 items-center justify-center rounded-md border border-solid border-(--hl-md) px-2 py-1 text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset"
-          onChange={value => {
-            setIsSpecPaneOpen(value);
-            window.main.trackAnalyticsEvent({
-              event: AnalyticsEvent.designerPreviewToggled,
-              properties: {
-                status: !value ? 'open' : 'collapsed',
-              },
-            });
-          }}
-        >
-          {({ isSelected }) => (
-            <span className="flex h-5 w-5 items-center justify-center">
-              <Icon icon={isSelected ? 'eye-slash' : 'eye'} fixedWidth />
-            </span>
-          )}
-        </ToggleButton>
-        <Tooltip
-          offset={8}
-          className="rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-2 py-1 text-sm text-(--color-font) shadow-lg"
-        >
-          {isSpecPaneOpen ? 'Hide docs preview' : 'Show docs preview'}
-        </Tooltip>
-      </TooltipTrigger>
-    </div>
-  ) : null;
-
-  const isRulesetInvalid = !!rulesetImportIssue && !rulesetContent;
-
-  const lintToolbar = (
-    <div
-      className={`flex h-(--line-height-sm) items-center gap-2 overflow-hidden border-solid border-(--hl-md) px-(--padding-sm) ${isLintPaneOpen ? 'border-b' : ''}`}
-    >
-      <div className="inline-flex items-center gap-2">
-        <Icon icon={selectedRulesetPath && !isRulesetInvalid ? 'file-circle-check' : 'file-circle-xmark'} />
-        {!isRulesetInvalid && selectedRulesetPath && (
-          <>
-            <TooltipTrigger delay={0}>
-              <Button
-                aria-label="View selected ruleset content"
-                className="underline"
-                onPress={() => setIsViewRulesetModalOpen(true)}
-              >
-                Custom Ruleset
-              </Button>
-              <Tooltip
-                placement="top end"
-                offset={8}
-                className="max-h-[85vh] max-w-xs overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-4 py-2 text-sm text-(--color-font) shadow-lg select-none focus:outline-hidden"
-              >
-                <p className="mb-2">Using ruleset from</p>
-                <code className="block p-0 break-all whitespace-pre-wrap">{selectedRulesetPath}</code>
-              </Tooltip>
-            </TooltipTrigger>
-            {rulesetHasRemoteExtendsEntries && (
-              <TooltipTrigger delay={0}>
-                <Button
-                  aria-label="Refresh ruleset from remote sources"
-                  isDisabled={isRefreshing}
-                  onPress={handleRefreshRuleset}
-                  className="flex aspect-square h-6 shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset disabled:opacity-50 aria-pressed:bg-(--hl-sm)"
-                >
-                  <Icon icon={isRefreshing ? 'spinner' : 'rotate'} className={isRefreshing ? 'animate-spin' : ''} />
-                </Button>
-                <Tooltip
-                  placement="top end"
-                  offset={8}
-                  className="max-h-[85vh] max-w-xs overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-4 py-2 text-sm text-(--color-font) shadow-lg select-none focus:outline-hidden"
-                >
-                  <p>Recompile ruleset, including re-fetching any referenced remote entries.</p>
-                  {rulesetLastCompiledAt && (
-                    <p className="mt-1">{`Last updated ${new Date(rulesetLastCompiledAt).toLocaleString()}`}.</p>
-                  )}
-                </Tooltip>
-              </TooltipTrigger>
-            )}
-            <TooltipTrigger delay={0}>
-              <Button
-                aria-label="Remove custom ruleset"
-                onPress={handleUnselectSpectralFile}
-                className="flex aspect-square h-6 shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
-              >
-                <Icon icon="xmark" />
-              </Button>
-              <Tooltip
-                placement="top end"
-                offset={8}
-                className="max-h-[85vh] max-w-xs overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-4 py-2 text-sm text-(--color-font) shadow-lg select-none focus:outline-hidden"
-              >
-                <p>Clear custom ruleset and use default OAS ruleset</p>
-              </Tooltip>
-            </TooltipTrigger>
-          </>
-        )}
-        {!selectedRulesetPath && (
-          <>
-            <span>Default OAS Ruleset</span>
-            {isRulesetInvalid && (
-              <TooltipTrigger delay={0}>
-                <Button
-                  aria-label="Invalid ruleset details"
-                  className="flex aspect-square h-6 shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
-                >
-                  <Icon icon="triangle-exclamation" className="text-(--color-warning)" />
-                </Button>
-                <Tooltip
-                  placement="top end"
-                  offset={8}
-                  className="max-h-[85vh] max-w-xs overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-4 py-2 text-sm text-(--color-font) shadow-lg select-none focus:outline-hidden"
-                >
-                  <p className="mb-2">
-                    The custom ruleset in this project contains invalid content: {rulesetImportIssue}
-                  </p>
-                  <p>Fix the syntax in your connected git repository. The default OAS ruleset is used until then.</p>
-                </Tooltip>
-              </TooltipTrigger>
-            )}
-            <TooltipTrigger delay={0}>
-              <Button
-                aria-label="Upload custom ruleset"
-                onPress={handleSelectSpectralFile}
-                className="flex aspect-square h-6 shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
-              >
-                <Icon icon="upload" />
-              </Button>
-              <Tooltip
-                placement="top end"
-                offset={8}
-                className="max-h-[85vh] max-w-xs overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-4 py-2 text-sm text-(--color-font) shadow-lg select-none focus:outline-hidden"
-              >
-                <p>
-                  Upload a custom Spectral ruleset
-                  {isConnectedGitProject && (
-                    <span>
-                      {' '}
-                      or add a <code className="p-0">.spectral.yaml</code> file to the root of your connected git
-                      repository
-                    </span>
-                  )}
-                  . Any local files or remote URLs referenced via <code className="p-0">extends</code> will be bundled
-                  into a single ruleset on upload.
-                </p>
-              </Tooltip>
-            </TooltipTrigger>
-          </>
-        )}
-      </div>
-      <span className="flex-1" />
-      <div className="flex items-center gap-2">
-        {lintErrors.length > 0 && (
-          <div className="flex items-center gap-2 select-none">
-            <Icon icon="circle-xmark" className="text-(--color-danger)" />
-          </div>
-        )}
-        {lintWarnings.length > 0 && (
-          <div className="flex items-center gap-2 select-none">
-            <Icon icon="triangle-exclamation" className="text-(--color-warning)" />
-          </div>
-        )}
-        {apiSpec.contents && (
-          <div className="flex items-center gap-2 select-none">
-            {lintMessages.length === 0 && <Icon icon="check-square" className="text-(--color-success)" />}
-            {lintMessages.length === 0 ? (
-              'No lint problems'
-            ) : (
-              <Button
-                data-testid="lint-panel-toggle"
-                onPress={() => (isLintPaneOpen ? lintPanelRef.current?.collapse() : lintPanelRef.current?.expand())}
-              >
-                <span className="underline">
-                  {lintErrors.length} {lintErrors.length === 1 ? 'error' : 'errors'}, {lintWarnings.length}{' '}
-                  {lintWarnings.length === 1 ? 'warning' : 'warnings'}
-                </span>
-              </Button>
-            )}
-          </div>
-        )}
-      </div>
-    </div>
-  );
-
-  const lintMessageList = (
-    <div className="flex-1 overflow-y-auto select-none">
-      {groupedLintMessages.map(item => (
-        <div
-          key={item.code}
-          className="flex flex-col text-xs"
-          aria-expanded={expandedLintMessageCodes.includes(item.code)}
-        >
-          <Button
-            className="flex cursor-pointer items-center gap-2 p-(--padding-sm) outline-hidden transition-colors hover:bg-(--hl-sm)"
-            onPress={() =>
-              setExpandedLintMessageCodes(prev =>
-                prev.includes(item.code) ? prev.filter(c => c !== item.code) : [...prev, item.code],
-              )
-            }
-          >
-            <Icon
-              icon={expandedLintMessageCodes.includes(item.code) ? 'chevron-down' : 'chevron-right'}
-              className="h-2.5 w-2.5"
-            />
-            ({item.occurrences.length})
-            <Icon
-              className={item.type === 'error' ? 'text-(--color-danger)' : 'text-(--color-warning)'}
-              icon={item.type === 'error' ? 'circle-xmark' : 'triangle-exclamation'}
-            />
-            <span className="truncate">
-              {item.code}: {item.message}
-            </span>
-          </Button>
-          {expandedLintMessageCodes.includes(item.code) && (
-            <div className="flex flex-col gap-0.5">
-              {item.occurrences.map(occurrence => (
-                <Button
-                  key={`${occurrence.line}-${occurrence.path}-${occurrence.range.start.line}:${occurrence.range.start.character}-${occurrence.range.end.line}:${occurrence.range.end.character}`}
-                  className="flex gap-2 p-(--padding-sm) pl-[22px] text-left hover:bg-(--hl-sm)"
-                  onPress={() => handleScrollToLintMessage(occurrence)}
-                >
-                  <span className="shrink-0 underline">Ln {occurrence.line + 1}</span>
-                  {occurrence.path && <span className="truncate opacity-60">{occurrence.path}</span>}
-                </Button>
-              ))}
-            </div>
-          )}
-        </div>
-      ))}
-    </div>
-  );
-
-  return (
-    <div className="flex h-full flex-col">
-      <OrganizationTabList />
-      <WorkspacePaneHeader hasSettings={false} />
-      <PanelGroup
-        ref={sidebarPanelRef}
-        autoSaveId="insomnia-sidebar"
-        id={WORKSPACE_CONTENT_WRAPPER}
-        className="new-sidebar w-full flex-1 text-(--color-font)"
-        direction="horizontal"
-      >
-        <Panel
-          id="sidebar"
-          className="sidebar theme--sidebar"
-          defaultSize={DEFAULT_SIDEBAR_SIZE}
-          maxSize={40}
-          minSize={10}
-          collapsible
-        >
-          <div className="flex flex-1 flex-col divide-y divide-solid divide-(--hl-md) overflow-hidden">
-            <DocumentTab
-              organizationId={organizationId}
-              projectId={projectId}
-              workspaceId={workspaceId}
-              className="border-b border-solid border-(--hl-sm)"
-            />
-            <div className="flex flex-1 flex-col divide-y divide-solid divide-(--hl-md) overflow-y-auto">
-              {/* Info */}
-              {info && (
-                <div className="divide-y divide-solid divide-(--hl-md)">
-                  <Button
-                    className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
-                    onPress={() => {
-                      expandedKeys.includes('info')
-                        ? setExpandedKeys(expandedKeys.filter(key => key !== 'info'))
-                        : setExpandedKeys([...expandedKeys, 'info']);
-                    }}
-                  >
-                    <span className="truncate">Info</span>
-                    <Icon icon={expandedKeys.includes('info') ? 'minus' : 'plus'} className="text-xs" />
-                  </Button>
-                  {/* Info */}
-                  {expandedKeys.includes('info') && (
-                    <ListBox onAction={key => navigateToPath(key.toString())}>
-                      <ListBoxItem
-                        className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
-                        id="info.title"
-                      >
-                        <span className="truncate">Title: {info.title}</span>
-                      </ListBoxItem>
-                      <ListBoxItem
-                        className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
-                        id="info.description"
-                      >
-                        <span className="truncate">Description: {info.description}</span>
-                      </ListBoxItem>
-                      <ListBoxItem
-                        className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
-                        id="info.version"
-                      >
-                        <span className="truncate">Version: {info.version}</span>
-                      </ListBoxItem>
-                      <ListBoxItem
-                        className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
-                        id="info.license"
-                      >
-                        <span className="truncate">License: {info.license?.name}</span>
-                      </ListBoxItem>
-                    </ListBox>
-                  )}
-                </div>
-              )}
-              {/* Servers */}
-              {servers && (
-                <div className="divide-y divide-solid divide-(--hl-md)">
-                  <div>
-                    <Button
-                      className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
-                      onPress={() => {
-                        expandedKeys.includes('servers')
-                          ? setExpandedKeys(expandedKeys.filter(key => key !== 'servers'))
-                          : setExpandedKeys([...expandedKeys, 'servers']);
-                      }}
-                    >
-                      <span className="truncate">Servers</span>
-                      <Icon icon={expandedKeys.includes('servers') ? 'minus' : 'plus'} className="text-xs" />
-                    </Button>
-                  </div>
-                  {expandedKeys.includes('servers') && (
-                    <ListBox
-                      items={servers.map((server, index) => ({
-                        path: index,
-                        ...server,
-                      }))}
-                      onAction={key => navigateToPath(key.toString())}
-                    >
-                      {item => (
-                        <ListBoxItem
-                          className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
-                          id={`servers.${item.path}`}
-                        >
-                          {item.url}
-                        </ListBoxItem>
-                      )}
-                    </ListBox>
-                  )}
-                </div>
-              )}
-              {/* Paths */}
-              {paths && (
-                <div className="divide-y divide-solid divide-(--hl-md)">
-                  <div>
-                    <Button
-                      className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
-                      onPress={() => {
-                        expandedKeys.includes('paths')
-                          ? setExpandedKeys(expandedKeys.filter(key => key !== 'paths'))
-                          : setExpandedKeys([...expandedKeys, 'paths']);
-                      }}
-                    >
-                      <span className="truncate">Paths</span>
-                      <Icon icon={expandedKeys.includes('paths') ? 'minus' : 'plus'} className="text-xs" />
-                    </Button>
-                  </div>
-                  {expandedKeys.includes('paths') && (
-                    <GridList
-                      items={Object.entries(paths).map(([path, item]) => ({
-                        ...item,
-                        id: path,
-                        path,
-                      }))}
-                      onAction={key => navigateToPath(key.toString())}
-                    >
-                      {item => (
-                        <GridListItem className="group outline-hidden select-none" id={`paths.${item.path}`}>
-                          <div className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none group-hover:bg-(--hl-xs) group-focus:bg-(--hl-sm) group-aria-selected:text-(--color-font)">
-                            <span className="truncate">{item.path}</span>
-                            <span className="flex-1" />
-                            {getMethodsFromOpenApiPathItem(item).map(method => (
-                              <Button
-                                key={method}
-                                onPress={() => navigateToPath(`paths.${item.path}.${method}`)}
-                                className={`flex w-10 shrink-0 items-center justify-center rounded-xs border border-solid border-(--hl-sm) text-[0.65rem] http-method-${method.toUpperCase()}`}
-                              >
-                                {formatMethodName(method.toUpperCase())}
-                              </Button>
-                            ))}
-                          </div>
-                        </GridListItem>
-                      )}
-                    </GridList>
-                  )}
-                </div>
-              )}
-              {/* RequestBodies */}
-              {requestBodies && (
-                <div className="divide-y divide-solid divide-(--hl-md)">
-                  <div>
-                    <Button
-                      className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
-                      onPress={() => {
-                        expandedKeys.includes('requestBodies')
-                          ? setExpandedKeys(expandedKeys.filter(key => key !== 'requestBodies'))
-                          : setExpandedKeys([...expandedKeys, 'requestBodies']);
-                      }}
-                    >
-                      <span className="truncate">Request bodies</span>
-                      <Icon icon={expandedKeys.includes('requestBodies') ? 'minus' : 'plus'} className="text-xs" />
-                    </Button>
-                  </div>
-                  {expandedKeys.includes('requestBodies') && (
-                    <ListBox
-                      items={Object.entries(requestBodies).map(([path, item]) => ({
-                        ...item,
-                        id: path,
-                        path,
-                      }))}
-                      onAction={key => navigateToPath(key.toString())}
-                    >
-                      {item => (
-                        <ListBoxItem
-                          className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
-                          id={`components.requestBodies.${item.path}`}
-                        >
-                          <span className="truncate">{item.path}</span>
-                        </ListBoxItem>
-                      )}
-                    </ListBox>
-                  )}
-                </div>
-              )}
-              {/* Responses */}
-              {responses && (
-                <div className="divide-y divide-solid divide-(--hl-md)">
-                  <div>
-                    <Button
-                      className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
-                      onPress={() => {
-                        expandedKeys.includes('responses')
-                          ? setExpandedKeys(expandedKeys.filter(key => key !== 'responses'))
-                          : setExpandedKeys([...expandedKeys, 'responses']);
-                      }}
-                    >
-                      <span className="truncate">Responses</span>
-                      <Icon icon={expandedKeys.includes('responses') ? 'minus' : 'plus'} className="text-xs" />
-                    </Button>
-                  </div>
-                  {expandedKeys.includes('responses') && (
-                    <ListBox
-                      items={Object.entries(responses).map(([path, item]) => ({
-                        ...item,
-                        id: path,
-                        path,
-                      }))}
-                      onAction={key => navigateToPath(key.toString())}
-                    >
-                      {item => (
-                        <ListBoxItem
-                          className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
-                          id={`components.responses.${item.path}`}
-                        >
-                          <span className="truncate">{item.path}</span>
-                        </ListBoxItem>
-                      )}
-                    </ListBox>
-                  )}
-                </div>
-              )}
-              {/* Parameters */}
-              {parameters && (
-                <div className="divide-y divide-solid divide-(--hl-md)">
-                  <div>
-                    <Button
-                      className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
-                      onPress={() => {
-                        expandedKeys.includes('parameters')
-                          ? setExpandedKeys(expandedKeys.filter(key => key !== 'parameters'))
-                          : setExpandedKeys([...expandedKeys, 'parameters']);
-                      }}
-                    >
-                      <span className="truncate">Parameters</span>
-                      <Icon icon={expandedKeys.includes('parameters') ? 'minus' : 'plus'} className="text-xs" />
-                    </Button>
-                  </div>
-                  {expandedKeys.includes('parameters') && (
-                    <ListBox
-                      items={Object.entries(parameters).map(([path, item]) => ({
-                        ...item,
-                        id: path,
-                        path,
-                      }))}
-                      onAction={key => navigateToPath(key.toString())}
-                    >
-                      {item => (
-                        <ListBoxItem
-                          className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
-                          id={`components.parameters.${item.path}`}
-                        >
-                          <span className="truncate">{item.path}</span>
-                        </ListBoxItem>
-                      )}
-                    </ListBox>
-                  )}
-                </div>
-              )}
-              {/* Headers */}
-              {headers && (
-                <div className="divide-y divide-solid divide-(--hl-md)">
-                  <div>
-                    <Button
-                      className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
-                      onPress={() => {
-                        expandedKeys.includes('headers')
-                          ? setExpandedKeys(expandedKeys.filter(key => key !== 'headers'))
-                          : setExpandedKeys([...expandedKeys, 'headers']);
-                      }}
-                    >
-                      <span className="truncate">Headers</span>
-                      <Icon icon={expandedKeys.includes('headers') ? 'minus' : 'plus'} className="text-xs" />
-                    </Button>
-                  </div>
-                  {expandedKeys.includes('headers') && (
-                    <ListBox
-                      items={Object.entries(headers).map(([path, item]) => ({
-                        ...item,
-                        id: path,
-                        path,
-                      }))}
-                      onAction={key => navigateToPath(key.toString())}
-                    >
-                      {item => (
-                        <ListBoxItem
-                          className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
-                          id={`components.headers.${item.path}`}
-                        >
-                          <span className="truncate">{item.path}</span>
-                        </ListBoxItem>
-                      )}
-                    </ListBox>
-                  )}
-                </div>
-              )}
-              {/* Schemas */}
-              {schemas && (
-                <div className="divide-y divide-solid divide-(--hl-md)">
-                  <div>
-                    <Button
-                      className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
-                      onPress={() => {
-                        expandedKeys.includes('schemas')
-                          ? setExpandedKeys(expandedKeys.filter(key => key !== 'schemas'))
-                          : setExpandedKeys([...expandedKeys, 'schemas']);
-                      }}
-                    >
-                      <span className="truncate">Schemas</span>
-                      <Icon icon={expandedKeys.includes('schemas') ? 'minus' : 'plus'} className="text-xs" />
-                    </Button>
-                  </div>
-                  {expandedKeys.includes('schemas') && (
-                    <ListBox
-                      items={Object.entries(schemas).map(([path, item]) => ({
-                        ...item,
-                        id: path,
-                        path,
-                      }))}
-                      onAction={key => navigateToPath(key.toString())}
-                    >
-                      {item => (
-                        <ListBoxItem
-                          className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
-                          id={`components.schemas.${item.path}`}
-                        >
-                          <span className="truncate">{item.path}</span>
-                        </ListBoxItem>
-                      )}
-                    </ListBox>
-                  )}
-                </div>
-              )}
-              {/* Security */}
-              {securitySchemes && (
-                <div className="divide-y divide-solid divide-(--hl-md)">
-                  <div>
-                    <Button
-                      className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
-                      onPress={() => {
-                        expandedKeys.includes('security')
-                          ? setExpandedKeys(expandedKeys.filter(key => key !== 'security'))
-                          : setExpandedKeys([...expandedKeys, 'security']);
-                      }}
-                    >
-                      <span className="truncate">Security</span>
-                      <Icon icon={expandedKeys.includes('security') ? 'minus' : 'plus'} className="text-xs" />
-                    </Button>
-                  </div>
-                  {expandedKeys.includes('security') && (
-                    <ListBox
-                      items={Object.entries(securitySchemes).map(([path, item]) => ({
-                        ...item,
-                        id: path,
-                        path,
-                      }))}
-                      onAction={key => navigateToPath(key.toString())}
-                    >
-                      {item => (
-                        <ListBoxItem
-                          className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
-                          id={`components.securitySchemes.${item.path}`}
-                        >
-                          <span className="truncate">{item.path}</span>
-                        </ListBoxItem>
-                      )}
-                    </ListBox>
-                  )}
-                </div>
-              )}
-            </div>
-            {isEnvironmentModalOpen && (
-              <WorkspaceEnvironmentsEditModal onClose={() => setEnvironmentModalOpen(false)} />
-            )}
-            {isCookieModalOpen && <CookiesModal setIsOpen={setIsCookieModalOpen} />}
-            {isCertificatesModalOpen && <CertificatesModal onClose={() => setCertificatesModalOpen(false)} />}
-            {isNewMockServerModalOpen && (
-              <NewWorkspaceModal
-                isOpen={isNewMockServerModalOpen}
-                project={activeProject}
-                storageRules={storageRules}
-                scope="mock-server"
-                sourceApiSpec={apiSpec}
-                source="design-view"
-                onOpenChange={setNewMockServerModalOpen}
-              />
-            )}
-            {isViewRulesetModalOpen && (
-              <ModalOverlay
-                isOpen={isViewRulesetModalOpen}
-                onOpenChange={setIsViewRulesetModalOpen}
-                isDismissable
-                className="fixed top-0 left-0 z-10 flex h-(--visual-viewport-height) w-full items-center justify-center bg-black/30"
-              >
-                <Modal className="max-h-full w-full max-w-[900px] overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) p-(--padding-lg) text-(--color-font)">
-                  <Dialog className="relative outline-hidden">
-                    {({ close }) => (
-                      <>
-                        <div className="flex items-center justify-between gap-2 pb-(--padding-sm)">
-                          <Heading slot="title" className="mb-[14px] text-[22px] leading-[34px]">
-                            Existing Ruleset Contents
-                          </Heading>
-                          <Button
-                            aria-label="Close ruleset content viewer"
-                            onPress={close}
-                            className="fa fa-times absolute top-0 right-0 text-xl"
-                          />
-                        </div>
-                        {rulesetContent && (
-                          <CodeEditor
-                            id="ruleset-viewer"
-                            mode="yaml"
-                            readOnly
-                            noLint
-                            defaultValue={rulesetContent}
-                            className="h-[400px]"
-                          />
-                        )}
-                      </>
-                    )}
-                  </Dialog>
-                </Modal>
-              </ModalOverlay>
-            )}
-          </div>
-        </Panel>
-        <PanelResizeHandle className="h-full w-px bg-(--hl-md)" />
-        <Panel id="workspace-content" className="flex flex-col">
-          {specPaneToolbar}
-          <PanelGroup autoSaveId="insomnia-panels" direction={direction} className="min-h-0 flex-1">
-            <Panel id="pane-one" minSize={10} className="pane-one theme--pane">
-              <div className="flex h-full w-full flex-col">
-                <PanelGroup autoSaveId="insomnia-spec-vertical" direction="vertical" className="min-h-0 flex-1">
-                  <Panel id="spec-editor" defaultSize={80} minSize={20} className="relative overflow-hidden">
-                    {specEditor}
-                  </Panel>
-                  {apiSpec.contents && (
-                    <>
-                      <PanelResizeHandle className="h-px w-full bg-(--hl-md)" />
-                      <Panel
-                        ref={lintPanelRef}
-                        id="lint-panel"
-                        defaultSize={0}
-                        minSize={10}
-                        collapsible
-                        onCollapse={() => setIsLintPaneOpen(false)}
-                        onExpand={() => setIsLintPaneOpen(true)}
-                        className="flex flex-col overflow-hidden"
-                      >
-                        {isLintPaneOpen && (
-                          <div data-testid="lint-panel" className="box-border flex h-full flex-col">
-                            {lintToolbar}
-                            {lintMessageList}
-                          </div>
-                        )}
-                      </Panel>
-                    </>
-                  )}
-                </PanelGroup>
-                {apiSpec.contents && !isLintPaneOpen ? lintToolbar : null}
-              </div>
-            </Panel>
-            {isSpecPaneOpen && (
-              <>
-                <PanelResizeHandle
-                  className={direction === 'horizontal' ? 'h-full w-px bg-(--hl-md)' : 'h-px w-full bg-(--hl-md)'}
-                />
-                <Panel id="pane-two" minSize={10} className="pane-two theme--pane">
-                  <SwaggerUIDiv text={apiSpec.contents} />
-                </Panel>
-              </>
-            )}
-          </PanelGroup>
-        </Panel>
-      </PanelGroup>
-    </div>
-  );
-};
-
-export default Component;
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update.tsx
index c3ff1cfe5f..7f203c1fd3 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update.tsx
@@ -6,19 +6,21 @@ import { invariant } from '~/common/utils/invariant';
 import { createFetcherSubmitHook } from '~/ui/utils/router';
 
 import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update';
+import { generateRequestCollection } from './organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection';
 
 export async function clientAction({ request, params }: Route.ClientActionArgs) {
-  const { workspaceId } = params;
+  const { projectId, workspaceId } = params;
 
   const formData = await request.formData();
   const contents = formData.get('contents');
   const fromTemplate = Boolean(formData.get('fromTemplate'));
+  const shouldGenerateRequestCollection = Boolean(formData.get('generateRequestCollection'));
 
   invariant(typeof contents === 'string', 'Contents is required');
 
-  const apiSpec = await services.apiSpec.getByParentId(workspaceId);
+  // Create the spec if it doesn't exist yet, otherwise update the existing one
+  const apiSpec = await services.apiSpec.getOrCreateForParentId(workspaceId);
 
-  invariant(apiSpec, 'API Spec not found');
   await database.update({
     ...apiSpec,
     modified: Date.now(),
@@ -26,6 +28,14 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
     contents,
   });
 
+  if (shouldGenerateRequestCollection) {
+    try {
+      await generateRequestCollection({ projectId, workspaceId });
+    } catch (error) {
+      console.error('Error generating requests from spec:', error);
+    }
+  }
+
   return null;
 }
 
@@ -37,12 +47,14 @@ export const useSpecUpdateActionFetcher = createFetcherSubmitHook(
       workspaceId,
       contents,
       fromTemplate = false,
+      generateRequestCollection = false,
     }: {
       organizationId: string;
       projectId: string;
       workspaceId: string;
       contents: string;
       fromTemplate?: boolean;
+      generateRequestCollection?: boolean;
     }) => {
       const url = href('/organization/:organizationId/project/:projectId/workspace/:workspaceId/spec/update', {
         organizationId,
@@ -55,6 +67,9 @@ export const useSpecUpdateActionFetcher = createFetcherSubmitHook(
       if (fromTemplate) {
         formData.append('fromTemplate', 'true');
       }
+      if (generateRequestCollection) {
+        formData.append('generateRequestCollection', 'true');
+      }
 
       return submit(formData, {
         action: url,
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.tsx
index 982436f527..49e06a37f3 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.tsx
@@ -1,7 +1,7 @@
 import type { IconName } from '@fortawesome/fontawesome-svg-core';
 import type { UnitTestSuite } from 'insomnia-data';
 import { models } from 'insomnia-data';
-import { Suspense, useLayoutEffect, useRef, useState } from 'react';
+import { Suspense, useEffect, useLayoutEffect, useRef, useState } from 'react';
 import {
   Button,
   DropIndicator,
@@ -26,7 +26,7 @@ import { useRunAllTestsActionFetcher } from '~/routes/organization.$organization
 import { TestRunStatus } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result.$testResultId';
 import { useTestSuiteUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.update';
 import { useTestSuiteNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.new';
-import { DocumentTab } from '~/ui/components/document-tab';
+import { CollectionTab } from '~/ui/components/collection-tab';
 import { EditableInput } from '~/ui/components/editable-input';
 import { ErrorBoundary } from '~/ui/components/error-boundary';
 import { Icon } from '~/ui/components/icon';
@@ -256,10 +256,35 @@ const Component = () => {
     };
   }, [settings.forceVerticalLayout, direction]);
 
+  const hasLegacyUnitTests = unitTestSuites.length > 0;
+
+  useEffect(() => {
+    if (!settings.enableLegacyUnitTests && !hasLegacyUnitTests) {
+      // If legacy unit tests are disabled and the collection has none, redirect to the spec route for the workspace
+      tabNavigate(
+        {
+          organization: organizationId,
+          project: activeProject,
+          workspace: activeWorkspace,
+          item: activeWorkspace,
+        },
+        { shouldNavigate: true },
+      );
+    }
+  }, [activeProject, activeWorkspace, hasLegacyUnitTests, organizationId, settings.enableLegacyUnitTests, tabNavigate]);
+
   return (
     <div className="flex h-full flex-col">
       <OrganizationTabList />
       <WorkspacePaneHeader hasSettings />
+      <CollectionTab
+        organizationId={organizationId}
+        projectId={projectId}
+        workspaceId={workspaceId}
+        activeItemId="test"
+        enableLegacyUnitTests={settings.enableLegacyUnitTests}
+        hasLegacyUnitTests={hasLegacyUnitTests}
+      />
       <PanelGroup
         ref={sidebarPanelRef}
         autoSaveId="insomnia-sidebar"
@@ -277,9 +302,6 @@ const Component = () => {
         >
           <ErrorBoundary showAlert>
             <div className="flex flex-1 flex-col divide-y divide-solid divide-(--hl-md) overflow-hidden">
-              <div className="flex flex-col items-start divide-y divide-solid divide-(--hl-md)">
-                <DocumentTab organizationId={organizationId} projectId={projectId} workspaceId={workspaceId} />
-              </div>
               <div className="p-(--padding-sm)">
                 <Button
                   className="flex items-center justify-center gap-2 rounded-xs px-4 py-1 text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.tsx
index 08bd2f9b2d..711c9da731 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.tsx
@@ -1,5 +1,4 @@
 import type {
-  ApiSpec,
   CaCertificate,
   ClientCertificate,
   CookieJar,
@@ -33,6 +32,7 @@ import { pushSnapshotOnInitialize } from '~/sync/vcs/initialize-backend-project'
 import { Icon } from '~/ui/components/icon';
 import { showResourceNotFoundToast } from '~/ui/components/toast-notification';
 import { useGitFileIssues } from '~/ui/hooks/use-git-file-issues';
+import { syncVCSLikeForWorkspace } from '~/ui/sync-utils';
 import { createFetcherLoadHook } from '~/ui/utils/router';
 
 import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId';
@@ -54,7 +54,6 @@ export interface WorkspaceLoaderData {
   subEnvironments: Environment[];
   globalBaseEnvironments: (Environment & { workspaceName: string })[];
   globalSubEnvironments: Environment[];
-  activeApiSpec: ApiSpec | null;
   activeMockServer?: MockServer | null;
   clientCertificates: ClientCertificate[];
   caCertificate: CaCertificate | null;
@@ -147,7 +146,6 @@ export async function clientLoader({ params, request }: Route.ClientLoaderArgs)
 
   const activeCookieJar = await services.cookieJar.getOrCreateForParentId(workspaceId);
 
-  const activeApiSpec = await services.apiSpec.getByParentId(workspaceId);
   const clientCertificates = await services.clientCertificate.findByParentId(workspaceId);
   const activeMockServer = await services.mockServer.getByParentId(workspaceId);
 
@@ -281,11 +279,15 @@ export async function clientLoader({ params, request }: Route.ClientLoaderArgs)
   let vcsVersion = null;
   if (isLoggedInIsCloudProjectAndIsNotGitRepo) {
     try {
-      await window.main.sync.switchAndCreateBackendProjectIfNotExist(workspaceId, activeWorkspace.name);
+      await window.main.sync.switchAndCreateBackendProjectIfNotExist(workspaceId, workspaceId, activeWorkspace.name);
       if (activeWorkspaceMeta.pushSnapshotOnInitialize) {
-        await pushSnapshotOnInitialize({ vcs: window.main.sync, workspace: activeWorkspace, project: activeProject });
+        await pushSnapshotOnInitialize({
+          vcs: syncVCSLikeForWorkspace(workspaceId),
+          workspace: activeWorkspace,
+          project: activeProject,
+        });
       }
-      vcsVersion = await window.main.sync.getVersion();
+      vcsVersion = await window.main.sync.getVersion(workspaceId);
     } catch (err) {
       console.warn('Failed to initialize VCS', err);
     }
@@ -323,7 +325,6 @@ export async function clientLoader({ params, request }: Route.ClientLoaderArgs)
     baseEnvironment,
     globalSubEnvironments,
     globalBaseEnvironments: globalBaseEnvironmentsWithWorkspaceName,
-    activeApiSpec,
     activeMockServer,
     clientCertificates,
     caCertificate: await services.caCertificate.getByParentId(workspaceId),
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.delete.tsx
index f796cb9471..d0f3ddcf7d 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.delete.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.delete.tsx
@@ -15,11 +15,11 @@ async function deleteCloudSyncWorkspace(workspace: Workspace, project: Project,
 
   if (models.project.isRemoteProject(project) && !isGitSync) {
     try {
-      await window.main.sync.switchAndCreateBackendProjectIfNotExist(workspace._id, workspace.name);
+      await window.main.sync.switchAndCreateBackendProjectIfNotExist(workspace._id, workspace._id, workspace.name);
       // For cloud sync workspaces, delete only local file or also delete remote copy
       await (localOnly
         ? window.main.sync.removeBackendProjectsForRoot(workspace._id)
-        : window.main.sync.archiveProject());
+        : window.main.sync.archiveProject(workspace._id));
       // Emit cloud sync file change event when cloud sync workspace is deleted to refresh the remote projects list cache
       uiEventBus.emit(CLOUD_SYNC_FILE_CHANGE);
     } catch (err) {
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.new.tsx
index 91bb097790..ae2bdc3bd9 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.new.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.new.tsx
@@ -94,11 +94,12 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
 
     const flushId = await database.bufferChanges();
 
-    const workspaceName = name || (scope === 'collection' ? 'My Collection' : 'my-spec.yaml');
+    const workspaceName = name || (scope === 'collection' ? 'My API Collection' : 'my-spec.yaml');
 
     const workspace = await services.workspace.create({
       name: workspaceName,
-      scope,
+      // There will be no design scope workspaces in the future, so we are mapping design to collection with apiSpec for now
+      scope: scope === 'design' ? 'collection' : scope,
       parentId: projectId,
     });
 
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.update.tsx
index 5882c4c756..94f8ce41ec 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.update.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.update.tsx
@@ -58,7 +58,7 @@ export async function clientAction({ request }: Route.ClientActionArgs) {
     });
   }
 
-  patch.name = patch.name || workspace.name || (workspace.scope === 'collection' ? 'My Collection' : 'my-spec.yaml');
+  patch.name = patch.name || workspace.name || (workspace.scope === 'collection' ? 'My API Collection' : 'my-spec.yaml');
 
   await services.workspace.update(workspace, patch);
 
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx
index 3116b18320..24c9ca8417 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx
@@ -1,25 +1,14 @@
-import type { GitRepository, Project } from 'insomnia-data';
 import { models, services } from 'insomnia-data';
-import { useState } from 'react';
-import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels';
 import type { LoaderFunctionArgs } from 'react-router';
 import { href, redirect, useParams } from 'react-router';
 
-import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants';
 import { getProjectsWithGitRepositories } from '~/common/project';
 import { invariant } from '~/common/utils/invariant';
 import { logout } from '~/ui/account/session';
 import { ErrorBoundary } from '~/ui/components/error-boundary';
-import { ProjectModal } from '~/ui/components/modals/project-modal';
 import { NoProjectView } from '~/ui/components/panes/no-project-view';
-import { EmptyProjectNavigationSidebar } from '~/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar';
 import { useOrganizationStorageRule } from '~/ui/hooks/use-organization-storage-rule';
 
-export interface ProjectIndexLoaderData {
-  projectsCount: number;
-  projects: (Project & { gitRepository?: GitRepository })[];
-}
-
 const shouldAutoCreateInitialProject = async ({ accountId }: { accountId: string | null | undefined }) => {
   if (!accountId) {
     return false;
@@ -79,13 +68,17 @@ export async function clientLoader({ params }: LoaderFunctionArgs) {
     }
   }
 
-  return {
-    projects,
-    projectsCount: organizationProjects.length,
-  };
+  // Reaching here means the organization has no projects and none was auto-created, so there is
+  // nothing to hand the component — it renders the same empty view either way.
+  return null;
 }
 
-// Default page when there are no projects in the organization.
+/**
+ * Default pane when no project is selected — typically an organization with no projects at all.
+ * The sidebar and surrounding panels come from the parent
+ * `organization.$organizationId.project` layout, which stays mounted when the first project
+ * appears and this route hands over to `project.$projectId`.
+ */
 const Component = () => {
   const { organizationId } = useParams() as {
     organizationId: string;
@@ -93,42 +86,9 @@ const Component = () => {
 
   const storageRules = useOrganizationStorageRule(organizationId);
 
-  const [isNewProjectModalOpen, setIsNewProjectModalOpen] = useState(false);
-
   return (
     <ErrorBoundary>
-      <>
-        <PanelGroup
-          autoSaveId="insomnia-sidebar"
-          id="wrapper"
-          className="new-sidebar h-full w-full text-(--color-font)"
-          direction="horizontal"
-        >
-          <Panel
-            id="sidebar"
-            className="sidebar theme--sidebar"
-            defaultSize={DEFAULT_SIDEBAR_SIZE}
-            maxSize={40}
-            minSize={10}
-            collapsible
-          >
-            <div className="flex flex-1 flex-col divide-y divide-solid divide-(--hl-md) overflow-hidden">
-              <EmptyProjectNavigationSidebar onCreateProject={() => setIsNewProjectModalOpen(true)} />
-            </div>
-          </Panel>
-          <PanelResizeHandle className="h-full w-px bg-(--hl-md)" />
-          <Panel id="pane-one" className="pane-one theme--pane flex flex-col">
-            <NoProjectView storageRules={storageRules} />
-          </Panel>
-        </PanelGroup>
-        {isNewProjectModalOpen && (
-          <ProjectModal
-            isOpen={isNewProjectModalOpen}
-            onOpenChange={setIsNewProjectModalOpen}
-            storageRules={storageRules}
-          />
-        )}
-      </>
+      <NoProjectView storageRules={storageRules} />
     </ErrorBoundary>
   );
 };
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx
index 92e0942dce..5610971e02 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx
@@ -34,6 +34,10 @@ export interface CreateProjectData {
 }
 
 export const reportGitProjectCount = async (organizationId: string, sessionId: string, maxRetries = 3) => {
+  // Local-only organizations are not known to the backend, so there is nothing to report.
+  if (models.organization.isLocalOrganizationId(organizationId)) {
+    return;
+  }
   const projects = await services.project.listByOrganizationIds(organizationId);
   const gitRepositoryIds = projects.map(p => p.gitRepositoryId).filter(isNotNullOrUndefined);
   const gitProjectsCount = gitRepositoryIds.length;
@@ -59,6 +63,10 @@ const createProjectImpl = async (organizationId: string, newProjectData: CreateP
   const user = await services.userSession.get();
   const sessionId = user.id;
   invariant(sessionId, 'User must be logged in to create a project');
+  invariant(
+    newProjectData.storageType === 'local' || !models.organization.isLocalOrganizationId(organizationId),
+    'Only local projects can be created in this organization',
+  );
 
   if (newProjectData.storageType === 'local') {
     const project = await services.project.create({
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.tsx
new file mode 100644
index 0000000000..c07c924ae2
--- /dev/null
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.tsx
@@ -0,0 +1,149 @@
+import { getLearningFeature } from 'insomnia-api';
+import { models } from 'insomnia-data';
+import { useEffect, useRef, useState } from 'react';
+import { Button, Heading } from 'react-aria-components';
+import { type ImperativePanelHandle, Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels';
+import { Outlet, useParams, useSearchParams } from 'react-router';
+import * as reactUse from 'react-use';
+
+import { Icon } from '~/basic-components/icon';
+import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants';
+import { ProjectModal } from '~/ui/components/modals/project-modal';
+import { ScratchPadTutorialPanel } from '~/ui/components/panes/scratchpad-tutorial-pane';
+import {
+  ProjectNavigationSidebar,
+  type ProjectNavigationSidebarHandle,
+} from '~/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar';
+import { SyncBar } from '~/ui/components/sidebar/sync-bar';
+import { useSidebarContext } from '~/ui/context/app/insomnia-sidebar-context';
+import { useOrganizationStorageRule } from '~/ui/hooks/use-organization-storage-rule';
+import { useServerQuery } from '~/ui/hooks/use-query';
+import { useRemoteBackendProjectsInvalidation } from '~/ui/hooks/use-remote-files';
+
+/**
+ * Shared layout for everything under `/organization/:organizationId/project` — both the index
+ * (no project selected, which is what an organization with zero projects lands on) and a
+ * selected project.
+ *
+ * The two child routes used to render a copy of this shell each, so gaining or losing the last
+ * project swapped one route module for the other and remounted the whole sidebar. Anything the
+ * sidebar owned was silently dropped mid-flight — most visibly an in-progress Konnect sync's
+ * AbortController, which left the sync running with nothing able to cancel it. Owning the shell
+ * here means only the `<Outlet />` content changes across that boundary.
+ *
+ * Deliberately has no loader: everything it needs comes from the URL, so it never re-runs (and
+ * never suspends the sidebar) when a child revalidates.
+ */
+const Component = () => {
+  const { organizationId, projectId } = useParams() as {
+    organizationId: string;
+    projectId?: string;
+  };
+
+  const [searchParams] = useSearchParams();
+
+  const [isLearningFeatureDismissed, setIsLearningFeatureDismissed] = reactUse.useLocalStorage(
+    'learning-feature-dismissed',
+    '',
+  );
+  const storageRules = useOrganizationStorageRule(organizationId);
+  const { data: learningFeature } = useServerQuery({
+    queryKey: ['learning-feature'],
+    queryFn: getLearningFeature,
+    enabled: !isLearningFeatureDismissed,
+    staleTime: 1000 * 60 * 60 * 24, // 1 day
+    refetchOnWindowFocus: true,
+  });
+  const sidebarPanelRef = useRef<ImperativePanelHandle>(null);
+  const { isSidebarCollapsed } = useSidebarContext();
+
+  const [isNewProjectModalOpen, setIsNewProjectModalOpen] = useState(false);
+
+  useEffect(() => {
+    if (isSidebarCollapsed) {
+      sidebarPanelRef.current?.collapse();
+    } else {
+      sidebarPanelRef.current?.expand();
+    }
+  }, [isSidebarCollapsed]);
+
+  // Only the id is needed here, so this stays correct without waiting on the project loader.
+  const isScratchPad = projectId ? models.project.isScratchpadProject({ _id: projectId }) : false;
+
+  const navigationSidebarRef = useRef<ProjectNavigationSidebarHandle>(null);
+
+  useEffect(() => {
+    const isExpanded = searchParams.get('isExpanded') === 'true';
+    if (navigationSidebarRef.current && isExpanded && projectId) {
+      navigationSidebarRef.current.expandProject(projectId);
+    }
+  }, [searchParams, projectId]);
+
+  useRemoteBackendProjectsInvalidation(organizationId);
+
+  return (
+    <>
+      <PanelGroup
+        autoSaveId="insomnia-global-sidebar"
+        id="wrapper"
+        className="new-sidebar h-full w-full text-(--color-font)"
+        direction="horizontal"
+      >
+        <Panel
+          ref={sidebarPanelRef}
+          id="insomnia-global-navigation-sidebar"
+          className="sidebar theme--sidebar"
+          defaultSize={DEFAULT_SIDEBAR_SIZE}
+          maxSize={40}
+          minSize={10}
+          collapsible
+        >
+          <div className="flex flex-1 flex-col divide-y divide-solid divide-(--hl-md) overflow-hidden">
+            <ProjectNavigationSidebar
+              storageRules={storageRules}
+              onCreateProject={() => setIsNewProjectModalOpen(true)}
+              ref={navigationSidebarRef}
+            />
+            {isScratchPad && <ScratchPadTutorialPanel />}
+            {!isLearningFeatureDismissed && learningFeature?.active && (
+              <div className="flex shrink-0 flex-col gap-2 p-(--padding-sm)">
+                <div className="flex items-center justify-between gap-2">
+                  <Heading className="text-base">
+                    <Icon icon="graduation-cap" />
+                    <span className="ml-2">{learningFeature.title}</span>
+                  </Heading>
+                  <Button
+                    onPress={() => {
+                      setIsLearningFeatureDismissed('true');
+                    }}
+                  >
+                    <Icon icon="close" />
+                  </Button>
+                </div>
+                <p className="text-sm text-(--hl)">{learningFeature.message}</p>
+                <a href={learningFeature.url} className="flex items-center gap-2 text-sm underline">
+                  {learningFeature.cta}
+                  <Icon icon="arrow-up-right-from-square" />
+                </a>
+              </div>
+            )}
+            <SyncBar />
+          </div>
+        </Panel>
+        <PanelResizeHandle className="relative z-10 h-full w-px bg-(--hl-md)" />
+        <Panel id="pane-one" className="pane-one theme--pane flex flex-col">
+          <Outlet />
+        </Panel>
+      </PanelGroup>
+      {isNewProjectModalOpen && (
+        <ProjectModal
+          isOpen={isNewProjectModalOpen}
+          onOpenChange={setIsNewProjectModalOpen}
+          storageRules={storageRules}
+        />
+      )}
+    </>
+  );
+};
+
+export default Component;
diff --git a/packages/insomnia/src/routes/organization._index.tsx b/packages/insomnia/src/routes/organization._index.tsx
index 5ea17f5ce1..312af5afd2 100644
--- a/packages/insomnia/src/routes/organization._index.tsx
+++ b/packages/insomnia/src/routes/organization._index.tsx
@@ -4,8 +4,13 @@ import { href, redirect } from 'react-router';
 
 import { syncOrganizations } from '~/common/organization';
 import { invariant } from '~/common/utils/invariant';
+import { migrateKonnectProjectsIfUnambiguous } from '~/konnect/migrate-konnect-organization';
 import * as session from '~/ui/account/session';
-import { findMigrationTargetSpaceId, migrateProjectsUnderOrganization } from '~/ui/organization-utils';
+import {
+  findMigrationTargetSpaceId,
+  migrateProjectsUnderOrganization,
+  refreshKonnectAccess,
+} from '~/ui/organization-utils';
 
 import type { Route } from './+types/organization._index';
 
@@ -13,6 +18,13 @@ export async function clientLoader(_args: Route.ClientLoaderArgs) {
   const { id: sessionId, accountId } = await services.userSession.get();
   if (sessionId) {
     await syncOrganizations(sessionId, accountId);
+    // Signing in does not reload the renderer, so the startup resolution in `entry.client.tsx` ran
+    // against the previous (logged-out) session — it had no account to migrate Konnect projects or
+    // resolve entitlements for. Run the unambiguous Konnect migration here instead, now that
+    // `${accountId}:spaces` is freshly synced above; a genuine conflict is still left for the modal
+    // in `organization.tsx` to surface after hydration.
+    await migrateKonnectProjectsIfUnambiguous(accountId);
+    await refreshKonnectAccess(sessionId, accountId);
 
     const organizations = JSON.parse(localStorage.getItem(`${accountId}:spaces`) || '[]') as Organization[];
     invariant(organizations.length, 'Failed to fetch organizations. Check your network connection and try again.');
diff --git a/packages/insomnia/src/routes/organization.sync-organizations-and-projects.tsx b/packages/insomnia/src/routes/organization.sync-organizations-and-projects.tsx
index 9aed14d40c..19ed7cf8cd 100644
--- a/packages/insomnia/src/routes/organization.sync-organizations-and-projects.tsx
+++ b/packages/insomnia/src/routes/organization.sync-organizations-and-projects.tsx
@@ -2,7 +2,6 @@ import type { Organization } from 'insomnia-api';
 import { services } from 'insomnia-data';
 import { href, redirect } from 'react-router';
 
-import { syncOrganizations } from '~/common/organization';
 import { syncProjects } from '~/common/project';
 import { invariant } from '~/common/utils/invariant';
 import { findMigrationTargetSpaceId, migrateProjectsUnderOrganization } from '~/ui/organization-utils';
@@ -27,12 +26,6 @@ export async function clientAction({ request }: Route.ClientActionArgs) {
     const { id: sessionId, accountId } = await services.userSession.get();
 
     const taskPromiseList = [];
-    if (asyncTaskList.includes(AsyncTask.SyncOrganization)) {
-      invariant(sessionId, 'sessionId is required');
-      invariant(accountId, 'accountId is required');
-      taskPromiseList.push(syncOrganizations(sessionId, accountId));
-    }
-
     if (asyncTaskList.includes(AsyncTask.MigrateProjects)) {
       const organizations = JSON.parse(localStorage.getItem(`${accountId}:spaces`) || '[]') as Organization[];
       invariant(organizations.length, 'Failed to fetch organizations.');
diff --git a/packages/insomnia/src/routes/organization.sync.tsx b/packages/insomnia/src/routes/organization.sync.tsx
deleted file mode 100644
index 4700a51a81..0000000000
--- a/packages/insomnia/src/routes/organization.sync.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { services } from 'insomnia-data';
-
-import { syncOrganizations } from '~/common/organization';
-import { createFetcherSubmitHook } from '~/ui/utils/router';
-
-import type { Route } from './+types/organization.sync';
-
-export async function clientAction(_args: Route.ClientActionArgs) {
-  const { id: sessionId, accountId } = await services.userSession.get();
-
-  if (sessionId) {
-    await syncOrganizations(sessionId, accountId);
-  }
-
-  return null;
-}
-
-export const useOrganizationSyncActionFetcher = createFetcherSubmitHook(
-  submit => () => {
-    return submit(
-      {},
-      {
-        method: 'POST',
-        action: '/organization/sync',
-      },
-    );
-  },
-  clientAction,
-);
diff --git a/packages/insomnia/src/routes/organization.tsx b/packages/insomnia/src/routes/organization.tsx
index 822ce9d579..e525e0f183 100644
--- a/packages/insomnia/src/routes/organization.tsx
+++ b/packages/insomnia/src/routes/organization.tsx
@@ -1,11 +1,13 @@
-import { type Billing, type CurrentPlan, type FeatureList, type Organization, type User } from 'insomnia-api';
+import { type CurrentPlan, type User } from 'insomnia-api';
 import type { Settings } from 'insomnia-data';
-import { models, services } from 'insomnia-data';
+import { models } from 'insomnia-data';
 import React, { useCallback, useEffect, useState } from 'react';
 import { Button, Link, ToggleButton, Tooltip, TooltipTrigger } from 'react-aria-components';
-import { href, NavLink, Outlet, useLocation, useNavigate, useParams, useRouteLoaderData } from 'react-router';
+import { href, NavLink, Outlet, useLocation, useNavigate, useParams } from 'react-router';
 import * as reactUse from 'react-use';
 
+import type { KonnectMigrationGroup } from '~/konnect/migrate-konnect-organization';
+import { detectKonnectOrgMigration } from '~/konnect/migrate-konnect-organization';
 import { useRootLoaderData } from '~/root';
 import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
 import { useSyncOrganizationsAndProjectsActionFetcher } from '~/routes/organization.sync-organizations-and-projects';
@@ -22,53 +24,21 @@ import { Icon } from '~/ui/components/icon';
 import { InsomniaLogo } from '~/ui/components/insomnia-icon';
 import { useDocBodyKeyboardShortcuts } from '~/ui/components/keydown-binder';
 import { showModal } from '~/ui/components/modals';
+import { KonnectOrgMigrationModal } from '~/ui/components/modals/konnect-org-migration-modal';
 import { SettingsModal, showSettingsModal } from '~/ui/components/modals/settings-modal';
 import { PresentUsers } from '~/ui/components/present-users';
+import { KonnectMovedOnboarding } from '~/ui/components/project/konnect-moved-onboarding';
 import { OrganizationSelect } from '~/ui/components/project/organization-select';
 import { AppDataCacheProvider } from '~/ui/context/app/insomnia-app-data-context';
 import { InsomniaEventStreamProvider } from '~/ui/context/app/insomnia-event-stream-context';
 import { SidebarContext } from '~/ui/context/app/insomnia-sidebar-context';
 import { InsomniaTabProvider } from '~/ui/context/app/insomnia-tab-context';
 import { RunnerProvider } from '~/ui/context/app/runner-context';
+import { useCurrentPlan, useCurrentUser, useOrganizations } from '~/ui/hooks/use-account-server-data';
 import { useCloseConnection } from '~/ui/hooks/use-close-connection';
+import { refreshKonnectAccess } from '~/ui/organization-utils';
 import type { AsyncTask } from '~/ui/utils/router';
 
-import type { Route } from './+types/organization';
-
-export interface OrganizationLoaderData {
-  organizations: Organization[];
-  user?: User;
-  currentPlan?: CurrentPlan;
-}
-
-export async function clientLoader(_args: Route.ClientLoaderArgs) {
-  const { id, accountId } = await services.userSession.get();
-  if (id) {
-    const organizations = JSON.parse(localStorage.getItem(`${accountId}:spaces`) || '[]') as Organization[];
-    const user = JSON.parse(localStorage.getItem(`${accountId}:user`) || '{}') as User;
-    const currentPlan = JSON.parse(localStorage.getItem(`${accountId}:currentPlan`) || '{}') as CurrentPlan;
-    return {
-      organizations,
-      user,
-      currentPlan,
-    };
-  }
-  return {
-    organizations: [],
-    user: undefined,
-    currentPlan: undefined,
-  };
-}
-
-export interface OrganizationFeatureLoaderData {
-  featuresPromise: Promise<FeatureList>;
-  billingPromise: Promise<Billing>;
-}
-
-export const useOrganizationLoaderData = () => {
-  return useRouteLoaderData<typeof clientLoader>('routes/organization');
-};
-
 interface IndicatorProps {
   asyncTaskStatus: 'error' | 'idle' | 'loading' | 'submitting';
   settings: Settings;
@@ -177,26 +147,39 @@ const LoginUserActions = ({
   user: User;
   currentPlan?: CurrentPlan;
 }) => {
+  // Collaboration is meaningless in an organization that only exists on this machine.
+  const isLocalOrganization = models.organization.isLocalOrganizationId(organizationId);
   return (
     <>
-      <PresentUsers />
-      <HeaderInviteButton
-        organizationId={organizationId}
-        className={
-          !isMinimal
-            ? 'border border-solid border-(--hl-md) bg-(--color-surprise) font-semibold text-(--color-font-surprise)'
-            : 'text-(--color-font)'
-        }
-      />
+      {!isLocalOrganization && (
+        <>
+          <PresentUsers />
+          <HeaderInviteButton
+            organizationId={organizationId}
+            className={
+              !isMinimal
+                ? 'border border-solid border-(--hl-md) bg-(--color-surprise) font-semibold text-(--color-font-surprise)'
+                : 'text-(--color-font)'
+            }
+          />
+        </>
+      )}
       <HeaderPlanIndicator isMinimal={isMinimal} />
       <HeaderUserButton user={user} currentPlan={currentPlan} isMinimal={isMinimal} />
     </>
   );
 };
 
-const Component = ({ loaderData }: Route.ComponentProps) => {
-  const { organizations, user, currentPlan } = loaderData;
-  const { settings } = useRootLoaderData()!;
+const Component = () => {
+  const organizations = useOrganizations();
+  const user = useCurrentUser();
+  const currentPlan = useCurrentPlan();
+  const { settings, userSession } = useRootLoaderData()!;
+  const [konnectMigrationGroups, setKonnectMigrationGroups] = useState<KonnectMigrationGroup[]>([]);
+  // `konnectMigrationGroups` starts empty before `detectKonnectOrgMigration` below has resolved too,
+  // so its length alone can't distinguish "not checked yet" from "checked, no conflict" — needed to
+  // keep the moved-notice popover (below) from racing the migration modal it must wait for.
+  const [hasCheckedMigrationConflict, setHasCheckedMigrationConflict] = useState(false);
 
   const workspaceData = useWorkspaceLoaderData();
 
@@ -249,10 +232,44 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
     return () => window.main.setCurrentOrganizationId(undefined);
   }, [organizationId]);
 
+  useEffect(() => {
+    const accountId = userSession.accountId;
+    if (!accountId) {
+      return;
+    }
+    // The unambiguous case already migrated during startup; only a genuine conflict reaches the UI.
+    detectKonnectOrgMigration({ accountId }).then(plan => {
+      setKonnectMigrationGroups(plan.status === 'conflict' ? plan.groups : []);
+      setHasCheckedMigrationConflict(true);
+    });
+  }, [userSession.accountId]);
+
   const untrackedProjects = untrackedProjectsFetcher.data?.untrackedProjects || [];
   const untrackedWorkspaces = untrackedProjectsFetcher.data?.untrackedWorkspaces || [];
   const hasUntrackedData = untrackedProjects.length > 0 || untrackedWorkspaces.length > 0;
   const isScratchPad = organizationId === models.organization.SCRATCHPAD_ORGANIZATION_ID;
+  const isLocalOrganization = models.organization.isLocalOrganizationId(organizationId);
+  const isKonnectOrganization = models.organization.isKonnectOrganizationId(organizationId);
+
+  // One-time nudge pointing users who already sync Konnect to the organization dropdown, where
+  // their control planes now live under "Control Planes" instead of the removed sidebar tab.
+  // Must wait for the migration-conflict check so it never races or overlaps the migration modal
+  // (z-50 vs. the modal's z-10 backdrop — it would render on top of an unresolved choice otherwise).
+  const [orgSelectNode, setOrgSelectNode] = useState<HTMLDivElement | null>(null);
+  const [hasSeenKonnectMovedNotice, setHasSeenKonnectMovedNotice] = reactUse.useLocalStorage(
+    'hasSeenKonnectMovedNotice',
+    false,
+  );
+  const showKonnectMovedNotice =
+    !isScratchPad &&
+    !isKonnectOrganization &&
+    settings.hasKonnectPat &&
+    !hasSeenKonnectMovedNotice &&
+    hasCheckedMigrationConflict &&
+    konnectMigrationGroups.length === 0;
+  const dismissKonnectMovedNotice = useCallback(() => {
+    setHasSeenKonnectMovedNotice(true);
+  }, [setHasSeenKonnectMovedNotice]);
 
   useCloseConnection({
     organizationId,
@@ -292,16 +309,18 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
                       <InsomniaLogo />
                     </div>
                     {!isScratchPad && (
-                      <OrganizationSelect
-                        organizationId={organizationId}
-                        organizations={organizations || []}
-                        onSelect={id => {
-                          window.main.trackAnalyticsEvent({ event: AnalyticsEvent.organizationSwitched });
-                          navigate(`/organization/${id}`);
-                        }}
-                        currentPlan={currentPlan}
-                        isScratchpadWorkspace={!!isScratchpadWorkspace}
-                      />
+                      <div ref={setOrgSelectNode}>
+                        <OrganizationSelect
+                          organizationId={organizationId}
+                          organizations={organizations || []}
+                          onSelect={id => {
+                            window.main.trackAnalyticsEvent({ event: AnalyticsEvent.organizationSwitched });
+                            navigate(`/organization/${id}`);
+                          }}
+                          currentPlan={currentPlan}
+                          isScratchpadWorkspace={!!isScratchpadWorkspace}
+                        />
+                      </div>
                     )}
 
                     {!user ? <GitHubStarsButton /> : null}
@@ -395,7 +414,7 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
                           <Hotkey keyBindings={settings.hotKeyRegistry.preferences_showGeneral} />
                         </Tooltip>
                       </TooltipTrigger>
-                      {!isScratchpadWorkspace && hasUntrackedData && (
+                      {!isScratchpadWorkspace && !isLocalOrganization && hasUntrackedData && (
                         <TooltipTrigger delay={500}>
                           <Button
                             className="flex h-full items-center justify-center gap-2 px-4 py-1 text-xs text-(--color-warning) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
@@ -441,6 +460,20 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
                 </div>
               </div>
             </div>
+            {showKonnectMovedNotice && orgSelectNode && (
+              <KonnectMovedOnboarding triggerElement={orgSelectNode} onDismiss={dismissKonnectMovedNotice} />
+            )}
+            {konnectMigrationGroups.length > 0 && userSession.accountId && (
+              <KonnectOrgMigrationModal
+                accountId={userSession.accountId}
+                groups={konnectMigrationGroups}
+                onDone={() => {
+                  setKonnectMigrationGroups([]);
+                  // The migration can make the organization visible for the first time.
+                  refreshKonnectAccess(userSession.id, userSession.accountId, { force: true });
+                }}
+              />
+            )}
           </SidebarContext.Provider>
         </InsomniaTabProvider>
       </AppDataCacheProvider>
diff --git a/packages/insomnia/src/routes/remote-files.tsx b/packages/insomnia/src/routes/remote-files.tsx
index 2b2acda035..c593bc7796 100644
--- a/packages/insomnia/src/routes/remote-files.tsx
+++ b/packages/insomnia/src/routes/remote-files.tsx
@@ -49,7 +49,9 @@ export async function clientLoader(_args: Route.ClientLoaderArgs) {
     const files = remoteFiles.map(file => {
       const parentProject = projects.find(project => project.remoteId === file.teamProjectId);
       return {
-        id: file.id,
+        // Use a composite ID to ensure uniqueness. Otherwise, some dirty remote files might collide with each other or with local db.
+        id: `${file.teamProjectId}:${file.id}`,
+        workspaceId: file.id,
         url: href('/organization/:organizationId', {
           organizationId: file.organizationId,
         }),
diff --git a/packages/insomnia/src/routes/untracked-projects.tsx b/packages/insomnia/src/routes/untracked-projects.tsx
index 837dedb24d..cf60d5b471 100644
--- a/packages/insomnia/src/routes/untracked-projects.tsx
+++ b/packages/insomnia/src/routes/untracked-projects.tsx
@@ -14,7 +14,11 @@ export interface UntrackedProjectsLoaderData {
 export async function clientLoader(_args: Route.ClientLoaderArgs) {
   const { accountId } = await services.userSession.get();
   const organizations = JSON.parse(localStorage.getItem(`${accountId}:spaces`) || '[]') as Organization[];
-  const listOfOrganizationIds = [...organizations.map(o => o.id), models.organization.SCRATCHPAD_ORGANIZATION_ID];
+  const listOfOrganizationIds = [
+    ...organizations.map(o => o.id),
+    models.organization.SCRATCHPAD_ORGANIZATION_ID,
+    models.organization.getKonnectOrganizationId(accountId),
+  ];
 
   const projects = await services.project.list({
     parentId: { $nin: listOfOrganizationIds },
diff --git a/packages/insomnia/src/scripting/run-script-quickjs.ts b/packages/insomnia/src/scripting/run-script-quickjs.ts
index 9c19335065..dcd143108f 100644
--- a/packages/insomnia/src/scripting/run-script-quickjs.ts
+++ b/packages/insomnia/src/scripting/run-script-quickjs.ts
@@ -9,6 +9,14 @@ import type { WorkerResponse } from './quickjs-script.worker';
  * `settings.useQuickJsScriptSandbox` and shouldn't pay for a QuickJS-WASM load they never trigger.
  */
 
+/**
+ * Single kill-switch for the QuickJS sandbox proof of concept. Both the settings UI
+ * (whether the toggle is shown) and the network layer (whether it's actually used) gate on
+ * this constant, so pausing or re-enabling the feature only requires flipping it here.
+ * TODO(INS-3890): flip back to true once QuickJS sandbox support is ready to ship again.
+ */
+export const QUICKJS_SANDBOX_ENABLED = false;
+
 let worker: Worker | null = null;
 interface PendingRun {
   resolve: (value: RequestContext) => void;
diff --git a/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts b/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts
index 43fc9c63e0..58e54ea645 100644
--- a/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts
+++ b/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts
@@ -359,6 +359,116 @@ invalid: [unclosed array
 
       await expect(neDbClient.writeFile(filePath, malformedYaml)).rejects.toThrow();
     });
+
+    it('should not write a Settings document, since Settings.canSync is false', async () => {
+      // Only types where models.canSync() is true may be written from a Git
+      // checkout, so a folder named after a non-syncable type (e.g. Settings)
+      // is ignored even though its path and id/type fields are well-formed.
+      expect(models.settings.canSync).toBe(false);
+
+      const neDbClient = new NeDBClient('wrk_test', 'proj_test');
+      const updateSpy = vi.spyOn(db, 'update');
+
+      const settingsData = {
+        _id: 'set_new',
+        type: models.settings.type,
+        validateSSL: false,
+        proxyEnabled: true,
+        httpProxy: 'http://example.com:8080',
+        httpsProxy: 'http://example.com:8080',
+      };
+
+      const filePath = path.join(GIT_INSOMNIA_DIR, models.settings.type, 'set_new.yml');
+
+      await neDbClient.writeFile(filePath, YAML.stringify(settingsData));
+
+      expect(updateSpy).not.toHaveBeenCalled();
+
+      updateSpy.mockRestore();
+    });
+  });
+
+  describe('canSync type restrictions (regression)', () => {
+    // This is the full set of model types where canSync is true today. If a
+    // new model flips canSync to true (or an existing one flips it), this
+    // list should be updated deliberately rather than silently drifting.
+    const syncableTypes = models
+      .all()
+      .filter(m => m.canSync)
+      .map(m => m.type)
+      .sort();
+
+    const nonSyncableTypes = models
+      .all()
+      .filter(m => !m.canSync)
+      .map(m => m.type)
+      .sort();
+
+    it('documents the exact set of types allowed to write via Git sync', () => {
+      expect(syncableTypes).toEqual(
+        [
+          'ApiSpec',
+          'Environment',
+          'GrpcRequest',
+          'MockRoute',
+          'MockServer',
+          'McpRequest',
+          'ProjectLintRuleset',
+          'ProtoDirectory',
+          'ProtoFile',
+          'Request',
+          'RequestGroup',
+          'SocketIOPayload',
+          'SocketIORequest',
+          'UnitTest',
+          'UnitTestSuite',
+          'WebSocketPayload',
+          'WebSocketRequest',
+          'Workspace',
+        ].sort(),
+      );
+    });
+
+    it.each(syncableTypes)('writes a %s document, since canSync is true', async type => {
+      const neDbClient = new NeDBClient('wrk_test', 'proj_test');
+      const updateSpy = vi.spyOn(db, 'update');
+
+      const doc = {
+        _id: `${type}_new`,
+        type,
+        name: `New ${type}`,
+        parentId: 'wrk_test',
+      };
+
+      const filePath = path.join(GIT_INSOMNIA_DIR, type, `${doc._id}.yml`);
+
+      await neDbClient.writeFile(filePath, YAML.stringify(doc));
+
+      expect(updateSpy).toHaveBeenCalledTimes(1);
+      expect(updateSpy).toHaveBeenCalledWith(expect.objectContaining({ _id: doc._id, type }));
+
+      updateSpy.mockRestore();
+    });
+
+    it.each(nonSyncableTypes)('ignores a %s document, since canSync is false', async type => {
+      const neDbClient = new NeDBClient('wrk_test', 'proj_test');
+      const updateSpy = vi.spyOn(db, 'update');
+
+      const doc = {
+        _id: `${type}_new`,
+        type,
+        name: `New ${type}`,
+        parentId: 'wrk_test',
+      };
+
+      const filePath = path.join(GIT_INSOMNIA_DIR, type, `${doc._id}.yml`);
+
+      await neDbClient.writeFile(filePath, YAML.stringify(doc));
+
+      expect(updateSpy).not.toHaveBeenCalled();
+
+      updateSpy.mockRestore();
+    });
   });
 
   describe('readdir()', () => {
diff --git a/packages/insomnia/src/sync/git/ne-db-client.ts b/packages/insomnia/src/sync/git/ne-db-client.ts
index ec2384feaa..60ad67694b 100644
--- a/packages/insomnia/src/sync/git/ne-db-client.ts
+++ b/packages/insomnia/src/sync/git/ne-db-client.ts
@@ -143,6 +143,14 @@ export class NeDBClient {
       throw new Error(`Doc type does not match file path [${doc.type} != ${type || 'null'}]`);
     }
 
+    // Only types explicitly marked as syncable may be written from a Git checkout.
+    // A folder named after a non-syncable/global-singleton type (e.g. Settings)
+    // is ignored, even though its path and id/type fields are well-formed.
+    if (!models.canSync(doc)) {
+      console.log(`[git] Ignoring non-syncable document type ${doc.type} at ${filePath}`);
+      return;
+    }
+
     // Special handling for workspaces: ensure they stay in the correct project
     if (models.workspace.isWorkspace(doc)) {
       console.log('[git] setting workspace parent to be that of the active project', {
diff --git a/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx b/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx
index 95697e48fa..a12e7d89ba 100644
--- a/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx
+++ b/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx
@@ -22,7 +22,11 @@ import vkBeautify from 'vkbeautify';
 import { DEBOUNCE_MILLIS } from '~/common/constants';
 import * as misc from '~/common/misc';
 import { type NunjucksParsedTag, type nunjucksTagContextMenuOptions } from '~/common/templating/types';
-import { extractNunjucksTagFromCoords } from '~/common/templating/utils';
+import {
+  containsExternalVaultTag,
+  extractNunjucksTagFromCoords,
+  replaceVaultTagIdIfNeeded,
+} from '~/common/templating/utils';
 import { useRootLoaderData } from '~/root';
 import { AnalyticsEvent, trackOnceDaily } from '~/ui/analytics';
 import { Icon } from '~/ui/components/icon';
@@ -392,7 +396,7 @@ export const CodeEditor = memo(
             // baseline so restore can tell an unchanged model (reuse the cached
             // value + history) from an externally-updated one (use fresh defaultValue).
             value: readOnly ? undefined : codeMirror.current.getValue(),
-            valueSeed: readOnly ? undefined : defaultValue ?? '',
+            valueSeed: readOnly ? undefined : (defaultValue ?? ''),
             selections: codeMirror.current.listSelections(),
             cursor: codeMirror.current.getCursor(),
             history: codeMirror.current.getHistory(),
@@ -489,10 +493,17 @@ export const CodeEditor = memo(
             doc.scrollTo(0, scrollPosition);
           }
 
-          if (onPaste && change.origin === 'paste' && change.update) {
-            const translatedText = onPaste(change.text.join('\n')).split('\n');
-
-            change.update(change.from, change.to, translatedText);
+          if (change.origin === 'paste' && change.update) {
+            let translatedText = change.text.join('\n');
+            if (onPaste) {
+              translatedText = onPaste(translatedText);
+            }
+            if (containsExternalVaultTag(translatedText)) {
+              translatedText = replaceVaultTagIdIfNeeded(translatedText);
+            }
+            if (translatedText !== change.text.join('\n')) {
+              change.update(change.from, change.to, translatedText.split('\n'));
+            }
           }
         });
 
@@ -659,6 +670,13 @@ export const CodeEditor = memo(
       useMount(() => {
         initEditor();
       });
+      useEffect(() => {
+        // If the wrapper's layout is still settling when initEditor's initial
+        // setValue runs (e.g. inside react-resizable-panels not yet stable),
+        // CodeMirror can leave the rendered line stuck. Force one once layout has painted.
+        const raf = requestAnimationFrame(() => codeMirror.current?.refresh());
+        return () => cancelAnimationFrame(raf);
+      }, []);
       useUnmount(() => {
         persistState();
         cleanUpEditor();
diff --git a/packages/insomnia/src/ui/components/.client/codemirror/extensions/autocomplete.ts b/packages/insomnia/src/ui/components/.client/codemirror/extensions/autocomplete.ts
index 8ef4842221..184167a9e8 100644
--- a/packages/insomnia/src/ui/components/.client/codemirror/extensions/autocomplete.ts
+++ b/packages/insomnia/src/ui/components/.client/codemirror/extensions/autocomplete.ts
@@ -3,7 +3,7 @@ import 'codemirror/addon/mode/overlay';
 import CodeMirror, { type EnvironmentAutocompleteOptions, type Hint, type ShowHintOptions } from 'codemirror';
 import { getPlatformKeyCombinations } from 'insomnia-data/common';
 
-import { escapeRegex, fnOrString, isNotNullOrUndefined } from '~/common/misc';
+import { fnOrString, isNotNullOrUndefined } from '~/common/misc';
 import type { NunjucksParsedTag } from '~/common/templating/types';
 import { getDefaultFill } from '~/common/templating/utils';
 
@@ -510,44 +510,64 @@ function getCompletionHints(
 }
 
 /**
- * Replace all occurrences of string
+ * Wraps every case-insensitive occurrence of `find` in `text` with a <strong> element.
  */
-function replaceWithSurround(text: string, find: string, prefix: string, suffix: string) {
-  const escapedString = escapeRegex(find);
-  const re = new RegExp(escapedString, 'gi');
-  return text.replace(re, matched => prefix + matched + suffix);
-}
+function markMatchedSegment(text: string, find: string): DocumentFragment {
+  const fragment = document.createDocumentFragment();
 
-function escapeHTML(unsafeText: string) {
-  const div = document.createElement('div');
-  div.innerText = unsafeText;
-  return div.innerHTML;
-}
-/**
- * Render the autocomplete list entry
- */
-function renderHintMatch(li: HTMLElement, _allHints: CodeMirror.Hints, hint: Hint) {
-  // Bold the matched text
-  const { displayText, segment, type, displayValue } = hint;
-  const escapedDisplayText = escapeHTML(displayText || '');
-  const escapedSegment = escapeHTML(segment);
-  const markedName = replaceWithSurround(escapedDisplayText, escapedSegment, '<strong>', '</strong>');
-  const { char, title } = ICONS[type];
-  let safeValue = '';
-
-  if (isNotNullOrUndefined<string>(displayValue)) {
-    const escaped = escapeHTML(displayValue);
-    safeValue = `
-      <div class="value" title=${escaped}>
-        ${escaped}
-      </div>
-    `;
+  if (!find) {
+    fragment.append(document.createTextNode(text));
+    return fragment;
   }
 
-  li.className += ` fancy-hint type--${type}`;
-  li.innerHTML = `
-    <label class="label" title="${title}">${char}</label>
-    <div class="name">${markedName}</div>
-    ${safeValue}
-  `;
+  const lowerText = text.toLowerCase();
+  const lowerFind = find.toLowerCase();
+  let lastIndex = 0;
+  let matchIndex = lowerText.indexOf(lowerFind, lastIndex);
+
+  while (matchIndex !== -1) {
+    fragment.append(document.createTextNode(text.slice(lastIndex, matchIndex)));
+    const strong = document.createElement('strong');
+    strong.textContent = text.slice(matchIndex, matchIndex + find.length);
+    fragment.append(strong);
+    lastIndex = matchIndex + find.length;
+    matchIndex = lowerText.indexOf(lowerFind, lastIndex);
+  }
+
+  fragment.append(document.createTextNode(text.slice(lastIndex)));
+  return fragment;
+}
+
+/**
+ * Renders the autocomplete list entry: icon label, matched name, and optional value row.
+ */
+function renderHintMatch(li: HTMLElement, _allHints: CodeMirror.Hints, hint: Hint) {
+  const { displayText, segment, type, displayValue } = hint;
+  const { char, title } = ICONS[type];
+
+  // Row-level class driving the CSS icon/color per hint type (constant/snippet/variable/tag)
+  li.className += ` fancy-hint type--${type}`;
+  li.replaceChildren();
+
+  // Left-hand icon glyph (e.g. 𝑥, ƒ) with its type name as a tooltip
+  const label = document.createElement('label');
+  label.className = 'label';
+  label.title = title;
+  label.textContent = char;
+  li.append(label);
+
+  // Hint name (variable/tag/snippet name), with the already-typed prefix ("segment") bolded
+  const name = document.createElement('div');
+  name.className = 'name';
+  name.append(markMatchedSegment(displayText || '', segment));
+  li.append(name);
+
+  // Right-hand preview of the hint's current value, shown for variables/constants with a resolvable value
+  if (isNotNullOrUndefined<string>(displayValue)) {
+    const value = document.createElement('div');
+    value.className = 'value';
+    value.title = displayValue;
+    value.textContent = displayValue;
+    li.append(value);
+  }
 }
diff --git a/packages/insomnia/src/ui/components/.client/codemirror/one-line-editor.tsx b/packages/insomnia/src/ui/components/.client/codemirror/one-line-editor.tsx
index f7aad16ccf..e8629a50e2 100644
--- a/packages/insomnia/src/ui/components/.client/codemirror/one-line-editor.tsx
+++ b/packages/insomnia/src/ui/components/.client/codemirror/one-line-editor.tsx
@@ -19,7 +19,11 @@ import * as reactUse from 'react-use';
 import { DEBOUNCE_MILLIS } from '~/common/constants';
 import * as misc from '~/common/misc';
 import { type NunjucksParsedTag, type nunjucksTagContextMenuOptions } from '~/common/templating/types';
-import { extractNunjucksTagFromCoords } from '~/common/templating/utils';
+import {
+  containsExternalVaultTag,
+  extractNunjucksTagFromCoords,
+  replaceVaultTagIdIfNeeded,
+} from '~/common/templating/utils';
 import { isCurlCommand } from '~/common/utils/curl';
 import { useRootLoaderData } from '~/root';
 import { showModal } from '~/ui/components/modals';
@@ -200,16 +204,23 @@ export const OneLineEditor = forwardRef<OneLineEditorHandle, OneLineEditorProps>
       };
       codeMirror.current = CodeMirror.fromTextArea(textAreaRef.current, initialOptions);
       codeMirror.current.on('beforeChange', (_: CodeMirror.Editor, change: CodeMirror.EditorChangeCancellable) => {
-        const isPaste = change.text && change.text.length > 1;
-        if (isPaste) {
+        const isMultiLineInsert = change.text && change.text.length > 1;
+        const isSingleLinePaste = change.origin === 'paste' && change.update && change.text.length === 1;
+        if (isMultiLineInsert || isSingleLinePaste) {
           const pastedText = change.text.join('\n');
           const hasContent = pastedText.trim();
+          // Cancel the change if it's a curl command or has no content
           if (isCurlCommand(pastedText) || !hasContent) {
             change.cancel();
             return;
           }
+          // Replace vault tags id if needed
+          let editorPasteText = change.text.join('').replace(/\n/g, ' ');
+          if (containsExternalVaultTag(editorPasteText)) {
+            editorPasteText = replaceVaultTagIdIfNeeded(editorPasteText);
+          }
           // If we're in single-line mode, merge all changed lines into one
-          change.update?.(change.from, change.to, [change.text.join('').replace(/\n/g, ' ')]);
+          change.update?.(change.from, change.to, [editorPasteText]);
         }
       });
       codeMirror.current.on('paste', (_, e: ClipboardEvent) => {
@@ -359,6 +370,14 @@ export const OneLineEditor = forwardRef<OneLineEditorHandle, OneLineEditorProps>
           if (!cm) {
             return;
           }
+          // codeMirror.current is nulled asynchronously — by the useUnmount cleanup
+          // effect on unmount, and by reinitialize()'s cleanUpEditor() — so React
+          // schedules asynchronously and does not guarantee runs before the next rAF tick — so a
+          // stale loop can still see a non-null cm whose wrapper was already removed from the DOM.
+          // Bail here rather than steal focus into a zombie editor that's mid-teardown.
+          if (!document.body.contains(cm.getWrapperElement())) {
+            return;
+          }
           if (!cm.hasFocus()) {
             const active = document.activeElement as HTMLElement | null;
             // The row React Aria bounces focus to is a non-interactive container (role="row"/"option");
@@ -477,13 +496,13 @@ export const OneLineEditor = forwardRef<OneLineEditorHandle, OneLineEditorProps>
 
     useEffect(() => {
       const flushOnBlur = (doc: CodeMirror.Editor) => {
-        if (onChange) {
+        if (onChange && !readOnly) {
           onChange(doc.getValue() || '');
         }
       };
       codeMirror.current?.on('blur', flushOnBlur);
       return () => codeMirror.current?.off('blur', flushOnBlur);
-    }, [editorVersion, onChange]);
+    }, [editorVersion, onChange, readOnly]);
 
     useEffect(() => {
       const unsubscribe = window.main.on(
diff --git a/packages/insomnia/src/ui/components/check-for-updates-button.tsx b/packages/insomnia/src/ui/components/check-for-updates-button.tsx
index 8af10d5f5b..94fb64bfd5 100644
--- a/packages/insomnia/src/ui/components/check-for-updates-button.tsx
+++ b/packages/insomnia/src/ui/components/check-for-updates-button.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useRef, useState } from 'react';
 
 import { allowUpdatesInDev, isDevelopment, type UpdateStatus } from '../../common/constants';
 import { Icon } from './icon';
+import { showToast } from './toast-notification';
 import { Tooltip } from './tooltip';
 
 const STATUS_LABELS: Record<UpdateStatus, string> = {
@@ -38,9 +39,13 @@ export const CheckForUpdatesButton = () => {
 
   const button = (
     <button
-      className={`btn btn--outlined btn--super-compact flex items-center gap-2${updatesDisabledInDev ? ' pointer-events-none' : ''}`}
-      disabled={isBusy || updatesDisabledInDev}
+      className="btn btn--outlined btn--super-compact flex items-center gap-2"
+      disabled={isBusy}
       onClick={() => {
+        if (updatesDisabledInDev) {
+          showToast({ title: 'Updates are disabled in development mode', status: 'info' });
+          return;
+        }
         if (isReadyToRestart) {
           window.main.applyUpdateAndRestart();
           return;
diff --git a/packages/insomnia/src/ui/components/collection-tab.tsx b/packages/insomnia/src/ui/components/collection-tab.tsx
new file mode 100644
index 0000000000..25a78520f8
--- /dev/null
+++ b/packages/insomnia/src/ui/components/collection-tab.tsx
@@ -0,0 +1,65 @@
+import { Tab, TabList, Tabs } from 'react-aria-components';
+import { useNavigate } from 'react-router';
+import { twMerge } from 'tailwind-merge';
+
+type DocumentTabId = 'spec' | 'test';
+
+interface Props {
+  organizationId: string;
+  projectId: string;
+  workspaceId: string;
+  activeItemId: DocumentTabId;
+  enableLegacyUnitTests: boolean;
+  hasLegacyUnitTests: boolean;
+  className?: string;
+}
+
+export const CollectionTab = ({
+  organizationId,
+  projectId,
+  workspaceId,
+  activeItemId,
+  enableLegacyUnitTests,
+  hasLegacyUnitTests,
+  className,
+}: Props) => {
+  const navigate = useNavigate();
+  const base = `/organization/${organizationId}/project/${projectId}/workspace/${workspaceId}`;
+
+  // The setting forces the tab to show. Otherwise, only show it if the collection already has legacy tests.
+  const showTestsTab = enableLegacyUnitTests || hasLegacyUnitTests;
+
+  const items: { id: DocumentTabId; name: string; to: string }[] = [
+    { id: 'spec', name: 'Spec', to: `${base}/debug` },
+    ...(showTestsTab ? [{ id: 'test' as const, name: 'Tests', to: `${base}/test` }] : []),
+  ];
+
+  return (
+    <Tabs
+      selectedKey={activeItemId}
+      onSelectionChange={key => {
+        const item = items.find(item => item.id === key);
+        item && navigate(item.to);
+      }}
+    >
+      <TabList
+        aria-label="API Collection Tabs"
+        className={twMerge(
+          'flex h-(--line-height-sm) w-full shrink-0 items-center border-b border-solid border-b-(--hl-md) bg-(--color-bg)',
+          className,
+        )}
+      >
+        {items.map(item => (
+          <Tab
+            key={item.id}
+            id={item.id}
+            className="flex h-full shrink-0 cursor-pointer items-center justify-between gap-2 px-3 py-1 text-(--hl) outline-hidden transition-colors duration-300 select-none hover:bg-(--hl-sm) hover:text-(--color-font) focus:bg-(--hl-sm) aria-selected:bg-(--hl-xs) aria-selected:text-(--color-font) aria-selected:hover:bg-(--hl-sm) aria-selected:focus:bg-(--hl-sm) data-focus-visible:ring-2 data-focus-visible:ring-(--hl-md) data-focus-visible:ring-inset"
+            data-testid={`api-collection-tab-${item.name.toLowerCase()}`}
+          >
+            {item.name}
+          </Tab>
+        ))}
+      </TabList>
+    </Tabs>
+  );
+};
diff --git a/packages/insomnia/src/ui/components/command-palette.tsx b/packages/insomnia/src/ui/components/command-palette.tsx
index e713e84765..f82c4c4869 100644
--- a/packages/insomnia/src/ui/components/command-palette.tsx
+++ b/packages/insomnia/src/ui/components/command-palette.tsx
@@ -368,7 +368,7 @@ const CommandPaletteCombobox = ({ close }: { close: () => void }) => {
   currentFiles.length > 0 &&
     comboboxSections.push({
       id: 'collections-and-documents',
-      name: 'Collections and documents',
+      name: 'API Collections',
       children: currentFiles.map(file => ({
         id: file.id,
         icon: (
diff --git a/packages/insomnia/src/ui/components/design-empty-state.tsx b/packages/insomnia/src/ui/components/design-empty-state.tsx
index ef894022b6..ecc8395a0b 100644
--- a/packages/insomnia/src/ui/components/design-empty-state.tsx
+++ b/packages/insomnia/src/ui/components/design-empty-state.tsx
@@ -2,19 +2,23 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core';
 import React, { type FC } from 'react';
 import { Button, Heading, Menu, MenuItem, MenuTrigger, Popover } from 'react-aria-components';
 
+import type { CreateRequestType } from '~/ui/hooks/use-request';
 import { selectFileOrFolder } from '~/ui/utils/select-file-or-folder';
 
 import { documentationLinks } from '../../common/documentation';
+import { createRequestOrFolderActionItems } from './dropdowns/actions/create-actions';
 import { blankSpec as emptySpec, petStoreSpec, todoSpec } from './example-openapi-specs';
 import { Icon } from './icon';
 import { showModal } from './modals';
 import { PromptModal } from './modals/prompt-modal';
 
 interface Props {
-  onImport: (contents: string) => void;
+  onImport: (contents: string, generateRequestCollection?: boolean) => void;
+  onCreateRequest: (requestType: CreateRequestType) => void;
+  onCreateFolder: () => void;
 }
 
-export const DesignEmptyState: FC<Props> = ({ onImport }) => {
+export const DesignEmptyState: FC<Props> = ({ onImport, onCreateRequest, onCreateFolder }) => {
   const exampleSpecs = [
     {
       id: 'petstore-spec',
@@ -60,7 +64,7 @@ export const DesignEmptyState: FC<Props> = ({ onImport }) => {
         }
 
         const contents = String(await window.main.insecureReadFile({ path: filePath }));
-        onImport(contents);
+        onImport(contents, true);
       },
     },
     {
@@ -79,7 +83,7 @@ export const DesignEmptyState: FC<Props> = ({ onImport }) => {
               return;
             }
             const contents = await response.text();
-            onImport(contents);
+            onImport(contents, true);
           },
         });
       },
@@ -91,25 +95,105 @@ export const DesignEmptyState: FC<Props> = ({ onImport }) => {
     action: () => void;
   }[];
 
+  const createActionsList = createRequestOrFolderActionItems({
+    createRequest: onCreateRequest,
+    createFolder: onCreateFolder,
+    folderFirst: false,
+  });
+
   return (
     <div className="pointer-events-none absolute top-0 left-0 flex h-full w-full items-center select-none">
       <div className="flex h-full w-full flex-1 flex-col items-center gap-2 divide-y divide-solid divide-(--hl-md) overflow-hidden overflow-y-auto p-(--padding-md) text-(--hl-lg)">
-        <Heading className="flex flex-1 flex-col items-center gap-2 p-(--padding-sm) font-bold">
+        <Heading className="flex flex-1 flex-col items-center gap-2 border-0 p-(--padding-sm) font-bold">
           <Icon icon="drafting-compass" className="w-20 flex-1" />
-          <span>Enter your OpenAPI specification here</span>
+          <span>Enter your OpenAPI specification here, or start creating requests</span>
         </Heading>
         <div className="flex w-full flex-1 flex-col items-center justify-between p-(--padding-sm) pt-10">
           <div className="flex items-center gap-2">
             <div className="flex flex-col items-center gap-6 truncate">
               <span>Or quick start:</span>
               <div className="flex gap-4">
+                <MenuTrigger>
+                  <Button
+                    aria-label="Start from a sample"
+                    className="pointer-events-auto flex aspect-square h-6 items-center justify-center gap-2 rounded-xs bg-(--hl-xs) p-4 text-sm text-(--color-font) ring-1 ring-transparent transition-all group-hover:opacity-100 group-focus:opacity-100 hover:bg-(--hl-xs) hover:opacity-100 focus:opacity-100 focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm) data-pressed:opacity-100"
+                  >
+                    <Icon icon="plus" />
+                    <span>Create</span>
+                    <Icon icon="caret-down" />
+                  </Button>
+                  <Popover className="flex min-w-max flex-col overflow-y-hidden">
+                    <Menu
+                      aria-label="Start from a sample dropdown"
+                      selectionMode="single"
+                      onAction={key => {
+                        createActionsList.find(({ id }) => key === id)?.action?.();
+                      }}
+                      items={createActionsList}
+                      className="min-w-max cursor-pointer overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) text-sm shadow-lg select-none focus:outline-hidden"
+                    >
+                      {item =>
+                        item.id.startsWith('separator') ? (
+                          <MenuItem
+                            key={item.id}
+                            id={item.id}
+                            className="pointer-events-none m-0 my-1 h-px w-full border-0 bg-(--hl-md) p-0"
+                          />
+                        ) : (
+                          <MenuItem
+                            key={item.id}
+                            id={item.id}
+                            className="flex h-(--line-height-xs) w-full items-center gap-2 bg-transparent px-(--padding-md) whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden disabled:cursor-not-allowed aria-selected:font-bold"
+                            aria-label={item.name}
+                          >
+                            {item.icon && <Icon icon={item.icon} />}
+                            <span>{item.name}</span>
+                          </MenuItem>
+                        )
+                      }
+                    </Menu>
+                  </Popover>
+                </MenuTrigger>
+                <MenuTrigger>
+                  <Button
+                    aria-label="Start from a sample"
+                    className="pointer-events-auto flex aspect-square h-6 items-center justify-center gap-2 rounded-xs bg-(--hl-xs) p-4 text-sm text-(--color-font) ring-1 ring-transparent transition-all group-hover:opacity-100 group-focus:opacity-100 hover:bg-(--hl-xs) hover:opacity-100 focus:opacity-100 focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm) data-pressed:opacity-100"
+                  >
+                    <Icon icon="file-import" />
+                    <span>Import</span>
+                    <Icon icon="caret-down" />
+                  </Button>
+                  <Popover className="flex min-w-max flex-col overflow-y-hidden">
+                    <Menu
+                      aria-label="Start from a sample dropdown"
+                      selectionMode="single"
+                      onAction={key => {
+                        importActionsList.find(({ id }) => key === id)?.action?.();
+                      }}
+                      items={importActionsList}
+                      className="min-w-max cursor-pointer overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) text-sm shadow-lg select-none focus:outline-hidden"
+                    >
+                      {item => (
+                        <MenuItem
+                          key={item.id}
+                          id={item.id}
+                          className="flex h-(--line-height-xs) w-full items-center gap-2 bg-transparent px-(--padding-md) whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden disabled:cursor-not-allowed aria-selected:font-bold"
+                          aria-label={item.name}
+                        >
+                          {item.icon && <Icon icon={item.icon} />}
+                          <span>{item.name}</span>
+                        </MenuItem>
+                      )}
+                    </Menu>
+                  </Popover>
+                </MenuTrigger>
                 <MenuTrigger>
                   <Button
                     aria-label="Start from a sample"
                     className="pointer-events-auto flex aspect-square h-6 items-center justify-center gap-2 rounded-xs bg-(--hl-xs) p-4 text-sm text-(--color-font) ring-1 ring-transparent transition-all group-hover:opacity-100 group-focus:opacity-100 hover:bg-(--hl-xs) hover:opacity-100 focus:opacity-100 focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm) data-pressed:opacity-100"
                   >
                     <Icon icon="file" />
-                    <span>Use example</span>
+                    <span>Use example OpenAPI Spec</span>
                     <Icon icon="caret-down" />
                   </Button>
                   <Popover className="flex min-w-max flex-col overflow-y-hidden">
@@ -144,24 +228,6 @@ export const DesignEmptyState: FC<Props> = ({ onImport }) => {
                     </Menu>
                   </Popover>
                 </MenuTrigger>
-                <Button
-                  className="pointer-events-auto flex aspect-square h-6 items-center justify-center gap-2 rounded-xs bg-(--hl-xs) p-4 text-sm text-(--color-font) ring-1 ring-transparent transition-all group-hover:opacity-100 group-focus:opacity-100 hover:bg-(--hl-xs) hover:opacity-100 focus:opacity-100 focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm) data-pressed:opacity-100"
-                  onPress={() => {
-                    importActionsList.find(({ id }) => id === 'import-file')?.action();
-                  }}
-                >
-                  <Icon icon="file-import" />
-                  Import file
-                </Button>
-                <Button
-                  className="pointer-events-auto flex aspect-square h-6 items-center justify-center gap-2 rounded-xs bg-(--hl-xs) p-4 text-sm text-(--color-font) ring-1 ring-transparent transition-all group-hover:opacity-100 group-focus:opacity-100 hover:bg-(--hl-xs) hover:opacity-100 focus:opacity-100 focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm) data-pressed:opacity-100"
-                  onPress={() => {
-                    importActionsList.find(({ id }) => id === 'import-url')?.action();
-                  }}
-                >
-                  <Icon icon="link" />
-                  Import URL
-                </Button>
               </div>
             </div>
           </div>
diff --git a/packages/insomnia/src/ui/components/document-tab.tsx b/packages/insomnia/src/ui/components/document-tab.tsx
deleted file mode 100644
index 3562f68456..0000000000
--- a/packages/insomnia/src/ui/components/document-tab.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import classnames from 'classnames';
-import { NavLink } from 'react-router';
-
-interface Props {
-  organizationId: string;
-  projectId: string;
-  workspaceId: string;
-  className?: string;
-}
-
-export const DocumentTab = ({ organizationId, projectId, workspaceId, className }: Props) => {
-  return (
-    <nav className={`flex h-[40px] w-full items-center ${className} justify-around px-1`}>
-      {[
-        { id: 'spec', name: 'Spec' },
-        { id: 'debug', name: 'Collection' },
-        { id: 'test', name: 'Tests' },
-      ].map(item => (
-        <NavLink
-          key={item.id}
-          to={`/organization/${organizationId}/project/${projectId}/workspace/${workspaceId}/${item.id}`}
-          className={({ isActive, isPending }) =>
-            classnames('rounded-full px-2 text-center', {
-              'bg-(--color-surprise) text-(--color-font-surprise)': isActive,
-              'animate-pulse': isPending,
-            })
-          }
-          data-testid={`workspace-${item.id}`}
-        >
-          {item.name}
-        </NavLink>
-      ))}
-    </nav>
-  );
-};
diff --git a/packages/insomnia/src/ui/components/dropdowns/actions/create-actions.ts b/packages/insomnia/src/ui/components/dropdowns/actions/create-actions.ts
index 6f674ddc5c..b2b1ca6333 100644
--- a/packages/insomnia/src/ui/components/dropdowns/actions/create-actions.ts
+++ b/packages/insomnia/src/ui/components/dropdowns/actions/create-actions.ts
@@ -13,14 +13,12 @@ export interface ActionItem {
 
 export const createWorkspaceActionItems = ({
   createCollection,
-  createDocument,
   createMcpClient,
   createMockServer,
   createEnvironment,
   canCreateMockServer,
 }: {
   createCollection: () => void;
-  createDocument: () => void;
   createMcpClient: () => void;
   createMockServer: () => void;
   createEnvironment: () => void;
@@ -29,18 +27,11 @@ export const createWorkspaceActionItems = ({
   return [
     {
       id: 'new-collection',
-      name: 'Collection',
+      name: 'API Collection',
       scope: 'collection',
       icon: 'bars',
       action: createCollection,
     },
-    {
-      id: 'new-document',
-      name: 'Document',
-      scope: 'design',
-      icon: 'file',
-      action: createDocument,
-    },
     {
       id: 'new-mcp-client',
       name: 'MCP Client',
diff --git a/packages/insomnia/src/ui/components/dropdowns/git-project-sync-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/git-project-sync-dropdown.tsx
index 527600c209..8419d5e533 100644
--- a/packages/insomnia/src/ui/components/dropdowns/git-project-sync-dropdown.tsx
+++ b/packages/insomnia/src/ui/components/dropdowns/git-project-sync-dropdown.tsx
@@ -89,12 +89,12 @@ export const GitProjectSyncDropdown: FC<Props> = ({ gitRepository, activeProject
   }, [providerName]);
 
   useEffect(() => {
-    if (gitRepository?.uri && gitRepository?._id && gitRepoDataFetcher.state === 'idle' && !gitRepoDataFetcher.data) {
+    if (gitRepository?._id && gitRepoDataFetcher.state === 'idle' && !gitRepoDataFetcher.data) {
       gitRepoDataFetcher.load({
         projectId,
       });
     }
-  }, [gitRepoDataFetcher, gitRepository?.uri, gitRepository?._id, organizationId, projectId]);
+  }, [gitRepoDataFetcher, gitRepository?._id, organizationId, projectId]);
 
   const legacyInsomniaWorkspace =
     gitRepoDataFetcher.data &&
diff --git a/packages/insomnia/src/ui/components/dropdowns/sidebar-project-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/sidebar-project-dropdown.tsx
index 15f53e373d..8c8380bf09 100644
--- a/packages/insomnia/src/ui/components/dropdowns/sidebar-project-dropdown.tsx
+++ b/packages/insomnia/src/ui/components/dropdowns/sidebar-project-dropdown.tsx
@@ -95,8 +95,6 @@ export const ProjectDropdown: FC<Props> = ({
 
   const createNewCollection = () =>
     setNewWorkspaceModalState({ scope: 'collection', isOpen: true, source: 'sidebar-dropdown' });
-  const createNewDocument = () =>
-    setNewWorkspaceModalState({ scope: 'design', isOpen: true, source: 'sidebar-dropdown' });
   const canCreateMockServer = project?._id;
   const createNewMockServer = () =>
     canCreateMockServer &&
@@ -189,7 +187,6 @@ export const ProjectDropdown: FC<Props> = ({
 
   const createInProjectActionList: ProjectActionItem[] = createWorkspaceActionItems({
     createCollection: createNewCollection,
-    createDocument: createNewDocument,
     createMcpClient: createNewMcpClient,
     createMockServer: createNewMockServer,
     createEnvironment: createNewGlobalEnvironment,
diff --git a/packages/insomnia/src/ui/components/dropdowns/sidebar-shortcut-actions-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/sidebar-shortcut-actions-dropdown.tsx
index fe9993fbc5..efc3decb74 100644
--- a/packages/insomnia/src/ui/components/dropdowns/sidebar-shortcut-actions-dropdown.tsx
+++ b/packages/insomnia/src/ui/components/dropdowns/sidebar-shortcut-actions-dropdown.tsx
@@ -99,10 +99,6 @@ export const SidebarShortcutActionsDropdown = ({
           setNewWorkspaceModalState({ scope: 'collection', isOpen: true });
           onOpenChange(false);
         },
-        createDocument: () => {
-          setNewWorkspaceModalState({ scope: 'design', isOpen: true });
-          onOpenChange(false);
-        },
         createMcpClient: () => {
           setNewWorkspaceModalState({ scope: 'mcp', isOpen: true });
           onOpenChange(false);
diff --git a/packages/insomnia/src/ui/components/dropdowns/sidebar-workspace-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/sidebar-workspace-dropdown.tsx
index 82eb48a85e..28bbda862a 100644
--- a/packages/insomnia/src/ui/components/dropdowns/sidebar-workspace-dropdown.tsx
+++ b/packages/insomnia/src/ui/components/dropdowns/sidebar-workspace-dropdown.tsx
@@ -1,8 +1,10 @@
 import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core';
+import classNames from 'classnames';
 import {
   exportGlobalEnvironmentToFile,
   exportMcpClientToFile,
   exportMockServerToFile,
+  exportSpecificationToFile,
 } from 'insomnia/src/ui/components/settings/import-export';
 import type { MockServer, Project, Workspace } from 'insomnia-data';
 import { models, services } from 'insomnia-data';
@@ -59,6 +61,7 @@ interface Props {
   sortOrder?: SortOrder;
   onSortOrderChange: (newSortOrder: SortOrder) => void;
   isOpen: boolean;
+  forceShowTrigger?: boolean;
   onOpenChange: (isOpen: boolean) => void;
 }
 
@@ -88,6 +91,7 @@ export const SidebarWorkspaceDropdown = ({
   onSortOrderChange,
   isOpen,
   onOpenChange,
+  forceShowTrigger = false,
 }: Props) => {
   const projectId = project._id;
   const workspaceId = workspace._id;
@@ -109,8 +113,8 @@ export const SidebarWorkspaceDropdown = ({
 
   const workspaceName = workspace.name;
   const projectName = project.name || getProductName();
-  const isCollection = models.workspace.isCollection(workspace);
-  const isDesign = models.workspace.isDesign(workspace);
+  // Legacy design workspace is treated as collection for now.
+  const isCollectionLike = models.workspace.isCollection(workspace) || models.workspace.isDesign(workspace);
   const isScratchpadWorkspace = models.workspace.isScratchpad(workspace);
 
   const createRequest = (requestType: CreateRequestType) => {
@@ -220,7 +224,7 @@ export const SidebarWorkspaceDropdown = ({
     items: [
       {
         id: 'RunCollection',
-        name: 'Run Collection',
+        name: 'Run API Collection',
         icon: 'circle-play',
         action: () => openInNewTab(true),
       },
@@ -228,8 +232,8 @@ export const SidebarWorkspaceDropdown = ({
   };
 
   const createSections: ActionSection[] = [
-    ...(isCollection ? [createSection, importSection] : []),
-    ...(isCollection || isDesign ? [runSection] : []),
+    ...(isCollectionLike ? [createSection, importSection] : []),
+    ...(isCollectionLike ? [runSection] : []),
   ];
 
   const actionSection: ActionSection = {
@@ -309,6 +313,16 @@ export const SidebarWorkspaceDropdown = ({
           return setIsExportModalOpen(true);
         },
       },
+      ...(isCollectionLike
+        ? [
+            {
+              id: 'ExportOpenApiSpec',
+              name: 'Export OpenAPI Spec',
+              icon: 'file-code' as IconName,
+              action: () => exportSpecificationToFile(workspace),
+            },
+          ]
+        : []),
       {
         id: 'Settings',
         name: 'Settings',
@@ -379,7 +393,14 @@ export const SidebarWorkspaceDropdown = ({
       <MenuTrigger isOpen={isOpen} onOpenChange={onOpenChange}>
         <Button
           aria-label="SideBar Workspace Actions"
-          className="hidden aspect-square h-6 items-center justify-center rounded-xs text-sm text-(--color-font) opacity-0 ring-1 ring-transparent transition-all group-hover:flex group-hover:opacity-100 group-focus:flex group-focus:opacity-100 hover:bg-(--hl-xs) hover:opacity-100 focus:opacity-100 focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm) data-pressed:flex data-pressed:opacity-100"
+          className={classNames(
+            'flex aspect-square h-6 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) hover:opacity-100 focus:opacity-100 focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm) data-pressed:visible data-pressed:opacity-100',
+            {
+              'visible opacity-100': forceShowTrigger,
+              'invisible opacity-0 group-hover:visible group-hover:opacity-100 group-focus:visible group-focus:opacity-100':
+                !forceShowTrigger,
+            },
+          )}
         >
           <Icon icon="ellipsis" />
         </Button>
diff --git a/packages/insomnia/src/ui/components/editable-input.tsx b/packages/insomnia/src/ui/components/editable-input.tsx
index 721e0b9cab..e645f837e4 100644
--- a/packages/insomnia/src/ui/components/editable-input.tsx
+++ b/packages/insomnia/src/ui/components/editable-input.tsx
@@ -23,6 +23,10 @@ export const EditableInput = ({
   // This state is used to keep track of the value while submitting when parent component value is not updated
   const [pendingValue, setPendingValue] = useState<string | null>(null);
   const editableRef = useRef<HTMLDivElement>(null);
+  // Removing the focused Input from the DOM (on Enter/Escape) fires a native blur
+  // synchronously, which would otherwise run onSubmit a second time (or commit after an
+  // Escape cancel) and race with the next double-click's FocusScope mount.
+  const settledRef = useRef(false);
 
   useEffect(() => {
     // set pending value to null if parent value is changed
@@ -33,6 +37,12 @@ export const EditableInput = ({
     setIsEditable(editable);
   }, [editable]);
 
+  useEffect(() => {
+    if (isEditable) {
+      settledRef.current = false;
+    }
+  }, [isEditable]);
+
   useEffect(() => {
     if (!isEditable) {
       return;
@@ -76,7 +86,14 @@ export const EditableInput = ({
         <span className="truncate">{pendingValue ?? value}</span>
       </div>
       {isEditable && (
-        <FocusScope contain restoreFocus autoFocus>
+        // No `restoreFocus`: on commit the input unmounts while the Enter keypress is
+        // still in flight, and restoring focus here races the RAC collection correction,
+        // landing DOM focus on a draggable row (e.g. the KV editor's trailing row) before
+        // the keyup fires. RAC then reads that keyup as a keyboard drag release and
+        // starts a drag session that aria-hides the whole page (frozen UI until Escape).
+        // Letting focus settle on the body keeps the collection unfocused, so the drag
+        // can never be armed.
+        <FocusScope contain autoFocus>
           <Input
             ref={el => el?.select()}
             className={`truncate ${className || 'px-2'}`}
@@ -84,9 +101,13 @@ export const EditableInput = ({
             aria-label={ariaLabel}
             defaultValue={value}
             onKeyDown={e => {
-              const value = e.currentTarget.value;
               if (e.key === 'Enter') {
                 e.stopPropagation();
+                if (settledRef.current) {
+                  return;
+                }
+                settledRef.current = true;
+                const value = e.currentTarget.value;
                 setPendingValue(value);
                 onSubmit(value);
                 setIsEditable(false);
@@ -95,11 +116,16 @@ export const EditableInput = ({
 
               if (e.key === 'Escape') {
                 e.stopPropagation();
+                settledRef.current = true;
                 setIsEditable(false);
                 onEditableChange?.(false);
               }
             }}
             onBlur={e => {
+              if (settledRef.current) {
+                return;
+              }
+              settledRef.current = true;
               const value = e.currentTarget.value;
               setPendingValue(value);
               onSubmit(value);
diff --git a/packages/insomnia/src/ui/components/editors/environment-editor.tsx b/packages/insomnia/src/ui/components/editors/environment-editor.tsx
index 5d84ab690a..815698f531 100644
--- a/packages/insomnia/src/ui/components/editors/environment-editor.tsx
+++ b/packages/insomnia/src/ui/components/editors/environment-editor.tsx
@@ -1,6 +1,6 @@
 import { isWindows } from 'insomnia-data/common';
 import orderedJSON from 'json-order';
-import React, { forwardRef, useCallback, useImperativeHandle, useRef, useState } from 'react';
+import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react';
 
 import { checkNestedKeys } from '~/common/utils/environment-utils';
 import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor';
@@ -22,20 +22,22 @@ interface Props {
 
 export interface EnvironmentEditorHandle {
   isValid: () => boolean;
+  /** Throws on invalid content (empty included) - guard with isValid(). */
   getValue: () => EnvironmentInfo | null;
 }
 
 export const EnvironmentEditor = forwardRef<EnvironmentEditorHandle, Props>(
   ({ environmentInfo, onBlur, onChange, historyKey }, ref) => {
     const editorRef = useRef<CodeEditorHandle>(null);
-    const editorErrorRef = useRef('');
     const [error, setError] = useState('');
     const getValue = useCallback(() => {
-      // @ts-expect-error -- current can be null
-      let value = editorRef.current.getValue();
-      if (!editorRef.current || !value) {
+      const editor = editorRef.current;
+      if (!editor) {
         return null;
       }
+      /* Empty content is invalid JSON, not "no value": let orderedJSON.parse throw so it follows
+      the same error path as any other malformed input. */
+      let value = editor.getValue();
 
       // On Windows, backslashes are used as directory separators.
       // The file tag inserted by Nunjucks in JSON uses double backslashes in its path parameter, but in the logic below, orderedJSON.parse unescapes those double backslashes into a single backslash. This causes the file tag to fail when the corresponding environment variable is referenced in a request.
@@ -52,20 +54,33 @@ export const EnvironmentEditor = forwardRef<EnvironmentEditorHandle, Props>(
       };
       return environmentInfo;
     }, []);
+
+    /** Parses the current document: the value to commit, or the error to show. */
+    const validate = useCallback(() => {
+      try {
+        const value = getValue();
+        if (!value?.object) {
+          return { value: null, error: '' };
+        }
+        // Check root and nested properties
+        const err = checkNestedKeys(value.object);
+        return err ? { value: null, error: err } : { value, error: '' };
+      } catch (err) {
+        return { value: null, error: err.message };
+      }
+    }, [getValue]);
+
     useImperativeHandle(
       ref,
       () => ({
-        isValid: () => !editorErrorRef.current,
+        /* Derived from the document, not from the last edit event: onChange is debounced and the
+        cached content is restored on mount without firing it. */
+        isValid: () => !validate().error,
         getValue,
       }),
-      [getValue],
+      [getValue, validate],
     );
 
-    const updateEditorError = (message: string) => {
-      editorErrorRef.current = message;
-      setError(message);
-    };
-
     let defaultValue = orderedJSON.stringify(
       environmentInfo.object,
       environmentInfo.propertyOrder || null,
@@ -77,6 +92,12 @@ export const EnvironmentEditor = forwardRef<EnvironmentEditorHandle, Props>(
       defaultValue = unescapeFileTag(defaultValue);
     }
 
+    /* The editor can hold content that never passed through onChange (the cached document is
+    restored on mount), so re-validate to keep the notice and isValid() in sync with it. */
+    useEffect(() => {
+      setError(validate().error);
+    }, [validate, defaultValue, historyKey]);
+
     return (
       <div className="environment-editor">
         <CodeEditor
@@ -86,21 +107,10 @@ export const EnvironmentEditor = forwardRef<EnvironmentEditorHandle, Props>(
           autoPrettify
           enableNunjucks
           onChange={() => {
-            updateEditorError('');
-            try {
-              const value = getValue();
-              // Check for invalid key names
-              if (value?.object) {
-                // Check root and nested properties
-                const err = checkNestedKeys(value.object);
-                if (err) {
-                  updateEditorError(err);
-                } else {
-                  onChange?.(value);
-                }
-              }
-            } catch (err) {
-              updateEditorError(err.message);
+            const { value, error: validationError } = validate();
+            setError(validationError);
+            if (value) {
+              onChange?.(value);
             }
           }}
           defaultValue={defaultValue}
diff --git a/packages/insomnia/src/ui/components/editors/environment-key-value-editor/key-value-editor.tsx b/packages/insomnia/src/ui/components/editors/environment-key-value-editor/key-value-editor.tsx
index 497856cfc8..b05b29f4c8 100644
--- a/packages/insomnia/src/ui/components/editors/environment-key-value-editor/key-value-editor.tsx
+++ b/packages/insomnia/src/ui/components/editors/environment-key-value-editor/key-value-editor.tsx
@@ -82,6 +82,7 @@ export const EnvironmentKVEditor = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [JSON.stringify(data)]);
   const blankNameEditorRef = useRef<OneLineEditorHandle | null>(null);
+  const [autoFocusBlankRow, setAutoFocusBlankRow] = useState(!disabled);
   // The id for the trailing blank row is derived from the persisted pairs (rather than
   // held in state) so it only changes when the data actually changes. This keeps it in
   // sync with the async data updates - if it flipped eagerly the row the user just typed
@@ -106,11 +107,7 @@ export const EnvironmentKVEditor = ({
   // diffs) until the user starts typing in it.
   const kvPairs: EnvironmentKvPairData[] = useMemo(() => [...persistedPairs, blankPair], [persistedPairs, blankPair]);
   const codeModalRef = useRef<CodePromptModalHandle>(null);
-  // Refs to each row's Name editor, keyed by pair id. React Aria's ListBox (with drag-and-drop) owns
-  // roving focus and lands it on the row element; we hand that focus into the row's CodeMirror editor
-  // rather than fighting React Aria with an imperative focus loop (which corrupts the modal's
-  // ariaHideOutside/inert management on the sibling environments list).
-  const nameEditorRefs = useRef<Map<string, OneLineEditorHandle>>(new Map());
+
   const [kvPairError, setKvPairError] = useState<{ id: string; error: string }[]>([]);
   const [decryptedValues, setDecryptedValues] = useState<Record<string, string>>({});
   const symmetricKey = useMemo(() => (vaultKey === '' ? {} : base64decode(vaultKey, true)), [vaultKey]);
@@ -341,11 +338,6 @@ export const EnvironmentKVEditor = ({
         <div className={`${cellCommonStyle} relative flex h-full w-[30%] grow pl-1`}>
           <OneLineEditor
             ref={el => {
-              if (el) {
-                nameEditorRefs.current.set(id, el);
-              } else {
-                nameEditorRefs.current.delete(id);
-              }
               if (isBlank) {
                 blankNameEditorRef.current = el;
               }
@@ -355,6 +347,8 @@ export const EnvironmentKVEditor = ({
             placeholder={'Input Name'}
             defaultValue={name}
             readOnly={!enabled || disabled}
+            autoFocus={isBlank && autoFocusBlankRow}
+            onAutoFocus={isBlank ? () => setAutoFocusBlankRow(false) : undefined}
             onChange={newName => {
               // check filed names for invalid '$' for '.' sign
               const error = ensureKeyIsValid(newName, true);
@@ -560,17 +554,14 @@ export const EnvironmentKVEditor = ({
       <ListBox
         aria-label="Environment Key Value Pair"
         selectionMode="none"
+        disallowTypeAhead
         dragAndDropHooks={dragAndDropHooks}
         dependencies={[kvPairError, data, symmetricKey, blankId, decryptedValues]}
         className="h-full w-full overflow-y-auto p-(--padding-sm)"
         items={kvPairs}
-        // Let React Aria place focus on the trailing blank row so the editor is ready to type into on
-        // open/add — then onFocus below hands that focus into the row's Name editor.
-        autoFocus={!disabled && kvPairs.length > 0 && kvPairs[kvPairs.length - 1].name === '' ? 'last' : undefined}
       >
         {kvPair => {
           const { id, name, enabled } = kvPair;
-          const isTrailingBlankRow = name === '' && kvPair === kvPairs[kvPairs.length - 1];
           return (
             <ListBoxItem
               key={id}
@@ -578,13 +569,6 @@ export const EnvironmentKVEditor = ({
               textValue={`environment-item-${name || id}`}
               style={{ opacity: enabled ? '1' : '0.4' }}
               className={'flex h-(--line-height-sm) w-full focus:outline-hidden'}
-              onFocus={e => {
-                // Forward focus from the row element into its Name editor, but only for the trailing
-                // blank row and only when the row itself (not an inner field) received focus.
-                if (!disabled && isTrailingBlankRow && e.target === e.currentTarget) {
-                  nameEditorRefs.current.get(id)?.focusEnd();
-                }
-              }}
             >
               {renderPairItem(kvPair)}
             </ListBoxItem>
diff --git a/packages/insomnia/src/ui/components/editors/mock-response-extractor.tsx b/packages/insomnia/src/ui/components/editors/mock-response-extractor.tsx
index 45b138ceb2..6ffc370988 100644
--- a/packages/insomnia/src/ui/components/editors/mock-response-extractor.tsx
+++ b/packages/insomnia/src/ui/components/editors/mock-response-extractor.tsx
@@ -3,12 +3,12 @@ import React, { useState } from 'react';
 import { Button } from 'react-aria-components';
 import { useNavigate, useParams } from 'react-router';
 
-import { useOrganizationLoaderData } from '~/routes/organization';
 import { useRequestLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId';
 import {
   isInMockContentTypeList,
   useMockRoutePatcher,
 } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId';
+import { useCurrentPlan } from '~/ui/hooks/use-account-server-data';
 
 import { getContentTypeName, getMimeTypeFromContentType } from '../../../common/constants';
 import { useWorkspaceLoaderData } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
@@ -23,8 +23,8 @@ export const MockResponseExtractor = () => {
 
   const { activeProject, activeWorkspace } = useWorkspaceLoaderData()!;
   const isLocalProject = !activeProject?.remoteId;
-  const { currentPlan } = useOrganizationLoaderData()!;
-  const isEnterprise = currentPlan?.type.includes('enterprise');
+  const currentPlan = useCurrentPlan();
+  const isEnterprise = currentPlan?.type?.includes('enterprise');
 
   // In a local project, users are not allowed to create a cloud mock server, only enterprise users can create a self-hosted mock server.
   // In a local project, users without enterprise plan can't create cloud mock server route from a request response
diff --git a/packages/insomnia/src/ui/components/environment-picker.tsx b/packages/insomnia/src/ui/components/environment-picker.tsx
index 946cd7a4f4..8f924d9336 100644
--- a/packages/insomnia/src/ui/components/environment-picker.tsx
+++ b/packages/insomnia/src/ui/components/environment-picker.tsx
@@ -1,37 +1,54 @@
-import type { IconName } from '@fortawesome/fontawesome-svg-core';
+import type { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { models } from 'insomnia-data';
-import { fuzzyMatch } from 'insomnia-data/common';
-import { Fragment } from 'react';
-import {
-  Button,
-  ComboBox,
-  Dialog,
-  DialogTrigger,
-  Heading,
-  Input,
-  ListBox,
-  ListBoxItem,
-  Popover,
-  Text,
-} from 'react-aria-components';
+import { Fragment, useState } from 'react';
+import { Button, Dialog, DialogTrigger, Heading, ListBox, ListBoxItem, Popover, Text } from 'react-aria-components';
 import { useNavigate, useParams } from 'react-router';
 
 import { useSetActiveEnvironmentFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active';
 import { useEnvironmentSetActiveGlobalActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active-global';
+import { NewWorkspaceModal } from '~/ui/components/modals/new-workspace-modal';
 import { Tooltip } from '~/ui/components/tooltip';
+import { useOrganizationStorageRule } from '~/ui/hooks/use-organization-storage-rule';
 
 import { useWorkspaceLoaderData } from '../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
 import uiEventBus from '../event-bus';
 import { useOrganizationPermissions } from '../hooks/use-organization-features';
 import { Icon } from './icon';
 
+const triggerButtonClassName =
+  'flex max-w-48 shrink-0 items-center gap-1.5 truncate rounded-xs px-2 py-1 text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm) data-open:bg-(--hl-sm)';
+
+// Capped so a long environment name truncates with an ellipsis instead of stretching the popover off-screen.
+const popoverClassName = 'z-10! flex max-h-[90vh] w-64 max-w-xs flex-col';
+const headingClassName =
+  'flex h-(--line-height-sm) shrink-0 items-center justify-between gap-2 px-3 py-1 text-sm font-bold text-(--hl)';
+const listBoxClassName =
+  'flex max-h-fit min-w-0 flex-1 flex-col overflow-y-auto p-2 text-sm select-none empty:p-0 focus:outline-hidden';
+const listBoxItemClassName =
+  'group flex h-(--line-height-xs) w-full min-w-0 flex-none items-center gap-2 rounded-sm bg-transparent pr-1 text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden disabled:cursor-not-allowed';
+// Sub-environments indent by exactly one icon's width so they line up under the parent row's name, not a stray gap.
+const itemIndentClassName = (isBase: boolean) => (isBase ? 'pl-(--padding-sm)' : 'pl-[calc(var(--padding-sm)+1rem)]');
+
+const InheritanceTooltip = () => (
+  <Tooltip
+    position="top"
+    message="Environment values inherit downward. When the same variable is set in more than one scope, folder wins over collection, and collection wins over project."
+  >
+    <Icon icon="circle-info" className="shrink-0 text-(--hl)" />
+  </Tooltip>
+);
+
 export const EnvironmentPicker = ({
   isOpen,
   onOpenChange,
+  isProjectPickerOpen,
+  onProjectPickerOpenChange,
   onOpenEnvironmentSettingsModal,
 }: {
   isOpen: boolean;
   onOpenChange: (isOpen: boolean) => void;
+  isProjectPickerOpen: boolean;
+  onProjectPickerOpenChange: (isOpen: boolean) => void;
   onOpenEnvironmentSettingsModal: () => void;
 }) => {
   const {
@@ -54,10 +71,12 @@ export const EnvironmentPicker = ({
   };
 
   const { features } = useOrganizationPermissions();
+  const storageRules = useOrganizationStorageRule(organizationId);
   const isUsingInsomniaCloudSync = Boolean(
     models.project.isRemoteProject(activeProject) && !activeWorkspaceMeta?.gitRepositoryId,
   );
   const isUsingGitSync = Boolean(features.gitSync.enabled && activeWorkspaceMeta?.gitRepositoryId);
+  const isScratchpadProject = models.project.isScratchpadProject(activeProject);
 
   const setActiveEnvironmentFetcher = useSetActiveEnvironmentFetcher();
   const setActiveGlobalEnvironmentFetcher = useEnvironmentSetActiveGlobalActionFetcher();
@@ -73,289 +92,268 @@ export const EnvironmentPicker = ({
     : activeGlobalEnvironment?.parentId;
   const selectedGlobalBaseEnvironment = globalBaseEnvironments.find(e => e._id === selectedGlobalBaseEnvironmentId);
 
-  const globalEnvironmentList = selectedGlobalBaseEnvironment
-    ? [
-        selectedGlobalBaseEnvironment,
-        ...globalSubEnvironments.filter(e => e.parentId === selectedGlobalBaseEnvironment._id),
-      ].map(({ type, ...subEnvironment }) => ({
-        ...subEnvironment,
-        id: subEnvironment._id,
-        isBase: subEnvironment._id === selectedGlobalBaseEnvironment._id,
-      }))
-    : [];
-
   const activeGlobalBaseEnvironment = selectedGlobalBaseEnvironment;
   const activeBaseEnvironment = baseEnvironment;
   const activeSubEnvironment = subEnvironments.find(e => e._id === activeEnvironment._id);
+  const activeCollectionEnvironmentName = activeSubEnvironment ? activeSubEnvironment.name : activeBaseEnvironment.name;
 
   const navigate = useNavigate();
 
+  const [isNewProjectEnvironmentModalOpen, setIsNewProjectEnvironmentModalOpen] = useState(false);
+
+  const getEnvironmentIcon = (isPrivate?: boolean): IconProp =>
+    isPrivate
+      ? 'lock'
+      : isUsingGitSync
+        ? ['fab', 'git-alt']
+        : isUsingInsomniaCloudSync
+          ? 'globe-americas'
+          : 'file-arrow-down';
+
+  // Flattened list of every project environment file plus its sub-environments, so picking
+  // one is a single action instead of choosing a file first and then a sub-environment.
+  const projectEnvironmentItems: {
+    id: string;
+    name: string;
+    icon: IconProp;
+    color?: string | null;
+    isBase: boolean;
+    workspaceId?: string;
+  }[] = [
+    { id: '', name: 'No Project Environment', icon: 'cancel', isBase: true },
+    ...globalBaseEnvironments.flatMap(baseEnv => [
+      {
+        id: baseEnv._id,
+        name: baseEnv.workspaceName || baseEnv.name,
+        icon: getEnvironmentIcon(baseEnv.isPrivate),
+        color: baseEnv.color,
+        isBase: true,
+        workspaceId: baseEnv.parentId,
+      },
+      ...globalSubEnvironments
+        .filter(subEnv => subEnv.parentId === baseEnv._id)
+        .map(subEnv => ({
+          id: subEnv._id,
+          name: subEnv.name,
+          icon: getEnvironmentIcon(subEnv.isPrivate),
+          color: subEnv.color,
+          isBase: false,
+        })),
+    ]),
+  ];
+
   return (
-    <DialogTrigger isOpen={isOpen} onOpenChange={onOpenChange}>
-      <Button
-        aria-label="Manage Environments"
-        className="flex max-w-full items-start gap-2 truncate rounded-xs px-2 py-1 text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
-      >
-        {activeGlobalEnvironment && activeGlobalBaseEnvironment && (
-          <div className="flex w-full">
-            <div className="flex w-full items-center gap-2">
-              <Icon
-                icon={
-                  activeGlobalEnvironment.isPrivate
+    <div className="flex items-center gap-1">
+      {!isScratchpadProject && (
+        <DialogTrigger isOpen={isProjectPickerOpen} onOpenChange={onProjectPickerOpenChange}>
+          <Button aria-label="Select a Project Environment" className={triggerButtonClassName}>
+            <Icon
+              icon={
+                activeGlobalEnvironment
+                  ? activeGlobalEnvironment.isPrivate
                     ? 'lock'
-                    : isUsingGitSync
-                      ? ['fab', 'git-alt']
-                      : isUsingInsomniaCloudSync
-                        ? 'globe-americas'
-                        : 'file-arrow-down'
-                }
-                style={{ color: activeGlobalEnvironment.color || '' }}
-                className="w-5 shrink-0"
-              />
-              <Tooltip position="top" message="active global environment">
-                <span className="truncate">{activeGlobalEnvironment.name}</span>
-              </Tooltip>
-              <Icon icon="plus" className="w-3 shrink-0 text-(--hl)" />
-            </div>
-          </div>
-        )}
-        <div className="flex w-full flex-1 items-center gap-2">
-          <Icon
-            icon={activeEnvironment.isPrivate ? 'lock' : 'code'}
-            style={{ color: activeEnvironment.color || '' }}
-            className="w-5 shrink-0"
-          />
-          <Tooltip position="top" message="active collection environment">
-            <span className="truncate">
-              {activeSubEnvironment ? activeSubEnvironment.name : activeBaseEnvironment.name}
-            </span>
-          </Tooltip>
-        </div>
-      </Button>
-      <Popover className="z-10! flex max-h-[90vh] min-w-max flex-col" placement="bottom start" offset={8}>
-        <Dialog className="grid h-full w-full auto-cols-[min(260px,calc(40vw))_min(260px,calc(40vw))] grid-flow-col divide-x divide-solid divide-(--hl-md) overflow-hidden rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) text-sm shadow-lg select-none focus:outline-hidden">
-          <div className="relative flex h-full w-full flex-1 flex-col overflow-hidden">
-            <Heading className="flex h-(--line-height-sm) shrink-0 items-center justify-between gap-2 px-3 py-1 text-sm font-bold text-(--hl)">
-              <span>Project Environments</span>
-              <Button
-                aria-label="Manage project environment"
-                onPress={() =>
-                  selectedGlobalBaseEnvironment &&
-                  navigate(
-                    `/organization/${organizationId}/project/${projectId}/workspace/${selectedGlobalBaseEnvironment.parentId}/environment`,
-                  )
-                }
-                className={`flex aspect-square h-6 shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent outline-hidden transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm) ${!selectedGlobalBaseEnvironment ? 'opacity-50' : ''}`}
-              >
-                <Icon icon="gear" />
-              </Button>
-            </Heading>
-            <div>
-              <ComboBox
-                aria-label="Project Environment"
-                shouldFocusWrap
-                allowsCustomValue={false}
-                menuTrigger="focus"
-                defaultFilter={(textValue, filter) => {
-                  const match = Boolean(fuzzyMatch(filter, textValue, { splitSpace: false, loose: true })?.indexes);
-
-                  return match;
-                }}
-                onSelectionChange={key => {
-                  if (key === 'all' || key === null) {
-                    return;
-                  }
-
-                  setActiveGlobalEnvironmentFetcher.submit({
-                    organizationId,
-                    projectId,
-                    workspaceId,
-                    environmentId: key.toString(),
-                  });
-                }}
-                defaultInputValue={
-                  selectedGlobalBaseEnvironment?.workspaceName ||
-                  selectedGlobalBaseEnvironment?.name ||
-                  'No Project Environment'
-                }
-                selectedKey={selectedGlobalBaseEnvironmentId || ''}
-                defaultItems={[
-                  { id: '', icon: 'cancel', name: 'No Project Environment', textValue: 'No Project Environment' },
-                  ...globalBaseEnvironments.map(baseEnv => {
-                    return {
-                      id: baseEnv._id,
-                      icon: 'code',
-                      name: baseEnv.workspaceName || baseEnv.name,
-                      textValue: baseEnv.workspaceName || baseEnv.name,
-                    };
-                  }),
-                ]}
-              >
-                <div className="group mx-2 my-2 flex items-center gap-2 rounded-xs border border-solid border-(--hl-sm) bg-(--color-bg) px-2 text-(--color-font) transition-colors focus:ring-1 focus:ring-(--hl-md) focus:outline-hidden">
-                  <Input
-                    aria-label="Project Environment"
-                    placeholder="Choose a project environment"
-                    className="w-full py-1 pr-7 pl-2 placeholder:italic"
-                  />
-                  <Button className="flex aspect-square items-center justify-center gap-2 truncate rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)">
-                    <Icon icon="caret-down" className="w-5 shrink-0" />
-                  </Button>
+                    : getEnvironmentIcon(false)
+                  : 'cancel'
+              }
+              style={{ color: activeGlobalEnvironment?.color || '' }}
+              className="w-4 shrink-0"
+            />
+            <Tooltip position="top" message="Project environment — shared by every collection in this project.">
+              <span className="truncate">
+                {activeGlobalEnvironment && activeGlobalBaseEnvironment
+                  ? activeGlobalEnvironment.name
+                  : 'No Project Environment'}
+              </span>
+            </Tooltip>
+            <Icon icon="caret-down" className="w-2.5 shrink-0 text-(--hl)" />
+          </Button>
+          <Popover className={popoverClassName} placement="bottom start" offset={8}>
+            <Dialog className="flex h-full max-h-200 w-full flex-col overflow-hidden rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) text-sm shadow-lg select-none focus:outline-hidden">
+              <Heading className={headingClassName}>
+                <Tooltip
+                  position="top"
+                  message="Shared by every collection in this project. Hover a row to edit its file."
+                >
+                  <span>Project Environments</span>
+                </Tooltip>
+                <div className="flex shrink-0 items-center gap-2">
+                  <Tooltip position="top" message="Create a new project environment">
+                    <Button
+                      aria-label="Add Project Environment"
+                      onPress={() => setIsNewProjectEnvironmentModalOpen(true)}
+                      className="flex aspect-square h-6 shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
+                    >
+                      <Icon icon="plus" />
+                    </Button>
+                  </Tooltip>
+                  <InheritanceTooltip />
                 </div>
-                <Popover
-                  className="z-10! grid max-h-[90vh] min-w-max auto-cols-[min(250px,calc(45vw))] grid-flow-col divide-x divide-solid divide-(--hl-md) overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) text-sm shadow-lg select-none focus:outline-hidden"
-                  placement="bottom start"
-                  offset={8}
-                >
-                  <ListBox<{
-                    name: string;
-                    icon: IconName;
-                  }> className="flex h-full max-h-full min-w-max flex-col p-2 text-sm select-none focus:outline-hidden">
-                    {item => (
-                      <ListBoxItem
-                        textValue={item.name}
-                        className="flex h-(--line-height-xs) w-full items-center gap-2 rounded-sm bg-transparent px-(--padding-md) whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden disabled:cursor-not-allowed aria-disabled:cursor-not-allowed aria-disabled:opacity-30 aria-selected:bg-(--hl-sm) aria-selected:font-bold data-focused:bg-(--hl-xs)"
-                      >
-                        <Icon icon={item.icon} className="w-4" />
-                        <span className="truncate">{item.name}</span>
-                      </ListBoxItem>
-                    )}
-                  </ListBox>
-                </Popover>
-              </ComboBox>
-            </div>
-            <ListBox
-              aria-label="Select a Global Environment"
-              selectionMode="single"
-              disallowEmptySelection
-              key={activeGlobalEnvironment?._id}
-              items={globalEnvironmentList}
-              selectedKeys={[activeGlobalEnvironment?._id || activeGlobalBaseEnvironment?._id || '']}
-              onSelectionChange={keys => {
-                if (keys === 'all' || !keys) {
-                  return;
-                }
-                const [environmentId] = keys.values();
-
-                setActiveGlobalEnvironmentFetcher.submit({
-                  organizationId,
-                  projectId,
-                  workspaceId,
-                  environmentId: environmentId.toString(),
-                });
-              }}
-              className="flex max-h-fit min-w-max flex-1 flex-col overflow-y-auto p-2 text-sm select-none empty:p-0 focus:outline-hidden"
-            >
-              {item => (
-                <ListBoxItem
-                  textValue={item.name}
-                  className={`flex h-(--line-height-xs) w-full flex-none items-center gap-2 rounded-sm bg-transparent pr-1 whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden disabled:cursor-not-allowed ${item.isBase ? 'pl-(--padding-md)' : 'pl-8'}`}
-                >
-                  {({ isSelected }) => (
-                    <Fragment>
-                      <span
-                        style={{
-                          borderColor: item.color ?? 'var(--color-font)',
-                        }}
-                      >
-                        <Icon
-                          icon={
-                            item.isPrivate
-                              ? 'lock'
-                              : isUsingGitSync
-                                ? ['fab', 'git-alt']
-                                : isUsingInsomniaCloudSync
-                                  ? 'globe-americas'
-                                  : 'file-arrow-down'
-                          }
-                          className="w-5 text-xs"
-                          style={{
-                            color: item.color ?? 'var(--color-font)',
-                          }}
-                        />
-                      </span>
-                      <Text slot="label" className="flex-1 truncate">
-                        {item.name}
-                      </Text>
-                      {isSelected && <Icon icon="check" className="justify-self-end px-2 text-(--color-success)" />}
-                    </Fragment>
-                  )}
-                </ListBoxItem>
-              )}
-            </ListBox>
-            <div className="relative contents w-full overflow-hidden">
-              <Heading className="flex h-7 shrink-0 items-center justify-between gap-2 px-3 py-1 text-sm font-bold text-(--hl)">
-                <span>Collection Environments</span>
-                <Button
-                  onPress={onOpenEnvironmentSettingsModal}
-                  aria-label="Manage collection environments"
-                  className="flex aspect-square h-6 shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent outline-hidden transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
-                >
-                  <Icon icon="edit" />
-                </Button>
               </Heading>
               <ListBox
-                aria-label="Select a Collection Environment"
+                aria-label="Select a Project Environment"
                 selectionMode="single"
-                key={activeEnvironment._id}
-                items={collectionEnvironmentList}
-                selectedKeys={[activeEnvironment._id || baseEnvironment._id || '']}
                 disallowEmptySelection
+                key={activeGlobalEnvironment?._id || 'none'}
+                items={projectEnvironmentItems}
+                selectedKeys={[activeGlobalEnvironment?._id || activeGlobalBaseEnvironment?._id || '']}
                 onSelectionChange={keys => {
                   if (keys === 'all' || !keys) {
                     return;
                   }
                   const [environmentId] = keys.values();
-                  setActiveEnvironmentFetcher.submit({
+
+                  setActiveGlobalEnvironmentFetcher.submit({
                     organizationId,
                     projectId,
                     workspaceId,
                     environmentId: environmentId.toString(),
                   });
-                  uiEventBus.emit('CHANGE_ACTIVE_ENV', workspaceId);
                 }}
-                className="max-h-fit flex-1 overflow-y-auto p-2 text-sm select-none focus:outline-hidden"
+                className={listBoxClassName}
               >
                 {item => (
                   <ListBoxItem
                     textValue={item.name}
-                    className={`flex h-(--line-height-xs) w-full items-center gap-2 truncate rounded-sm bg-transparent pr-1 whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden ${item.isBase ? 'pl-(--padding-md)' : 'pl-8'}`}
+                    className={`${listBoxItemClassName} ${itemIndentClassName(item.isBase)}`}
                   >
                     {({ isSelected }) => (
                       <Fragment>
-                        <span
+                        <Icon
+                          icon={item.icon}
+                          className="w-5 shrink-0 text-xs"
                           style={{
-                            borderColor: item.color ?? 'var(--color-font)',
+                            color: item.color ?? 'var(--color-font)',
                           }}
-                        >
-                          <Icon
-                            icon={
-                              item.isPrivate
-                                ? 'lock'
-                                : isUsingGitSync
-                                  ? ['fab', 'git-alt']
-                                  : isUsingInsomniaCloudSync
-                                    ? 'globe-americas'
-                                    : 'file-arrow-down'
-                            }
-                            className="w-5 text-xs"
-                            style={{
-                              color: item.color ?? 'var(--color-font)',
-                            }}
-                          />
-                        </span>
-                        <Text slot="label" className="flex-1 truncate">
+                        />
+                        <Text slot="label" className="min-w-0 flex-1 truncate">
                           {item.name}
                         </Text>
-                        {isSelected && <Icon icon="check" className="justify-self-end px-2 text-(--color-success)" />}
+                        {isSelected && (
+                          <Icon icon="check" className="shrink-0 justify-self-end px-2 text-(--color-success)" />
+                        )}
+                        {item.workspaceId && (
+                          <Button
+                            aria-label={`Edit ${item.name}`}
+                            onPress={() =>
+                              navigate(
+                                `/organization/${organizationId}/project/${projectId}/workspace/${item.workspaceId}/environment`,
+                              )
+                            }
+                            className="hide aspect-square h-5 shrink-0 items-center justify-center rounded-xs text-xs text-(--color-font) opacity-0 ring-1 ring-transparent transition-all group-hover:flex group-hover:opacity-100 group-focus:flex group-focus:opacity-100 hover:bg-(--hl-xs) focus:opacity-100 focus:ring-(--hl-md) focus:ring-inset"
+                          >
+                            <Icon icon="edit" />
+                          </Button>
+                        )}
                       </Fragment>
                     )}
                   </ListBoxItem>
                 )}
               </ListBox>
-            </div>
-          </div>
-        </Dialog>
-      </Popover>
-    </DialogTrigger>
+            </Dialog>
+          </Popover>
+        </DialogTrigger>
+      )}
+      <DialogTrigger isOpen={isOpen} onOpenChange={onOpenChange}>
+        <Button aria-label="Select an API Collection Environment" className={triggerButtonClassName}>
+          <Icon
+            icon={activeEnvironment.isPrivate ? 'lock' : 'code'}
+            style={{ color: activeEnvironment.color || '' }}
+            className="w-4 shrink-0"
+          />
+          <Tooltip position="top" message="Collection environment — used only by this API collection.">
+            <span className="truncate">{activeCollectionEnvironmentName}</span>
+          </Tooltip>
+          <Icon icon="caret-down" className="w-2.5 shrink-0 text-(--hl)" />
+        </Button>
+        <Popover className={popoverClassName} placement="bottom start" offset={8}>
+          <Dialog className="flex h-full max-h-200 w-full flex-col overflow-hidden rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) text-sm shadow-lg select-none focus:outline-hidden">
+            <Heading className={headingClassName}>
+              <Tooltip
+                position="top"
+                message="Used only by this API collection. Click the edit icon to manage its environments."
+              >
+                <span>Collection Environment</span>
+              </Tooltip>
+              <div className="flex shrink-0 items-center gap-2">
+                <Button
+                  onPress={onOpenEnvironmentSettingsModal}
+                  aria-label="Manage API collection environments"
+                  className="flex aspect-square h-6 shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent outline-hidden transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
+                >
+                  <Icon icon="edit" />
+                </Button>
+                <InheritanceTooltip />
+              </div>
+            </Heading>
+            <ListBox
+              aria-label="Select an API Collection Environment"
+              selectionMode="single"
+              key={activeEnvironment._id}
+              items={collectionEnvironmentList}
+              selectedKeys={[activeEnvironment._id || baseEnvironment._id || '']}
+              disallowEmptySelection
+              onSelectionChange={keys => {
+                if (keys === 'all' || !keys) {
+                  return;
+                }
+                const [environmentId] = keys.values();
+                setActiveEnvironmentFetcher.submit({
+                  organizationId,
+                  projectId,
+                  workspaceId,
+                  environmentId: environmentId.toString(),
+                });
+                uiEventBus.emit('CHANGE_ACTIVE_ENV', workspaceId);
+              }}
+              className={listBoxClassName}
+            >
+              {item => (
+                <ListBoxItem
+                  textValue={item.name}
+                  className={`${listBoxItemClassName} ${itemIndentClassName(item.isBase)}`}
+                >
+                  {({ isSelected }) => (
+                    <Fragment>
+                      <Icon
+                        icon={
+                          item.isPrivate
+                            ? 'lock'
+                            : isUsingGitSync
+                              ? ['fab', 'git-alt']
+                              : isUsingInsomniaCloudSync
+                                ? 'globe-americas'
+                                : 'file-arrow-down'
+                        }
+                        className="w-5 shrink-0 text-xs"
+                        style={{
+                          color: item.color ?? 'var(--color-font)',
+                        }}
+                      />
+                      <Text slot="label" className="min-w-0 flex-1 truncate">
+                        {item.name}
+                      </Text>
+                      {isSelected && (
+                        <Icon icon="check" className="shrink-0 justify-self-end px-2 text-(--color-success)" />
+                      )}
+                    </Fragment>
+                  )}
+                </ListBoxItem>
+              )}
+            </ListBox>
+          </Dialog>
+        </Popover>
+      </DialogTrigger>
+      {!isScratchpadProject && isNewProjectEnvironmentModalOpen && (
+        <NewWorkspaceModal
+          isOpen
+          project={activeProject}
+          storageRules={storageRules}
+          scope="environment"
+          source="environment-picker"
+          redirectAfterCreate={false}
+          onOpenChange={setIsNewProjectEnvironmentModalOpen}
+        />
+      )}
+    </div>
   );
 };
diff --git a/packages/insomnia/src/ui/components/first-request-creation.tsx b/packages/insomnia/src/ui/components/first-request-creation.tsx
index 6fe92dc7a4..69efb639fa 100644
--- a/packages/insomnia/src/ui/components/first-request-creation.tsx
+++ b/packages/insomnia/src/ui/components/first-request-creation.tsx
@@ -582,7 +582,7 @@ export const FirstRequestCreation = ({
             <SelectPopover
               isOpen={selectOpen}
               onOpenChange={isOpen => setSelectOpen(isOpen)}
-              ariaLabel="Select target collection"
+              ariaLabel="Select target API collection"
               placement="bottom end"
               items={collectionItems}
               selectedKey={selectedCollectionId}
@@ -593,10 +593,10 @@ export const FirstRequestCreation = ({
                 });
               }}
               title="Where should we put your request?"
-              emptyState="You have no collections, so a new one will be created for you by default."
+              emptyState="You have no API collections, so a new one will be created for you by default."
               footer={
                 <Button onPress={onCreateCollection} size="sm">
-                  New Collection
+                  New API Collection
                 </Button>
               }
               triggerClassName="h-full rounded-md px-3 text-[12px]/[18px] font-[590] data-[focus-visible=true]:!ring-0"
diff --git a/packages/insomnia/src/ui/components/header-invite-button.tsx b/packages/insomnia/src/ui/components/header-invite-button.tsx
index a9f2bd1d7f..271fd299ea 100644
--- a/packages/insomnia/src/ui/components/header-invite-button.tsx
+++ b/packages/insomnia/src/ui/components/header-invite-button.tsx
@@ -1,4 +1,5 @@
 import { getOrgUserPermissions, type Permission } from 'insomnia-api';
+import { models } from 'insomnia-data';
 import React, { useEffect, useState } from 'react';
 import { Button, Heading, Link, Radio, RadioGroup } from 'react-aria-components';
 
@@ -23,6 +24,9 @@ export const HeaderInviteButton = ({
 
   // TODO: should manage this in the scope of organization context
   useEffect(() => {
+    if (models.organization.isLocalOrganizationId(organizationId)) {
+      return;
+    }
     (async () => {
       getOrgUserPermissions({
         organizationId,
diff --git a/packages/insomnia/src/ui/components/header-plan-indicator.tsx b/packages/insomnia/src/ui/components/header-plan-indicator.tsx
index 2281adfcdf..a499100d6f 100644
--- a/packages/insomnia/src/ui/components/header-plan-indicator.tsx
+++ b/packages/insomnia/src/ui/components/header-plan-indicator.tsx
@@ -10,6 +10,7 @@ import { useTrialStartActionFetcher } from '~/routes/trial.start';
 import { Icon } from '~/ui/components/icon';
 import { TrialConfirmationModal } from '~/ui/components/modals/trial-confirmation-modal';
 import { Tooltip } from '~/ui/components/tooltip';
+import { useInvalidateAccountData } from '~/ui/hooks/use-account-server-data';
 import { usePlanData } from '~/ui/hooks/use-plan';
 import { useUserService } from '~/ui/hooks/use-user-service';
 import { formatNumber } from '~/ui/utils';
@@ -29,6 +30,7 @@ export const HeaderPlanIndicator = ({ isMinimal }: Props) => {
   const planName = `${planDisplayName} Plan`;
 
   const startFetcher = useTrialStartActionFetcher();
+  const invalidateAccountData = useInvalidateAccountData();
   const { load: usageLoad, state: usageState, data: usageData } = useResourceUsageFetcher();
 
   function handleStartTrial() {
@@ -66,8 +68,11 @@ export const HeaderPlanIndicator = ({ isMinimal }: Props) => {
   useEffect(() => {
     if (startFetcher.data?.success) {
       setCanTrial(false);
+      // trial.start wrote the new plan to localStorage; refresh the query so every
+      // plan consumer (this indicator included) reflects the upgraded plan.
+      invalidateAccountData();
     }
-  }, [startFetcher.data?.success]);
+  }, [startFetcher.data?.success, invalidateAccountData]);
 
   const isUnlimited = isEnterpriseLike;
 
diff --git a/packages/insomnia/src/ui/components/key-value-editor/key-value-editor.tsx b/packages/insomnia/src/ui/components/key-value-editor/key-value-editor.tsx
index eebe6abcd4..ea3dc241e2 100644
--- a/packages/insomnia/src/ui/components/key-value-editor/key-value-editor.tsx
+++ b/packages/insomnia/src/ui/components/key-value-editor/key-value-editor.tsx
@@ -265,25 +265,6 @@ export const KeyValueEditor: FC<Props> = ({
     },
   });
 
-  /* When the user presses a letter key and then immediately presses the space bar.
-  The keydown event for the space key was stopped from propagating during the capture phase by the ListBox component
-  That is why the inner editor fails to respond to the immediate space press behavior. 
-  Here we add a wrapper to the outer ListBox and add a wrapper to the inner editor and listen to the keydown event in both wrapper
-  When the user presses the space key, we change the event.key property with non-breakable space in the outer wrapper
-  and change it back in the inner wrapper.
-  */
-  const onKeyDownOuter = useCallback<React.KeyboardEventHandler>(event => {
-    if (event.key === ' ') {
-      event.key = '\u00A0';
-    }
-  }, []);
-
-  const onKeyDownInner = useCallback<React.KeyboardEventHandler>(event => {
-    if (event.key === '\u00A0') {
-      event.key = ' ';
-    }
-  }, []);
-
   return (
     <Fragment>
       <Toolbar className="content-box sticky top-0 z-10 flex h-(--line-height-sm) shrink-0 border-b border-(--hl-md) bg-(--color-bg) text-(--font-size-sm)">
@@ -330,6 +311,7 @@ export const KeyValueEditor: FC<Props> = ({
         <ListBox
           aria-label="Key-value pairs readonly"
           selectionMode="none"
+          disallowTypeAhead
           dependencies={[showDescription]}
           className="relative flex w-full flex-1 flex-col overflow-y-auto pt-1"
           items={initialReadOnlyItems}
@@ -433,7 +415,6 @@ export const KeyValueEditor: FC<Props> = ({
         </ListBox>
       )}
       <div
-        onKeyDownCapture={onKeyDownOuter}
         // Clicking anywhere on the blank row drops the cursor into its name editor so the
         // user can immediately start typing, unless they clicked directly on an editor or
         // control.
@@ -451,6 +432,7 @@ export const KeyValueEditor: FC<Props> = ({
         <ListBox
           aria-label="Key-value pairs"
           selectionMode="none"
+          disallowTypeAhead
           className="relative flex w-full flex-1 flex-col overflow-y-auto pt-1"
           dragAndDropHooks={dragAndDropHooks}
           dependencies={[upsertPair, showDescription, blankId]}
@@ -550,7 +532,7 @@ export const KeyValueEditor: FC<Props> = ({
                 >
                   <Icon icon="grip-vertical" className="w-2 text-(--hl)" />
                 </div>
-                <div onKeyDownCapture={onKeyDownInner}>
+                <div>
                   <OneLineEditor
                     ref={isBlank ? blankNameEditorRef : undefined}
                     id={'key-value-editor__name' + pair.id}
@@ -571,9 +553,9 @@ export const KeyValueEditor: FC<Props> = ({
                     }}
                   />
                 </div>
-                <div onKeyDownCapture={onKeyDownInner}>{valueEditor}</div>
+                <div>{valueEditor}</div>
                 {showDescription && (
-                  <div onKeyDownCapture={onKeyDownInner}>
+                  <div>
                     <OneLineEditor
                       id={'key-value-editor__description' + pair.id}
                       historyKey={'key-value-editor__description' + pair.id}
diff --git a/packages/insomnia/src/ui/components/mcp/mcp-request-pane.tsx b/packages/insomnia/src/ui/components/mcp/mcp-request-pane.tsx
index 5203caf096..198638d32e 100644
--- a/packages/insomnia/src/ui/components/mcp/mcp-request-pane.tsx
+++ b/packages/insomnia/src/ui/components/mcp/mcp-request-pane.tsx
@@ -102,7 +102,7 @@ export const McpRequestPane: FC<Props> = ({
   const { activeRequest, activeRequestMeta, requestPayload } = useRequestLoaderData()! as McpRequestLoaderData;
   const latestRequestPayloadRef = useLatest(requestPayload);
 
-  const { activeProject } = useWorkspaceLoaderData()!;
+  const { activeProject, activeGlobalEnvironment } = useWorkspaceLoaderData()!;
 
   const [mcpParams, setMcpParams] = useState<Record<string, any>>(getParamsFromPayload(requestPayload?.params));
 
@@ -123,7 +123,7 @@ export const McpRequestPane: FC<Props> = ({
 
   // Reset the response pane state when we switch requests, the environment gets modified
   // Some of the UI(tokens) depends on the readyState, so we include it here as well
-  const uniqueKey = `${environment?.modified}::${requestId}::${activeRequestMeta?.activeResponseId}::${readyState}`;
+  const uniqueKey = `${environment?._id}::${environment?.modified}::${activeGlobalEnvironment?._id}::${activeGlobalEnvironment?.modified}::${requestId}::${activeRequestMeta?.activeResponseId}::${readyState}`;
   const requestAuth = getAuthObjectOrNull(activeRequest.authentication);
   const isNoneOrInherited = requestAuth?.type === 'none' || requestAuth === null;
   const jsonSchema = useMemo(() => {
diff --git a/packages/insomnia/src/ui/components/modals/__tests__/upload-runner-data-modal.test.ts b/packages/insomnia/src/ui/components/modals/__tests__/upload-runner-data-modal.test.ts
index 7f04e576fd..e419ee2f62 100644
--- a/packages/insomnia/src/ui/components/modals/__tests__/upload-runner-data-modal.test.ts
+++ b/packages/insomnia/src/ui/components/modals/__tests__/upload-runner-data-modal.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import { genPreviewTableData } from '../upload-runner-data-modal';
+import { genPreviewTableData, parseCsvUploadData } from '../upload-runner-data-modal';
 
 describe('test generate table preview data ', () => {
   it('test normal json input', () => {
@@ -66,3 +66,55 @@ describe('test generate table preview data ', () => {
     expect(data.length).toBe(0);
   });
 });
+
+describe('parseCsvUploadData()', () => {
+  it('parses simple csv', () => {
+    expect(parseCsvUploadData('a,b\n1,2\n3,4')).toEqual({
+      headers: ['a', 'b'],
+      data: [
+        { a: '1', b: '2' },
+        { a: '3', b: '4' },
+      ],
+    });
+  });
+
+  it('keeps commas inside quoted fields', () => {
+    expect(parseCsvUploadData('origin,destination\n"New York, NY","Boston, MA"\n')).toEqual({
+      headers: ['origin', 'destination'],
+      data: [{ origin: 'New York, NY', destination: 'Boston, MA' }],
+    });
+  });
+
+  it('unescapes doubled quotes inside quoted fields', () => {
+    expect(parseCsvUploadData('name,quote\n"John ""JJ"" Smith",hello')).toEqual({
+      headers: ['name', 'quote'],
+      data: [{ name: 'John "JJ" Smith', quote: 'hello' }],
+    });
+  });
+
+  it('handles CRLF line breaks', () => {
+    expect(parseCsvUploadData('a,b\r\n1,2\r\n')).toEqual({
+      headers: ['a', 'b'],
+      data: [{ a: '1', b: '2' }],
+    });
+  });
+
+  it('handles newlines inside quoted fields', () => {
+    expect(parseCsvUploadData('a,b\n"line1\nline2",2')).toEqual({
+      headers: ['a', 'b'],
+      data: [{ a: 'line1\nline2', b: '2' }],
+    });
+  });
+
+  it('defaults missing trailing cells to empty string', () => {
+    expect(parseCsvUploadData('a,b,c\n1,2')).toEqual({
+      headers: ['a', 'b', 'c'],
+      data: [{ a: '1', b: '2', c: '' }],
+    });
+  });
+
+  it('returns null when there are fewer than two rows', () => {
+    expect(parseCsvUploadData('a,b')).toBeNull();
+    expect(parseCsvUploadData('')).toBeNull();
+  });
+});
diff --git a/packages/insomnia/src/ui/components/modals/add-request-to-collection-modal.tsx b/packages/insomnia/src/ui/components/modals/add-request-to-collection-modal.tsx
index 9f6c541d63..07183a03fa 100644
--- a/packages/insomnia/src/ui/components/modals/add-request-to-collection-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/add-request-to-collection-modal.tsx
@@ -100,7 +100,12 @@ export const AddRequestToCollectionModal: FC<AddRequestModalProps> = ({ onHide }
             <div className="form-control form-control--outlined">
               <label>
                 {strings.project.plural}:
-                <select autoFocus name="projectId" value={selectedProjectId} onChange={e => setSelectedProjectId(e.target.value)}>
+                <select
+                  autoFocus
+                  name="projectId"
+                  value={selectedProjectId}
+                  onChange={e => setSelectedProjectId(e.target.value)}
+                >
                   {projectOptions.map(project => (
                     <option key={project._id} value={project._id}>
                       {project.name}
@@ -146,7 +151,7 @@ export const AddRequestToCollectionModal: FC<AddRequestModalProps> = ({ onHide }
                   color: 'var(--color-danger)',
                 }}
               >
-                Collection is required
+                API Collection is required
               </p>
             )}
           </form>
diff --git a/packages/insomnia/src/ui/components/modals/cookies-modal.tsx b/packages/insomnia/src/ui/components/modals/cookies-modal.tsx
index a3407579d6..937c9f5b5e 100644
--- a/packages/insomnia/src/ui/components/modals/cookies-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/cookies-modal.tsx
@@ -83,6 +83,12 @@ export const CookiesModal = ({ setIsOpen }: Props) => {
     const renderedCookies: Cookie[] = [];
 
     for (const cookie of activeCookieJar?.cookies || []) {
+      // Only manually-authored cookies are passed through the template renderer; a server-set
+      // cookie's value is always used as-is.
+      if (cookie.source !== 'manual') {
+        renderedCookies.push(cookie);
+        continue;
+      }
       try {
         renderedCookies.push(await handleRender(cookie));
       } catch {
@@ -128,6 +134,7 @@ export const CookiesModal = ({ setIsOpen }: Props) => {
         path: '/',
         secure: false,
         httpOnly: false,
+        source: 'manual',
       },
       ...activeCookieJar.cookies,
     ];
@@ -137,6 +144,9 @@ export const CookiesModal = ({ setIsOpen }: Props) => {
 
   const handleCookieUpdate = (cookie: Cookie) => {
     const newCookie = clone(cookie);
+    // A save from this modal is always a deliberate local edit, even if editing a cookie a
+    // server previously set, so it's trusted going forward like any other manual cookie.
+    newCookie.source = 'manual';
 
     // transform to Date object or fallback to null
     let dateFormat = null;
@@ -301,11 +311,17 @@ const CookieList = ({ cookies, onCookieDelete, onUpdateCookie }: CookieListProps
               className="flex min-h-[40px] justify-between gap-2 rounded-xs px-2 py-1 leading-[36px] outline-hidden odd:bg-(--hl-xs)"
             >
               <span className="flex min-w-[20%] items-center leading-relaxed break-all" data-testid="cookie-domain">
-                <RenderedText>{cookie.domain || ''}</RenderedText>
+                {/* Only manually-authored cookies are passed through the template renderer;
+                    a server-set cookie's fields are always shown as-is. */}
+                {cookie.source === 'manual' ? <RenderedText>{cookie.domain || ''}</RenderedText> : cookie.domain || ''}
               </span>
               <div className="flex w-[70%] items-center leading-relaxed">
                 <div className="line-clamp-3 w-full break-all">
-                  <RenderedText>{cookieString || ''}</RenderedText>
+                  {cookie.source === 'manual' ? (
+                    <RenderedText>{cookieString || ''}</RenderedText>
+                  ) : (
+                    cookieString || ''
+                  )}
                 </div>
               </div>
               <div className="flex min-w-[10%] items-center justify-end gap-1">
diff --git a/packages/insomnia/src/ui/components/modals/import-modal/import-modal.tsx b/packages/insomnia/src/ui/components/modals/import-modal/import-modal.tsx
index e00167ada7..7a7d92c5ee 100644
--- a/packages/insomnia/src/ui/components/modals/import-modal/import-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/import-modal/import-modal.tsx
@@ -474,17 +474,22 @@ const ScanResourcesForm = ({
   const [selectedTab, setSelectedTab] = useState(from?.type || 'uri');
   const [message, setMessage] = useState('');
 
+  const fromType = from?.type;
+  const fromDefaultValue = from?.defaultValue;
   useEffect(() => {
+    // Only validate a pre-populated cURL; validating an empty value would show
+    // a spurious "Invalid cURL request" on a freshly opened, empty cURL tab.
+    if (fromType !== 'curl' || !fromDefaultValue) {
+      return;
+    }
     let isMounted = true;
-    const fn = async () => {
-      const { message: msg } = await validateCurl(from?.type === 'curl' && from.defaultValue ? from.defaultValue : '');
+    validateCurl(fromDefaultValue).then(({ message: msg }) => {
       isMounted && setMessage(msg);
-    };
-    fn();
+    });
     return () => {
       isMounted = false;
     };
-  }, [from]);
+  }, [fromType, fromDefaultValue]);
   const isValidCurl = (selectedTab === 'curl' && message && message.startsWith('Detected')) || selectedTab !== 'curl';
   return (
     <Fragment>
@@ -760,14 +765,14 @@ const ImportResourcesForm = ({
             <div className="form-row mt-2">
               <div className="form-control form-control--outlined">
                 <label>
-                  Select Collection:
+                  Select API Collection:
                   <select
-                    aria-label="Select Collection"
+                    aria-label="Select API Collection"
                     name="workspaceId"
                     value={selectedWorkspaceId}
                     onChange={e => setSelectedWorkspaceId(e.target.value)}
                   >
-                    <option value="">-- New Collection --</option>
+                    <option value="">-- New API Collection --</option>
                     {workspacesForActiveProject.map(w => (
                       <option key={w._id} value={w._id}>
                         {w.name} - {formatDistanceToNowStrict(w.lastModifiedTimestamp)}
diff --git a/packages/insomnia/src/ui/components/modals/import-modal/import-projects-modal.tsx b/packages/insomnia/src/ui/components/modals/import-modal/import-projects-modal.tsx
index cdf4db716b..1b9c599e04 100644
--- a/packages/insomnia/src/ui/components/modals/import-modal/import-projects-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/import-modal/import-projects-modal.tsx
@@ -9,13 +9,13 @@ import * as reactUse from 'react-use';
 import type { ScanResult } from '~/common/import';
 import { importScannedResources } from '~/routes/import.resources';
 import { scanImportResources } from '~/routes/import.scan';
-import { useOrganizationLoaderData } from '~/routes/organization';
 import { createProject } from '~/routes/organization.$organizationId.project.new';
 import { Checkbox } from '~/ui/components/base/checkbox';
 import { Modal, type ModalHandle } from '~/ui/components/base/modal';
 import { ModalHeader } from '~/ui/components/base/modal-header';
 import { Icon } from '~/ui/components/icon';
 import { Button } from '~/ui/components/themed-button';
+import { useOrganizations } from '~/ui/hooks/use-account-server-data';
 import { selectFileOrFolder } from '~/ui/utils/select-file-or-folder';
 
 import { showModal } from '..';
@@ -503,9 +503,9 @@ export const ImportProjectsModal = ({ organizationId, onHide }: { organizationId
     modalRef.current?.show();
   }, []);
 
-  const organizationData = useOrganizationLoaderData();
+  const organizations = useOrganizations();
   const organizationName =
-    organizationData?.organizations.find(org => org.id === organizationId)?.name || 'Organization';
+    organizations.find(org => org.id === organizationId)?.name || 'Organization';
 
   const [projectItems, setProjectItems] = useState<ProjectImportItem[]>([]);
   const [processingUIStatus, setProcessingUiStatus] = useState<'loading' | 'importing' | 'error' | 'complete'>(
diff --git a/packages/insomnia/src/ui/components/modals/import-modal/shared.tsx b/packages/insomnia/src/ui/components/modals/import-modal/shared.tsx
index ab51edc228..4feb87c38b 100644
--- a/packages/insomnia/src/ui/components/modals/import-modal/shared.tsx
+++ b/packages/insomnia/src/ui/components/modals/import-modal/shared.tsx
@@ -230,7 +230,7 @@ export const ScanResultsTable = ({ scanResults }: { scanResults: ScanResult[] })
                       </Fragment>
                     ) : (
                       <Fragment>
-                        {getImporterSign(scanResult)} resources to be imported from {scanResult.oriFileName}:
+                        {getImporterSign(scanResult)} resources to be imported{scanResult.oriFileName ? ` from ${scanResult.oriFileName}` : ''}:
                       </Fragment>
                     )}
                   </div>
diff --git a/packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx b/packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx
index cf2ce58f51..8c1c4faaa1 100644
--- a/packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx
@@ -5,10 +5,10 @@ import { Button, Dialog, Heading, Input, Modal, ModalOverlay } from 'react-aria-
 import { useRootLoaderData } from '~/root';
 import { useResetVaultKeyFetcher } from '~/routes/auth.reset-vault-key';
 import { useValidateVaultKeyActionFetcher } from '~/routes/auth.validate-vault-key';
-import { useOrganizationLoaderData } from '~/routes/organization';
 import { PromptButton } from '~/ui/components/base/prompt-button';
 import { Icon } from '~/ui/components/icon';
 import { VaultKeyDisplayInput } from '~/ui/components/settings/vault-key-panel';
+import { useOrganizations } from '~/ui/hooks/use-account-server-data';
 
 export interface InputVaultKeyModalProps {
   onClose: (vaultKey?: string) => void;
@@ -23,7 +23,7 @@ export const InputVaultKeyModal = (props: InputVaultKeyModalProps) => {
   const [resetDone, setResetDone] = useState(false);
   const resetVaultKeyFetcher = useResetVaultKeyFetcher();
   const validateVaultKeyFetcher = useValidateVaultKeyActionFetcher();
-  const { organizations } = useOrganizationLoaderData()!;
+  const organizations = useOrganizations();
   const isLoading = resetVaultKeyFetcher.state !== 'idle' || validateVaultKeyFetcher.state !== 'idle';
 
   useEffect(() => {
diff --git a/packages/insomnia/src/ui/components/modals/invite-modal/invite-form.tsx b/packages/insomnia/src/ui/components/modals/invite-modal/invite-form.tsx
index 88a411e512..5fb4aeb113 100644
--- a/packages/insomnia/src/ui/components/modals/invite-modal/invite-form.tsx
+++ b/packages/insomnia/src/ui/components/modals/invite-modal/invite-form.tsx
@@ -18,11 +18,11 @@ import { getAppWebsiteBaseURL } from '~/common/constants';
 import { docsPricingLearnMoreLink } from '~/common/documentation';
 import { debounce } from '~/common/misc';
 import { useRootLoaderData } from '~/root';
-import { useOrganizationLoaderData } from '~/routes/organization';
 import { useCollaboratorsSearchLoaderFetcher } from '~/routes/organization.$organizationId.collaborators-search';
 import { AnalyticsEvent } from '~/ui/analytics';
 import { Icon } from '~/ui/components/icon';
 import { useIsLightTheme } from '~/ui/hooks/theme';
+import { useOrganizations } from '~/ui/hooks/use-account-server-data';
 
 import { startInvite } from './encryption';
 import { OrganizationMemberRolesSelector, SELECTOR_TYPE } from './organization-member-roles-selector';
@@ -122,8 +122,8 @@ export const InviteForm = ({
   const [searchParams, setSearchParams] = useSearchParams();
 
   const { userSession } = useRootLoaderData()!;
-  const organizationData = useOrganizationLoaderData();
-  const organization = organizationData?.organizations.find(o => o.id === organizationId);
+  const organizations = useOrganizations();
+  const organization = organizations.find(o => o.id === organizationId);
   const isUserOwner = Boolean(organization?.is_owner);
   const sessionId = userSession.id;
 
diff --git a/packages/insomnia/src/ui/components/modals/invite-modal/invite-modal.tsx b/packages/insomnia/src/ui/components/modals/invite-modal/invite-modal.tsx
index c39e5fee25..1804f1088c 100644
--- a/packages/insomnia/src/ui/components/modals/invite-modal/invite-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/invite-modal/invite-modal.tsx
@@ -30,7 +30,6 @@ import { useParams, useSearchParams } from 'react-router';
 import { getAppWebsiteBaseURL } from '~/common/constants';
 import { debounce } from '~/common/misc';
 import { invariant } from '~/common/utils/invariant';
-import { useOrganizationLoaderData } from '~/routes/organization';
 import { useCollaboratorsFetcher } from '~/routes/organization.$organizationId.collaborators';
 import { useInviteFetcher } from '~/routes/organization.$organizationId.collaborators.invites.$invitationId';
 import { useReinviteFetcher } from '~/routes/organization.$organizationId.collaborators.invites.$invitationId.reinvite';
@@ -42,6 +41,7 @@ import { PromptButton } from '~/ui/components/base/prompt-button';
 import { Icon } from '~/ui/components/icon';
 import { AlertModal } from '~/ui/components/modals/alert-modal';
 import { showModal } from '~/ui/components/modals/index';
+import { useOrganizations } from '~/ui/hooks/use-account-server-data';
 
 import { InviteForm } from './invite-form';
 import { OrganizationMemberRolesSelector, SELECTOR_TYPE } from './organization-member-roles-selector';
@@ -597,8 +597,8 @@ export const InviteModalContainer: FC<{
 }> = ({ isOpen, setIsOpen }) => {
   const [loadingOrgInfo, setLoadingOrgInfo] = useState(true);
   const { organizationId } = useParams();
-  const organizationData = useOrganizationLoaderData();
-  const currentOrg = organizationData?.organizations.find(o => o.id === organizationId);
+  const organizations = useOrganizations();
+  const currentOrg = organizations.find(o => o.id === organizationId);
   const [allRoles, setAllRoles] = useState<Role[]>([]);
   const [currentUserRoleInOrg, setCurrentUserRoleInOrg] = useState<Role | null>(null);
   const [orgFeatures, setOrgFeatures] = useState<FeatureList | null>(null);
diff --git a/packages/insomnia/src/ui/components/modals/konnect-org-migration-modal.tsx b/packages/insomnia/src/ui/components/modals/konnect-org-migration-modal.tsx
new file mode 100644
index 0000000000..70b5dd5f9f
--- /dev/null
+++ b/packages/insomnia/src/ui/components/modals/konnect-org-migration-modal.tsx
@@ -0,0 +1,88 @@
+import { useState } from 'react';
+import { Button, Dialog, Heading, Modal, ModalOverlay, Radio, RadioGroup } from 'react-aria-components';
+
+import type { KonnectMigrationGroup } from '~/konnect/migrate-konnect-organization';
+import { runKonnectOrgMigration } from '~/konnect/migrate-konnect-organization';
+import { KongLogo } from '~/ui/components/kong-logo';
+
+import { Icon } from '../icon';
+
+export const KonnectOrgMigrationModal = ({
+  accountId,
+  groups,
+  onDone,
+}: {
+  accountId: string;
+  groups: KonnectMigrationGroup[];
+  onDone: () => void;
+}) => {
+  const [keepOrganizationId, setKeepOrganizationId] = useState(groups[0]?.organizationId ?? '');
+  const [isMigrating, setIsMigrating] = useState(false);
+
+  const handleConfirm = async () => {
+    setIsMigrating(true);
+    try {
+      await runKonnectOrgMigration({ accountId, keepOrganizationId });
+      onDone();
+    } finally {
+      setIsMigrating(false);
+    }
+  };
+
+  return (
+    <ModalOverlay
+      isOpen
+      className="fixed top-0 left-0 z-10 flex h-(--visual-viewport-height) w-full items-center justify-center bg-black/30"
+    >
+      <Modal className="flex w-full max-w-2xl flex-col rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) p-(--padding-lg) text-(--color-font)">
+        <Dialog className="flex h-full flex-1 flex-col overflow-hidden outline-hidden">
+          <div className="flex h-full flex-1 flex-col gap-4">
+            <div className="flex items-center gap-2">
+              <KongLogo width={20} height={20} />
+              <Heading slot="title" className="text-2xl">
+                Choose which Konnect data to keep
+              </Heading>
+            </div>
+
+            <p className="text-sm text-(--hl)">
+              Konnect data is now stored once per account in the <strong>Control Planes</strong> organization, but this
+              computer has Konnect data under more than one organization. Pick the one you want to keep Insomnia
+              connected to.
+            </p>
+
+            <RadioGroup
+              aria-label="Organization to keep"
+              value={keepOrganizationId}
+              onChange={setKeepOrganizationId}
+              className="flex flex-col gap-2"
+            >
+              {groups.map(group => (
+                <Radio
+                  key={group.organizationId}
+                  value={group.organizationId}
+                  className="flex cursor-pointer items-center justify-between gap-3 rounded-sm border border-solid border-(--hl-sm) p-3 text-sm transition-colors hover:bg-(--hl-xs) data-selected:border-(--color-surprise) data-selected:bg-(--hl-xs)"
+                >
+                  <span className="min-w-0 truncate font-semibold">{group.organizationName}</span>
+                  <span className="shrink-0 text-(--hl)">
+                    {group.projectCount} control plane(s), {group.workspaceCount} collection(s)
+                  </span>
+                </Radio>
+              ))}
+            </RadioGroup>
+
+            <div className="flex items-center justify-end gap-3 pt-2">
+              <Button
+                isDisabled={isMigrating || !keepOrganizationId}
+                onPress={handleConfirm}
+                className="flex items-center gap-2 rounded-sm bg-(--color-surprise) px-4 py-2 text-sm font-semibold text-(--color-font-surprise) transition-colors hover:brightness-110 disabled:cursor-not-allowed disabled:opacity-60"
+              >
+                {isMigrating && <Icon icon="spinner" className="animate-spin" />}
+                Keep this organization
+              </Button>
+            </div>
+          </div>
+        </Dialog>
+      </Modal>
+    </ModalOverlay>
+  );
+};
diff --git a/packages/insomnia/src/ui/components/modals/konnect-settings-modal.tsx b/packages/insomnia/src/ui/components/modals/konnect-settings-modal.tsx
index 8c4ad3395f..82b8849223 100644
--- a/packages/insomnia/src/ui/components/modals/konnect-settings-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/konnect-settings-modal.tsx
@@ -6,18 +6,22 @@ import { database } from '~/common/database';
 import { fetchKonnectOrganizationId, validatePat } from '~/konnect/api';
 import { useRootLoaderData } from '~/root';
 import { AnalyticsEvent } from '~/ui/analytics';
+import uiEventBus, { KONNECT_SYNC_TRIGGER } from '~/ui/event-bus';
 
 import { useSettingsPatcher } from '../../hooks/use-request';
 import { Icon } from '../icon';
 
 export const KonnectSettingsModal = ({
   onClose,
-  syncKonnectProjectsAndNotifyRef,
   onDisconnect,
+  konnectSyncEnabled = true,
 }: {
   onClose: () => void;
-  syncKonnectProjectsAndNotifyRef: React.MutableRefObject<(konnectOrganizationId?: string | null) => Promise<void>>;
   onDisconnect?: () => void;
+  /** Whether the account holds the Konnect control-planes entitlement. Disables "Connect & Sync"
+   * when false, mirroring the sidebar's Sync button — connecting a PAT here would validate and
+   * store it but syncing still could not run. */
+  konnectSyncEnabled?: boolean;
 }) => {
   const { settings } = useRootLoaderData()!;
   const patchSettings = useSettingsPatcher();
@@ -77,7 +81,7 @@ export const KonnectSettingsModal = ({
     await window.main.secretStorage.setSecret('konnectPat', trimmed);
     setConnectedPat(trimmed);
     patchSettings({ hasKonnectPat: true, konnectOrganizationId: orgId ?? null });
-    syncKonnectProjectsAndNotifyRef.current(orgId ?? null);
+    uiEventBus.emit(KONNECT_SYNC_TRIGGER, orgId ?? null);
     onClose();
   };
 
@@ -216,13 +220,18 @@ export const KonnectSettingsModal = ({
                         {validationError ?? 'Invalid PAT. Check your input and try again.'}
                       </p>
                     )}
+                    {!konnectSyncEnabled && (
+                      <p className="text-sm text-(--color-warning)">
+                        Your account does not have access to Konnect control planes.
+                      </p>
+                    )}
                   </div>
 
                   <div className="flex items-center gap-2">
                     <Button
                       type="submit"
                       className="rounded-xs border border-solid border-(--hl-sm) px-3 py-1.5 text-sm text-(--color-font) hover:bg-(--hl-xs) disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50"
-                      isDisabled={!pat.trim() || status === 'validating' || isPatUnchanged}
+                      isDisabled={!pat.trim() || status === 'validating' || isPatUnchanged || !konnectSyncEnabled}
                     >
                       {status === 'validating' ? <Icon icon="spinner" className="animate-spin" /> : 'Connect & Sync'}
                     </Button>
diff --git a/packages/insomnia/src/ui/components/modals/new-workspace-modal.tsx b/packages/insomnia/src/ui/components/modals/new-workspace-modal.tsx
index d87ec0feb5..8d71f84805 100644
--- a/packages/insomnia/src/ui/components/modals/new-workspace-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/new-workspace-modal.tsx
@@ -34,18 +34,18 @@ import { AnalyticsEvent } from '../../analytics';
 import { Icon } from '../icon';
 
 const titleByScope: Record<WorkspaceScope, string> = {
-  [models.workspace.WorkspaceScopeKeys.collection]: 'Request Collection',
+  [models.workspace.WorkspaceScopeKeys.collection]: 'API Collection',
   [models.workspace.WorkspaceScopeKeys.environment]: 'Environment',
   [models.workspace.WorkspaceScopeKeys.mockServer]: 'Mock Server',
-  [models.workspace.WorkspaceScopeKeys.design]: 'Design Document',
+  [models.workspace.WorkspaceScopeKeys.design]: 'API Collection',
   [models.workspace.WorkspaceScopeKeys.mcp]: 'MCP Client',
 };
 
 const defaultNameByScope: Record<WorkspaceScope, string> = {
-  [models.workspace.WorkspaceScopeKeys.collection]: 'My Collection',
+  [models.workspace.WorkspaceScopeKeys.collection]: 'My API Collection',
   [models.workspace.WorkspaceScopeKeys.environment]: 'My Environment',
   [models.workspace.WorkspaceScopeKeys.mockServer]: 'My Mock Server',
-  [models.workspace.WorkspaceScopeKeys.design]: 'My Design Document',
+  [models.workspace.WorkspaceScopeKeys.design]: 'My API Collection',
   [models.workspace.WorkspaceScopeKeys.mcp]: 'My MCP Client',
 };
 
diff --git a/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx b/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx
index fc11444061..2abf222576 100644
--- a/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx
@@ -37,6 +37,7 @@ export const NunjucksModal = forwardRef<NunjucksModalHandle, ModalProps & Props>
     onDone: () => {},
     editorId: '',
   });
+  const [isRendering, setIsRendering] = useState(false);
 
   useImperativeHandle(
     ref,
@@ -75,6 +76,7 @@ export const NunjucksModal = forwardRef<NunjucksModalHandle, ModalProps & Props>
       workspace={workspace}
       editorId={state.editorId}
       close={() => modalRef.current?.hide()}
+      onRenderingChange={isRendering => setIsRendering(isRendering)}
     />
   ) : (
     <VariableEditor onChange={handleTemplateChange} defaultValue={template} />
@@ -104,8 +106,9 @@ export const NunjucksModal = forwardRef<NunjucksModalHandle, ModalProps & Props>
         </form>
       </ModalBody>
       <ModalFooter>
-        <button className="btn" onClick={() => modalRef.current?.hide()}>
+        <button className="btn" disabled={isRendering} onClick={() => modalRef.current?.hide()}>
           Done
+          {isRendering && <i className="fa fa-spinner fa-spin ml-1.5" />}
         </button>
       </ModalFooter>
     </Modal>
diff --git a/packages/insomnia/src/ui/components/modals/upload-runner-data-modal.tsx b/packages/insomnia/src/ui/components/modals/upload-runner-data-modal.tsx
index b82885ff03..43ec5db0d9 100644
--- a/packages/insomnia/src/ui/components/modals/upload-runner-data-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/upload-runner-data-modal.tsx
@@ -1,3 +1,4 @@
+import Papa from 'papaparse';
 import React, { useEffect, useState } from 'react';
 import {
   Button,
@@ -45,6 +46,22 @@ export const genPreviewTableData = (uploadData: UploadDataType[]) => {
   return { data: filteredUploadData, headers: uniqueDataHeaders };
 };
 
+export const parseCsvUploadData = (content: string) => {
+  const csvRows = Papa.parse<string[]>(content, { skipEmptyLines: true, delimiter: ',' }).data;
+  // at least 2 rows required for csv, first row as variable names
+  if (csvRows.length < 2) {
+    return null;
+  }
+  const [csvHeaders, ...csvContentRows] = csvRows;
+  const uploadData = csvContentRows.map(contentRow =>
+    csvHeaders.reduce((acc: UploadDataType, cur, idx) => {
+      acc[cur] = contentRow[idx] ?? '';
+      return acc;
+    }, {}),
+  );
+  return { headers: csvHeaders, data: uploadData };
+};
+
 export const UploadDataModal = ({ onUploadFile, onClose, userUploadData }: UploadDataModalProps) => {
   const [file, setUploadFile] = useState<File | null>(null);
   const [uploadDataHeaders, setUploadDataHeaders] = useState<string[]>([]);
@@ -72,23 +89,10 @@ export const UploadDataModal = ({ onUploadFile, onClose, userUploadData }: Uploa
           setInvalidFileReason('Upload JSON file can not be parsed');
         }
       } else if (fileType === 'text/csv') {
-        // Replace CRLF (Windows line break) and CR (Mac link break) with \n, then split into csv arrays
-        const csvRows = content
-          .replace(/\r\n|\r/g, '\n')
-          .split('\n')
-          .map(row => row.split(','));
-        // at least 2 rows required for csv
-        if (csvRows.length > 1) {
-          const csvHeaders = csvRows[0];
-          const csvContentRows = csvRows.slice(1);
-          const uploadData = csvContentRows.map(contentRow =>
-            csvHeaders.reduce((acc: UploadDataType, cur, idx) => {
-              acc[cur] = contentRow[idx] ?? '';
-              return acc;
-            }, {}),
-          );
-          setUploadDataHeaders(csvHeaders);
-          setUploadData(uploadData);
+        const parsed = parseCsvUploadData(content);
+        if (parsed) {
+          setUploadDataHeaders(parsed.headers);
+          setUploadData(parsed.data);
         } else {
           setInvalidFileReason('CSV file must contain at least two rows with first row as variable names');
         }
diff --git a/packages/insomnia/src/ui/components/modals/workspace-duplicate-modal.tsx b/packages/insomnia/src/ui/components/modals/workspace-duplicate-modal.tsx
index 1a00a3a06a..28f4d868ca 100644
--- a/packages/insomnia/src/ui/components/modals/workspace-duplicate-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/workspace-duplicate-modal.tsx
@@ -5,8 +5,8 @@ import React, { type FC, type MouseEventHandler, useEffect, useRef, useState } f
 import { OverlayContainer } from 'react-aria';
 import { href, useNavigate, useParams } from 'react-router';
 
-import { useOrganizationLoaderData } from '~/routes/organization';
 import { useWorkspaceMoveActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.move';
+import { useOrganizations } from '~/ui/hooks/use-account-server-data';
 
 import { getWorkspaceLabel } from '../../../common/get-workspace-label';
 import { scopeToBgColorMap, scopeToIconMap, scopeToTextColorMap } from '../../../common/get-workspace-label';
@@ -26,7 +26,7 @@ export const WorkspaceDuplicateModal: FC<WorkspaceDuplicateModalProps> = ({ work
     organizationId: string;
     projectId: string;
   };
-  const organizationData = useOrganizationLoaderData();
+  const organizations = useOrganizations();
   const [selectedOrgId, setSelectedOrgId] = useState(organizationId);
   const [projectOptions, setProjectOptions] = useState<BaseModel[]>([]);
   const [selectedProjectId, setSelectedProjectId] = useState('');
@@ -115,7 +115,7 @@ export const WorkspaceDuplicateModal: FC<WorkspaceDuplicateModalProps> = ({ work
               <label>
                 Organization:
                 <select name="orgId" value={selectedOrgId} onChange={e => setSelectedOrgId(e.target.value)}>
-                  {organizationData?.organizations.map(({ id, name }) => (
+                  {organizations.map(({ id, name }) => (
                     <option key={id} value={id}>
                       {name}
                     </option>
diff --git a/packages/insomnia/src/ui/components/modals/workspace-environments-edit-modal.tsx b/packages/insomnia/src/ui/components/modals/workspace-environments-edit-modal.tsx
index a63806a62c..d1e6d15989 100644
--- a/packages/insomnia/src/ui/components/modals/workspace-environments-edit-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/workspace-environments-edit-modal.tsx
@@ -16,7 +16,6 @@ import {
   Modal,
   ModalOverlay,
   Popover,
-  Text,
   ToggleButton,
   useDragAndDrop,
 } from 'react-aria-components';
@@ -29,6 +28,7 @@ import { useEnvironmentCreateActionFetcher } from '~/routes/organization.$organi
 import { useEnvironmentDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.delete';
 import { useEnvironmentDuplicateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.duplicate';
 import { useEnvironmentUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.update';
+import { Tooltip } from '~/ui/components/tooltip';
 import { useToggleEnvironmentType } from '~/ui/hooks/use-toggle-environment-type';
 
 import { docsAfterResponseScript, docsTemplateTags } from '../../../common/documentation';
@@ -135,8 +135,8 @@ export const WorkspaceEnvironmentsEditModal = ({ onClose }: { onClose: () => voi
   }[] = [
     {
       id: 'shared',
-      name: 'Shared environment',
-      description: `${isUsingGitSync ? 'Synced with Git Sync and exportable' : isUsingInsomniaCloudSync ? 'Synced with Insomnia Sync and exportable' : 'Exportable'}`,
+      name: 'Add Sub Environment',
+      description: `Sub environments are additional nested environments that ${isUsingGitSync ? 'sync with Git Sync' : isUsingInsomniaCloudSync ? 'sync with Insomnia Sync' : 'can be exported'} and are shared with your team.`,
       icon: isUsingGitSync ? ['fab', 'git-alt'] : isUsingInsomniaCloudSync ? 'globe-americas' : 'file-arrow-down',
       action: async () => {
         createEnvironmentFetcher.submit({
@@ -152,8 +152,8 @@ export const WorkspaceEnvironmentsEditModal = ({ onClose }: { onClose: () => voi
     },
     {
       id: 'private',
-      name: 'Private environment',
-      description: 'Local and not exportable',
+      name: 'Add Private Sub Environment',
+      description: 'Private sub environments stay local to your machine and are never exported, synced, or committed.',
       icon: 'lock',
       action: async () => {
         createEnvironmentFetcher.submit({
@@ -276,144 +276,122 @@ export const WorkspaceEnvironmentsEditModal = ({ onClose }: { onClose: () => voi
                 </Button>
               </div>
               <div className="flex w-full flex-1 basis-96 divide-x divide-solid divide-(--hl-md) overflow-hidden overflow-y-auto rounded-sm border border-solid border-(--hl-sm) select-none">
-                <GridList
-                  aria-label="Environments"
-                  items={[baseEnvironment, ...subEnvironments]}
-                  className="w-full max-w-xs shrink-0 overflow-y-auto py-(--padding-xs) data-empty:py-0"
-                  disallowEmptySelection
-                  selectionMode="single"
-                  selectionBehavior="replace"
-                  selectedKeys={[selectedEnvironmentId]}
-                  dragAndDropHooks={environmentsDragAndDrop.dragAndDropHooks}
-                  onSelectionChange={keys => {
-                    if (keys !== 'all') {
-                      const [environmentId] = keys.values();
-                      setSelectedEnvironmentId(environmentId.toString());
-                    }
-                  }}
-                >
-                  {item => {
-                    return (
-                      <GridListItem
-                        key={item._id}
-                        id={item._id}
-                        textValue={item.name}
-                        className="group outline-hidden select-none"
-                      >
-                        <div
-                          className={`${item.parentId === workspaceId ? 'pl-4' : 'pl-8'} relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden pr-4 text-(--hl) outline-hidden transition-colors select-none group-hover:bg-(--hl-xs) group-focus:bg-(--hl-sm) group-aria-selected:text-(--color-font)`}
+                <div className="flex w-full max-w-xs shrink-0 flex-col overflow-hidden">
+                  <div className="flex shrink-0 flex-col gap-1 border-b border-solid border-(--hl-sm) p-1">
+                    {createEnvironmentActionsList.map(action => (
+                      <Tooltip key={action.id} position="bottom" message={action.description}>
+                        <Button
+                          aria-label={action.name}
+                          data-testid={action.id === 'private' ? 'AddPrivateSubEnvironment' : 'AddSubEnvironment'}
+                          onPress={() => action.action(baseEnvironment)}
+                          className="flex w-full items-center gap-2 rounded-xs border border-solid border-(--hl-sm) px-4 py-2 text-sm whitespace-nowrap text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset"
                         >
-                          <span className="absolute top-0 left-0 h-full w-[2px] bg-transparent transition-colors group-aria-selected:bg-(--color-surprise)" />
-                          <Icon
-                            icon={
-                              item.isPrivate
-                                ? 'lock'
-                                : isUsingGitSync
-                                  ? ['fab', 'git-alt']
-                                  : isUsingInsomniaCloudSync
-                                    ? 'globe-americas'
-                                    : 'file-arrow-down'
-                            }
-                            className="w-5"
-                            style={{
-                              color: item.color || undefined,
-                            }}
-                          />
-                          <EditableInput
-                            value={item.name}
-                            name="name"
-                            ariaLabel="Environment name"
-                            className="flex-1 px-1 hover:bg-transparent!"
-                            onSubmit={name => {
-                              name &&
-                                updateEnvironmentFetcher.submit({
-                                  organizationId,
-                                  projectId,
-                                  workspaceId,
-                                  patch: {
-                                    name,
-                                  },
-                                  environmentId: item._id,
-                                });
-                            }}
-                          />
-                          {item.parentId !== workspaceId && (
-                            <MenuTrigger>
-                              <Button
-                                aria-label="Environment Actions"
-                                className="flex aspect-square h-6 items-center justify-center rounded-xs text-sm text-(--color-font) opacity-0 ring-1 ring-transparent transition-all group-hover:opacity-100 group-focus:opacity-100 hover:bg-(--hl-xs) hover:opacity-100 focus:opacity-100 focus:ring-(--hl-md) focus:ring-inset data-pressed:bg-(--hl-sm) data-pressed:opacity-100"
-                              >
-                                <Icon icon="caret-down" />
-                              </Button>
-                              <Popover className="flex min-w-max flex-col overflow-y-hidden">
-                                <Menu
-                                  aria-label="Environment Actions menu"
-                                  selectionMode="single"
-                                  onAction={key => {
-                                    environmentActionsList.find(({ id }) => key === id)?.action(item);
-                                  }}
-                                  items={environmentActionsList}
-                                  className="min-w-max overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) py-2 text-sm shadow-lg select-none focus:outline-hidden"
+                          <Icon className="w-3.5" icon={action.icon} />
+                          <span className="truncate">{action.name}</span>
+                        </Button>
+                      </Tooltip>
+                    ))}
+                  </div>
+                  <GridList
+                    aria-label="Environments"
+                    items={[baseEnvironment, ...subEnvironments]}
+                    className="w-full flex-1 overflow-y-auto py-(--padding-xs) data-empty:py-0"
+                    disallowEmptySelection
+                    selectionMode="single"
+                    selectionBehavior="replace"
+                    selectedKeys={[selectedEnvironmentId]}
+                    dragAndDropHooks={environmentsDragAndDrop.dragAndDropHooks}
+                    onSelectionChange={keys => {
+                      if (keys !== 'all') {
+                        const [environmentId] = keys.values();
+                        setSelectedEnvironmentId(environmentId.toString());
+                      }
+                    }}
+                  >
+                    {item => {
+                      return (
+                        <GridListItem
+                          key={item._id}
+                          id={item._id}
+                          textValue={item.name}
+                          className="group outline-hidden select-none"
+                        >
+                          <div
+                            className={`${item.parentId === workspaceId ? 'pl-4' : 'pl-8'} relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden pr-4 text-(--hl) outline-hidden transition-colors select-none group-hover:bg-(--hl-xs) group-focus:bg-(--hl-sm) group-aria-selected:text-(--color-font)`}
+                          >
+                            <span className="absolute top-0 left-0 h-full w-[2px] bg-transparent transition-colors group-aria-selected:bg-(--color-surprise)" />
+                            <Icon
+                              icon={
+                                item.isPrivate
+                                  ? 'lock'
+                                  : isUsingGitSync
+                                    ? ['fab', 'git-alt']
+                                    : isUsingInsomniaCloudSync
+                                      ? 'globe-americas'
+                                      : 'file-arrow-down'
+                              }
+                              className="w-5"
+                              style={{
+                                color: item.color || undefined,
+                              }}
+                            />
+                            <EditableInput
+                              value={item.name}
+                              name="name"
+                              ariaLabel="Environment name"
+                              className="flex-1 px-1 hover:bg-transparent!"
+                              onSubmit={name => {
+                                name &&
+                                  updateEnvironmentFetcher.submit({
+                                    organizationId,
+                                    projectId,
+                                    workspaceId,
+                                    patch: {
+                                      name,
+                                    },
+                                    environmentId: item._id,
+                                  });
+                              }}
+                            />
+                            {item.parentId !== workspaceId && (
+                              <MenuTrigger>
+                                <Button
+                                  aria-label="Environment Actions"
+                                  className="flex aspect-square h-6 items-center justify-center rounded-xs text-sm text-(--color-font) opacity-0 ring-1 ring-transparent transition-all group-hover:opacity-100 group-focus:opacity-100 hover:bg-(--hl-xs) hover:opacity-100 focus:opacity-100 focus:ring-(--hl-md) focus:ring-inset data-pressed:bg-(--hl-sm) data-pressed:opacity-100"
                                 >
-                                  {item => (
-                                    <MenuItem
-                                      key={item.id}
-                                      id={item.id}
-                                      className="flex h-(--line-height-xs) w-full items-center gap-2 bg-transparent px-(--padding-md) whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden disabled:cursor-not-allowed aria-selected:font-bold"
-                                      aria-label={item.name}
-                                    >
-                                      <Icon className="w-5" icon={item.icon} />
-                                      <span>{item.name}</span>
-                                    </MenuItem>
-                                  )}
-                                </Menu>
-                              </Popover>
-                            </MenuTrigger>
-                          )}
-                          {item.parentId === workspaceId && (
-                            <MenuTrigger>
-                              <Button
-                                aria-label="Create Environment"
-                                data-testid="CreateEnvironmentDropdown"
-                                className="flex aspect-square h-6 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset data-pressed:bg-(--hl-sm)"
-                              >
-                                <Icon icon="plus-circle" />
-                              </Button>
-                              <Popover className="flex min-w-max flex-col overflow-y-hidden">
-                                <Menu
-                                  aria-label="Create Environment menu"
-                                  selectionMode="single"
-                                  onAction={key => {
-                                    createEnvironmentActionsList.find(({ id }) => key === id)?.action(item);
-                                  }}
-                                  items={createEnvironmentActionsList}
-                                  className="min-w-max overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) py-2 text-sm shadow-lg select-none focus:outline-hidden"
-                                >
-                                  {item => (
-                                    <MenuItem
-                                      key={item.id}
-                                      id={item.id}
-                                      className="flex w-full flex-col gap-1 bg-transparent px-(--padding-md) py-2 whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden disabled:cursor-not-allowed aria-selected:font-bold"
-                                      aria-label={item.name}
-                                    >
-                                      <div className="flex items-center gap-2">
+                                  <Icon icon="caret-down" />
+                                </Button>
+                                <Popover className="flex min-w-max flex-col overflow-y-hidden">
+                                  <Menu
+                                    aria-label="Environment Actions menu"
+                                    selectionMode="single"
+                                    onAction={key => {
+                                      environmentActionsList.find(({ id }) => key === id)?.action(item);
+                                    }}
+                                    items={environmentActionsList}
+                                    className="min-w-max overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) py-2 text-sm shadow-lg select-none focus:outline-hidden"
+                                  >
+                                    {item => (
+                                      <MenuItem
+                                        key={item.id}
+                                        id={item.id}
+                                        className="flex h-(--line-height-xs) w-full items-center gap-2 bg-transparent px-(--padding-md) whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden disabled:cursor-not-allowed aria-selected:font-bold"
+                                        aria-label={item.name}
+                                      >
                                         <Icon className="w-5" icon={item.icon} />
                                         <span>{item.name}</span>
-                                      </div>
-                                      <Text slot="description" className="text-xs text-(--hl)">
-                                        {item.description}
-                                      </Text>
-                                    </MenuItem>
-                                  )}
-                                </Menu>
-                              </Popover>
-                            </MenuTrigger>
-                          )}
-                        </div>
-                      </GridListItem>
-                    );
-                  }}
-                </GridList>
+                                      </MenuItem>
+                                    )}
+                                  </Menu>
+                                </Popover>
+                              </MenuTrigger>
+                            )}
+                          </div>
+                        </GridListItem>
+                      );
+                    }}
+                  </GridList>
+                </div>
                 <div className="flex flex-1 flex-col divide-y divide-solid divide-(--hl-md) overflow-hidden">
                   <div className="flex w-full items-center justify-between gap-2 overflow-hidden px-(--padding-sm)">
                     <Heading className="flex grow items-center gap-2 overflow-hidden px-4 py-2 text-lg">
diff --git a/packages/insomnia/src/ui/components/panes/no-project-view.tsx b/packages/insomnia/src/ui/components/panes/no-project-view.tsx
index 01dca4d033..ec48380c72 100644
--- a/packages/insomnia/src/ui/components/panes/no-project-view.tsx
+++ b/packages/insomnia/src/ui/components/panes/no-project-view.tsx
@@ -1,7 +1,10 @@
 import type { StorageRules } from 'insomnia-api';
+import { models } from 'insomnia-data';
 import React, { type FC } from 'react';
 import { Heading } from 'react-aria-components';
+import { useParams } from 'react-router';
 
+import { useRootLoaderData } from '~/root';
 import { useGitCredentials } from '~/ui/hooks/use-git-credentials';
 
 import { ProjectCreateForm } from '../project/project-create-form';
@@ -11,7 +14,25 @@ interface Props {
 }
 
 export const NoProjectView: FC<Props> = ({ storageRules }) => {
+  const { organizationId } = useParams() as { organizationId: string };
+  const { settings } = useRootLoaderData()!;
   const { credentials, providers } = useGitCredentials();
+
+  // Konnect projects come exclusively from sync, so there is nothing for the user to create here.
+  if (models.organization.isKonnectOrganizationId(organizationId)) {
+    return (
+      <div className="flex h-full w-full flex-col items-center gap-3 pt-[15%] text-center text-(--color-font)">
+        <span className="text-xl font-semibold">No control planes synced yet</span>
+        <span className="max-w-md text-(--hl)">
+          Projects here mirror your Konnect control planes.
+          {settings.hasKonnectPat
+            ? ' Sync from Konnect to pull them in.'
+            : ' Connect a Konnect personal access token from the sidebar to get started.'}
+        </span>
+      </div>
+    );
+  }
+
   return (
     <div className="h-full w-full overflow-y-auto text-(--color-font)">
       <div className="mx-auto flex w-[min(700px,100%)] flex-col gap-4 p-16">
diff --git a/packages/insomnia/src/ui/components/panes/request-pane.tsx b/packages/insomnia/src/ui/components/panes/request-pane.tsx
index 4ea7d6063c..9b89a1d3f7 100644
--- a/packages/insomnia/src/ui/components/panes/request-pane.tsx
+++ b/packages/insomnia/src/ui/components/panes/request-pane.tsx
@@ -77,9 +77,9 @@ export const RequestPane: FC<Props> = ({ environmentId, settings, onPaste }) =>
   };
   const gitVersion = useGitVCSVersion();
 
-  const { activeEnvironment, vcsVersion } = useWorkspaceLoaderData()!;
+  const { activeEnvironment, activeGlobalEnvironment, vcsVersion } = useWorkspaceLoaderData()!;
   // Force re-render when we switch requests, the environment gets modified, or the (Git|Sync)VCS version changes
-  const uniqueKey = `${activeEnvironment?.modified}::${requestId}::${gitVersion}::${vcsVersion}::${activeRequestMeta?.activeResponseId}`;
+  const uniqueKey = `${activeEnvironment?._id}::${activeEnvironment?.modified}::${activeGlobalEnvironment?._id}::${activeGlobalEnvironment?.modified}::${requestId}::${gitVersion}::${vcsVersion}::${activeRequestMeta?.activeResponseId}`;
 
   if (!activeRequest) {
     return <PlaceholderRequestPane />;
diff --git a/packages/insomnia/src/ui/components/panes/scratchpad-tutorial-pane.tsx b/packages/insomnia/src/ui/components/panes/scratchpad-tutorial-pane.tsx
index 95e873bb80..98dbefb726 100644
--- a/packages/insomnia/src/ui/components/panes/scratchpad-tutorial-pane.tsx
+++ b/packages/insomnia/src/ui/components/panes/scratchpad-tutorial-pane.tsx
@@ -60,7 +60,7 @@ export const ScratchPadTutorialPanel = () => {
               </Button>
             </div>
             <p className="mb-4 text-sm text-(--color-font-secondary)">
-              Create multiple collections, design APIs, MCP clients, manage projects, and collaborate with your team.
+              Create multiple API collections, MCP clients, manage projects, and collaborate with your team.
             </p>
             <Button
               onPress={handleSignUp}
diff --git a/packages/insomnia/src/ui/components/project/konnect-moved-onboarding.tsx b/packages/insomnia/src/ui/components/project/konnect-moved-onboarding.tsx
new file mode 100644
index 0000000000..d2c3ba5f31
--- /dev/null
+++ b/packages/insomnia/src/ui/components/project/konnect-moved-onboarding.tsx
@@ -0,0 +1,56 @@
+import { useEffect, useRef } from 'react';
+
+import { Icon } from '../icon';
+
+interface KonnectMovedOnboardingProps {
+  triggerElement: HTMLElement | null;
+  onDismiss: () => void;
+}
+
+export const KonnectMovedOnboarding = ({ triggerElement, onDismiss }: KonnectMovedOnboardingProps) => {
+  const popoverRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    if (!triggerElement) return;
+
+    const updatePosition = () => {
+      if (!popoverRef.current) return;
+      const triggerRect = triggerElement.getBoundingClientRect();
+      const popover = popoverRef.current;
+      popover.style.top = `${triggerRect.top}px`;
+      popover.style.left = `${triggerRect.right + 8}px`;
+    };
+
+    updatePosition();
+
+    const observer = new ResizeObserver(updatePosition);
+    observer.observe(triggerElement);
+
+    return () => observer.disconnect();
+  }, [triggerElement]);
+
+  return (
+    <div
+      ref={popoverRef}
+      className="fixed z-50 w-72 rounded-md border border-solid border-(--hl-md) bg-(--color-bg) p-4 shadow-lg"
+      role="dialog"
+      aria-label="Konnect control planes moved onboarding"
+    >
+      <div className="flex items-start justify-between gap-3">
+        <h3 className="text-sm font-semibold text-(--color-font)">Konnect control planes have moved</h3>
+        <button className="shrink-0 text-(--hl) hover:text-(--color-font)" onClick={onDismiss} aria-label="Dismiss">
+          <Icon icon="close" />
+        </button>
+      </div>
+      <p className="mt-2 text-sm text-(--hl)">
+        Switch between your local projects and integrated resources from here
+      </p>
+      <button
+        className="mt-3 rounded-md bg-(--color-surprise) px-4 py-1.5 text-sm font-medium text-(--color-font-surprise) transition-colors hover:opacity-90"
+        onClick={onDismiss}
+      >
+        Got It
+      </button>
+    </div>
+  );
+};
diff --git a/packages/insomnia/src/ui/components/project/organization-select.tsx b/packages/insomnia/src/ui/components/project/organization-select.tsx
index fdfcb282ad..43ef7f6992 100644
--- a/packages/insomnia/src/ui/components/project/organization-select.tsx
+++ b/packages/insomnia/src/ui/components/project/organization-select.tsx
@@ -1,9 +1,11 @@
 import type { CurrentPlan, Organization } from 'insomnia-api';
+import { models } from 'insomnia-data';
 import { Fragment, useEffect, useState } from 'react';
 import { Button, Input, ListBox, ListBoxItem, Popover, SearchField, Select, SelectValue } from 'react-aria-components';
 
 import { getAppWebsiteBaseURL } from '~/common/constants';
 import { getLoginUrl } from '~/ui/auth-session-provider.client';
+import { KongLogo } from '~/ui/components/kong-logo';
 import { showModal } from '~/ui/components/modals';
 import { AlertModal } from '~/ui/components/modals/alert-modal';
 
@@ -49,6 +51,7 @@ export const OrganizationSelect = ({
         value={organizationId}
       >
         <Button className="flex flex-1 items-center justify-center gap-2 rounded-xs px-4 py-1 text-sm font-bold text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)">
+          {models.organization.isKonnectOrganizationId(organizationId) && <KongLogo />}
           <SelectValue<Organization> className="flex items-center justify-center gap-2 truncate">
             {({ selectedItems }) => {
               return selectedItems?.[0]?.name || 'Select an organization';
@@ -99,6 +102,7 @@ export const OrganizationSelect = ({
               >
                 {({ isSelected }) => (
                   <Fragment>
+                    {models.organization.isKonnectOrganizationId(item.id) && <KongLogo />}
                     <span>{item.name}</span>
                     {isSelected && <Icon icon="check" className="justify-self-end text-(--color-success)" />}
                   </Fragment>
diff --git a/packages/insomnia/src/ui/components/project/project-empty-view.tsx b/packages/insomnia/src/ui/components/project/project-empty-view.tsx
index a32135a9da..a494239f6a 100644
--- a/packages/insomnia/src/ui/components/project/project-empty-view.tsx
+++ b/packages/insomnia/src/ui/components/project/project-empty-view.tsx
@@ -44,7 +44,7 @@ export const ProjectEmptyView: FC<Props> = ({
           }}
         >
           <Icon icon="file" className="text-(--font-size-xl)" />
-          Create document
+          Enter API Spec
         </Button>
         <Button
           aria-label="Import"
diff --git a/packages/insomnia/src/ui/components/project/project-type-warning.tsx b/packages/insomnia/src/ui/components/project/project-type-warning.tsx
index 8e69460253..f2050c0e6c 100644
--- a/packages/insomnia/src/ui/components/project/project-type-warning.tsx
+++ b/packages/insomnia/src/ui/components/project/project-type-warning.tsx
@@ -7,9 +7,9 @@ import { Button } from '~/basic-components/button';
 import { LearnMoreLink } from '~/basic-components/link';
 import { getAppWebsiteBaseURL } from '~/common/constants';
 import { docsPricingLearnMoreLink } from '~/common/documentation';
-import { useOrganizationLoaderData } from '~/routes/organization';
 import type { ProjectType } from '~/ui/components/project/utils';
 import { useIsLightTheme } from '~/ui/hooks/theme';
+import { useOrganizations } from '~/ui/hooks/use-account-server-data';
 
 interface Props {
   isGitSyncEnabled: boolean;
@@ -20,9 +20,9 @@ export const ProjectTypeWarning = ({ isGitSyncEnabled, storageType, storageRules
   const isLightTheme = useIsLightTheme();
   const showStorageRestrictionMessage =
     !storageRules.enableCloudSync || !storageRules.enableLocalVault || !storageRules.enableGitSync;
-  const organizationData = useOrganizationLoaderData();
+  const organizations = useOrganizations();
   const { organizationId } = useParams() as { organizationId: string };
-  const organization = organizationData?.organizations.find(o => o.id === organizationId);
+  const organization = organizations.find(o => o.id === organizationId);
   // TODO: extract to a hook later
   const isUserOwner = Boolean(organization?.is_owner);
   return (
diff --git a/packages/insomnia/src/ui/components/request-url-bar.tsx b/packages/insomnia/src/ui/components/request-url-bar.tsx
index bbfef3d411..d679aefa26 100644
--- a/packages/insomnia/src/ui/components/request-url-bar.tsx
+++ b/packages/insomnia/src/ui/components/request-url-bar.tsx
@@ -31,6 +31,7 @@ import { useInsomniaTabContext } from '../context/app/insomnia-tab-context';
 import { useReadyState } from '../hooks/use-ready-state';
 import { useRequestMetaPatcher, useRequestPatcher } from '../hooks/use-request';
 import { useTimeoutWhen } from '../hooks/use-timeout-when';
+import { useGitVCSVersion } from '../hooks/use-vcs-version';
 import { Dropdown, type DropdownHandle, DropdownItem, DropdownSection, ItemContent } from './base/dropdown';
 import { MethodSelector } from './dropdowns/method-selector';
 import { createKeybindingsHandler, useDocBodyKeyboardShortcuts } from './keydown-binder';
@@ -110,6 +111,7 @@ export const RequestUrlBar = forwardRef<RequestUrlBarHandle, Props>(
     }, [searchParams, setSearchParams]);
 
     const { activeWorkspace, activeEnvironment, activeGlobalEnvironment } = useWorkspaceLoaderData()!;
+    const gitVersion = useGitVCSVersion();
     const { settings } = useRootLoaderData()!;
     const { hotKeyRegistry } = settings;
     const {
@@ -316,9 +318,9 @@ export const RequestUrlBar = forwardRef<RequestUrlBarHandle, Props>(
           <OneLineEditor
             id="request-url-bar"
             // Remount on request switch or environment change (switch/edit) so nunjucks
-            // previews refresh. Excludes the response id / sync versions that churn on
-            // send and local edits, which used to remount and blur the editor mid-edit.
-            key={`${requestId}::${activeEnvironment?._id}::${activeEnvironment?.modified}::${activeGlobalEnvironment?._id}::${activeGlobalEnvironment?.modified}`}
+            // previews refresh. The Git version is only updated by external file
+            // sync, so it refreshes defaultValue without remounting on local edits.
+            key={`${requestId}::${activeEnvironment?._id}::${activeEnvironment?.modified}::${activeGlobalEnvironment?._id}::${activeGlobalEnvironment?.modified}::${gitVersion}`}
             // Stable across that remount, so undo history is restored from the cache.
             historyKey={historyKey}
             ref={inputRef}
diff --git a/packages/insomnia/src/ui/components/settings/__tests__/export-specification.test.ts b/packages/insomnia/src/ui/components/settings/__tests__/export-specification.test.ts
new file mode 100644
index 0000000000..37df61a9c0
--- /dev/null
+++ b/packages/insomnia/src/ui/components/settings/__tests__/export-specification.test.ts
@@ -0,0 +1,146 @@
+// @vitest-environment jsdom
+import { AnalyticsEvent } from 'insomnia/src/ui/analytics';
+import { showError, showModal } from 'insomnia/src/ui/components/modals';
+import { exportSpecificationToFile } from 'insomnia/src/ui/components/settings/import-export';
+import { services } from 'insomnia-data';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('~/root', () => ({
+  useRootLoaderData: () => ({}),
+}));
+
+vi.mock('insomnia/src/ui/components/modals', async importOriginal => {
+  const actual = await importOriginal<Record<string, unknown>>();
+  return {
+    ...actual,
+    showModal: vi.fn(),
+    showError: vi.fn(),
+  };
+});
+
+const YAML_SPEC = ['openapi: 3.0.0', 'info:', '  title: Pet Store', '  version: 1.0.0', 'paths: {}'].join('\n');
+const JSON_SPEC = JSON.stringify({ openapi: '3.0.0', info: { title: 'Pet Store', version: '1.0.0' }, paths: {} });
+
+const mockShowModal = vi.mocked(showModal);
+const mockShowError = vi.mocked(showError);
+const mockShowSaveDialog = vi.fn();
+const mockWriteFile = vi.fn();
+const mockTrackAnalyticsEvent = vi.fn();
+
+/**
+ * Drives the SelectModal shown by exportSpecificationToFile() as if the user had
+ * picked a format and pressed Done. The modal host is mocked, so we invoke the
+ * onDone callback directly.
+ */
+const selectExportFormat = async (format: 'json' | 'yaml') => {
+  const selectModalCall = mockShowModal.mock.calls.find(
+    ([, options]) => typeof (options as { onDone?: unknown })?.onDone === 'function',
+  );
+  expect(selectModalCall, 'expected a format selection modal to be shown').toBeTruthy();
+  const [, options] = selectModalCall! as unknown as [{ name?: string }, { onDone: (format: string | null) => Promise<void> }];
+  mockShowModal.mockClear();
+  await options.onDone(format);
+};
+
+const writtenFiles = () => mockWriteFile.mock.calls.map(([{ path, content }]) => ({ path, content }));
+
+describe('exportSpecificationToFile()', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    Object.assign(window, {
+      dialog: { showSaveDialog: mockShowSaveDialog },
+      main: { writeFile: mockWriteFile, trackAnalyticsEvent: mockTrackAnalyticsEvent },
+      app: { getPath: () => '/desktop' },
+      path: {
+        join: (...args: string[]) => args.join('/'),
+        dirname: (path: string) => path.slice(0, path.lastIndexOf('/')),
+      },
+    });
+    mockShowSaveDialog.mockResolvedValue({ filePath: '/tmp/export/out.yaml', canceled: false });
+    window.localStorage.clear();
+  });
+
+  it('shows an error modal when the API collection has no specification', async () => {
+    const workspace = await services.workspace.create({ name: 'Empty API Collection', scope: 'collection' });
+
+    await exportSpecificationToFile(workspace);
+    expect(mockShowModal).toHaveBeenCalledTimes(1);
+    let [, options] = mockShowModal.mock.calls[0] as unknown as [{ name?: string }, { title: string }];
+    expect(options.title).toBe('Cannot export');
+
+    // Same guard covers a spec record whose contents were cleared
+    mockShowModal.mockClear();
+    await services.apiSpec.updateOrCreateForParentId(workspace._id, { contents: '', contentType: 'yaml' });
+
+    await exportSpecificationToFile(workspace);
+    expect(mockShowModal).toHaveBeenCalledTimes(1);
+    [, options] = mockShowModal.mock.calls[0] as unknown as [{ name?: string }, { title: string }];
+    expect(options.title).toBe('Cannot export');
+  });
+
+  it('writes the spec unchanged when the requested format matches the source format', async () => {
+    const workspace = await services.workspace.create({ name: 'YAML API Collection', scope: 'collection' });
+    await services.apiSpec.updateOrCreateForParentId(workspace._id, { contents: YAML_SPEC, contentType: 'yaml' });
+
+    await exportSpecificationToFile(workspace);
+    await selectExportFormat('yaml');
+
+    expect(mockShowError).not.toHaveBeenCalled();
+    expect(writtenFiles()).toEqual([{ path: '/tmp/export/out.yaml', content: YAML_SPEC }]);
+    expect(mockTrackAnalyticsEvent).toHaveBeenCalledWith({
+      event: AnalyticsEvent.dataExport,
+      properties: { type: 'yaml', scope: 'collection' },
+    });
+  });
+
+  it('converts a YAML spec to JSON when requested', async () => {
+    const workspace = await services.workspace.create({ name: 'Converted API Collection', scope: 'collection' });
+    await services.apiSpec.updateOrCreateForParentId(workspace._id, { contents: YAML_SPEC, contentType: 'yaml' });
+
+    await exportSpecificationToFile(workspace);
+    await selectExportFormat('json');
+
+    expect(mockShowError).not.toHaveBeenCalled();
+    const [{ path, content }] = writtenFiles();
+    expect(path).toBe('/tmp/export/out.yaml');
+    expect(JSON.parse(content)).toMatchObject({ openapi: '3.0.0', info: { title: 'Pet Store' } });
+  });
+
+  it('converts a JSON spec to YAML when requested', async () => {
+    const workspace = await services.workspace.create({ name: 'JSON API Collection', scope: 'collection' });
+    await services.apiSpec.updateOrCreateForParentId(workspace._id, { contents: JSON_SPEC, contentType: 'json' });
+
+    await exportSpecificationToFile(workspace);
+    await selectExportFormat('yaml');
+
+    expect(mockShowError).not.toHaveBeenCalled();
+    const [{ content }] = writtenFiles();
+    expect(content).toContain('openapi: 3.0.0');
+    expect(content).toContain('title: Pet Store');
+  });
+
+  it('reports an error instead of writing a file when the spec cannot be converted', async () => {
+    const workspace = await services.workspace.create({ name: 'Invalid API Collection', scope: 'collection' });
+    await services.apiSpec.updateOrCreateForParentId(workspace._id, {
+      contents: 'openapi: [unclosed',
+      contentType: 'yaml',
+    });
+
+    await exportSpecificationToFile(workspace);
+    await selectExportFormat('json');
+
+    expect(mockShowError).toHaveBeenCalledTimes(1);
+    expect(mockWriteFile).not.toHaveBeenCalled();
+  });
+
+  it('does not write a file when the save dialog is cancelled', async () => {
+    const workspace = await services.workspace.create({ name: 'Cancelled API Collection', scope: 'collection' });
+    await services.apiSpec.updateOrCreateForParentId(workspace._id, { contents: YAML_SPEC, contentType: 'yaml' });
+    mockShowSaveDialog.mockResolvedValue({ filePath: undefined, canceled: true });
+
+    await exportSpecificationToFile(workspace);
+    await selectExportFormat('yaml');
+
+    expect(mockWriteFile).not.toHaveBeenCalled();
+  });
+});
diff --git a/packages/insomnia/src/ui/components/settings/general.tsx b/packages/insomnia/src/ui/components/settings/general.tsx
index a876262855..27d826cd35 100644
--- a/packages/insomnia/src/ui/components/settings/general.tsx
+++ b/packages/insomnia/src/ui/components/settings/general.tsx
@@ -53,6 +53,11 @@ export const General: FC = () => {
             setting="sidebarFocusForCollections"
             help="If checked, clicking a collection or anything inside it narrows the sidebar to that collection's contents. Otherwise the full project tree stays visible."
           />
+          <BooleanSetting
+            label="Show legacy unit tests"
+            setting="enableLegacyUnitTests"
+            help="If checked, the Tests tab will always be shown in the collection view. Otherwise, it will only be shown if the collection already has legacy tests."
+          />
         </div>
       </div>
 
diff --git a/packages/insomnia/src/ui/components/settings/import-export.tsx b/packages/insomnia/src/ui/components/settings/import-export.tsx
index 39313683eb..60df016d32 100644
--- a/packages/insomnia/src/ui/components/settings/import-export.tsx
+++ b/packages/insomnia/src/ui/components/settings/import-export.tsx
@@ -1,4 +1,8 @@
 import { format } from 'date-fns';
+import {
+  convertApiSpecSyntax,
+  detectApiSpecSyntax,
+} from 'insomnia/src/common/api-specs';
 import { getProductName } from 'insomnia/src/common/constants';
 import { getWorkspaceLabel } from 'insomnia/src/common/get-workspace-label';
 import { getInsomniaV5DataExport } from 'insomnia/src/common/insomnia-v5';
@@ -19,7 +23,6 @@ import { Button, Heading, ListBox, ListBoxItem, Popover, Select, SelectValue } f
 import { href, useParams } from 'react-router';
 
 import { useRootLoaderData } from '~/root';
-import { useOrganizationLoaderData } from '~/routes/organization';
 import { useProjectListWorkspacesLoaderFetcher } from '~/routes/organization.$organizationId.project.$projectId.list-workspaces';
 import { useProjectMoveActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.move';
 import { useProjectMoveWorkspaceActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.move-workspace';
@@ -27,10 +30,12 @@ import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.pr
 import { useUntrackedProjectsLoaderFetcher } from '~/routes/untracked-projects';
 import { AlertModal } from '~/ui/components/modals/alert-modal';
 import { ImportProjectsModal } from '~/ui/components/modals/import-modal/import-projects-modal';
+import { useOrganizations } from '~/ui/hooks/use-account-server-data';
 import { useOrganizationPermissions } from '~/ui/hooks/use-organization-features';
 import { usePlanData } from '~/ui/hooks/use-plan';
 
 const VALUE_YAML = 'yaml';
+const VALUE_JSON = 'json';
 const VALUE_HAR = 'har';
 
 export type SelectedFormat = typeof VALUE_HAR | typeof VALUE_YAML;
@@ -90,7 +95,7 @@ const showSaveExportedFileDialog = async ({
   selectedFormat,
 }: {
   exportedFileNamePrefix: string;
-  selectedFormat: SelectedFormat;
+  selectedFormat: SelectedFormat | typeof VALUE_JSON;
 }) => {
   const date = format(Date.now(), 'yyyy-MM-dd-HH-mm-ss');
   const name = exportedFileNamePrefix.replace(/ /g, '-');
@@ -359,6 +364,77 @@ export const exportRequestsToFile = (workspaceId: string, requestIds: string[])
   });
 };
 
+export const exportSpecificationToFile = async (workspace: Workspace) => {
+  const apiSpec = await services.apiSpec.getByParentId(workspace._id);
+  if (!apiSpec?.contents) {
+    showModal(AlertModal, {
+      title: 'Cannot export',
+      message: (
+        <>
+          This <strong>{getWorkspaceLabel(workspace).singular.toLowerCase()}</strong> does not contain an OpenAPI
+          specification to export.
+        </>
+      ),
+    });
+    return;
+  }
+
+  showModal(SelectModal, {
+    title: 'Select Specification Format',
+    value: VALUE_YAML,
+    options: [
+      {
+        name: 'YAML',
+        value: VALUE_YAML,
+      },
+      {
+        name: 'JSON',
+        value: VALUE_JSON,
+      },
+    ],
+    message: 'Which format would you like to export as?',
+    onDone: async selectedFormat => {
+      if (selectedFormat !== VALUE_YAML && selectedFormat !== VALUE_JSON) {
+        return;
+      }
+
+      let specification = apiSpec.contents;
+      if (detectApiSpecSyntax(specification) !== selectedFormat) {
+        try {
+          specification = convertApiSpecSyntax(specification, selectedFormat);
+        } catch {
+          showError({
+            title: 'Export Failed',
+            message: `The specification is not valid, cannot convert to ${selectedFormat.toUpperCase()}`,
+          });
+          return;
+        }
+      }
+
+      const fileName = await showSaveExportedFileDialog({
+        exportedFileNamePrefix: workspace.name,
+        selectedFormat,
+      });
+      if (!fileName) {
+        return;
+      }
+
+      try {
+        await writeExportedFileToFileSystem(fileName, specification);
+        window.main.trackAnalyticsEvent({
+          event: AnalyticsEvent.dataExport,
+          properties: { type: selectedFormat, scope: workspace.scope },
+        });
+      } catch {
+        showError({
+          title: 'Export Failed',
+          message: 'Export failed due to an unexpected error',
+        });
+      }
+    },
+  });
+};
+
 export const exportMcpClientToFile = async (workspace: Workspace) => {
   const fileName = await showSaveExportedFileDialog({
     exportedFileNamePrefix: workspace.name,
@@ -633,8 +709,7 @@ export const ImportExport: FC<Props> = ({ hideSettingsModal, onModalChange }) =>
     projectId: string;
     workspaceId?: string;
   };
-  const organizationData = useOrganizationLoaderData();
-  const organizations = organizationData?.organizations || [];
+  const organizations = useOrganizations();
 
   const { features } = useOrganizationPermissions();
   const { isEnterprisePlan } = usePlanData();
@@ -681,7 +756,7 @@ export const ImportExport: FC<Props> = ({ hideSettingsModal, onModalChange }) =>
   const projectName = activeProject?.name ?? getProductName();
   const projects = projectLoaderData?.projects || [];
   const organizationName =
-    organizationData?.organizations.find(org => org.id === organizationId)?.name || 'Organization';
+    organizations.find(org => org.id === organizationId)?.name || 'Organization';
 
   const [isImportModalOpen, setIsImportModalOpen] = useState(false);
   const [isImportProjectsModalOpen, setIsImportProjectsModalOpen] = useState(false);
diff --git a/packages/insomnia/src/ui/components/settings/scripting-settings.tsx b/packages/insomnia/src/ui/components/settings/scripting-settings.tsx
index 609b231bc8..701d95636a 100644
--- a/packages/insomnia/src/ui/components/settings/scripting-settings.tsx
+++ b/packages/insomnia/src/ui/components/settings/scripting-settings.tsx
@@ -2,6 +2,7 @@ import { Switch } from 'react-aria-components';
 
 import { useRootLoaderData } from '~/root';
 
+import { QUICKJS_SANDBOX_ENABLED } from '../../../scripting/run-script-quickjs';
 import {
   type ASTRule,
   blockedPropertyRules,
@@ -320,32 +321,34 @@ export const ScriptingSettings = () => {
         </div>
       </div>
 
-      <div className="rounded-md border border-solid border-(--hl-sm) bg-(--hl-xs) p-4">
-        <div className="flex items-center justify-between">
-          <div className="flex flex-col gap-1">
-            <span className="text-sm font-medium text-(--color-font)">
-              Use QuickJS sandbox for scripts (proof of concept)
-            </span>
-            <p className="text-xs text-(--hl)">
-              Run pre-request and after-response scripts inside the QuickJS-WASM sandbox instead of the hidden browser
-              window. Only a minimal API is supported so far (console, insomnia.environment/variables get/set, read-only
-              insomnia.request) — scripts calling insomnia.sendRequest() or insomnia.test()/pm.test() will throw. Leave
-              this off to keep using the full-featured hidden-window sandbox.
-            </p>
-          </div>
-          <Switch
-            aria-label="Use QuickJS sandbox for scripts (proof of concept)"
-            data-testid="toggle-quickjs-script-sandbox"
-            isSelected={useQuickJsScriptSandbox}
-            onChange={enabled => patchSettings({ useQuickJsScriptSandbox: enabled })}
-            className="group flex items-center gap-2"
-          >
-            <div className="flex h-6 w-11 cursor-pointer items-center rounded-full border-2 border-solid border-transparent bg-(--hl-md) transition-colors group-data-selected:bg-(--color-surprise)">
-              <span className="h-5 w-5 translate-x-0 rounded-full bg-white transition-transform group-data-selected:translate-x-5" />
+      {QUICKJS_SANDBOX_ENABLED && (
+        <div className="rounded-md border border-solid border-(--hl-sm) bg-(--hl-xs) p-4">
+          <div className="flex items-center justify-between">
+            <div className="flex flex-col gap-1">
+              <span className="text-sm font-medium text-(--color-font)">
+                Use QuickJS sandbox for scripts (proof of concept)
+              </span>
+              <p className="text-xs text-(--hl)">
+                Run pre-request and after-response scripts inside the QuickJS-WASM sandbox instead of the hidden browser
+                window. Only a minimal API is supported so far (console, insomnia.environment/variables get/set, read-only
+                insomnia.request) — scripts calling insomnia.sendRequest() or insomnia.test()/pm.test() will throw. Leave
+                this off to keep using the full-featured hidden-window sandbox.
+              </p>
             </div>
-          </Switch>
+            <Switch
+              aria-label="Use QuickJS sandbox for scripts (proof of concept)"
+              data-testid="toggle-quickjs-script-sandbox"
+              isSelected={useQuickJsScriptSandbox}
+              onChange={enabled => patchSettings({ useQuickJsScriptSandbox: enabled })}
+              className="group flex items-center gap-2"
+            >
+              <div className="flex h-6 w-11 cursor-pointer items-center rounded-full border-2 border-solid border-transparent bg-(--hl-md) transition-colors group-data-selected:bg-(--color-surprise)">
+                <span className="h-5 w-5 translate-x-0 rounded-full bg-white transition-transform group-data-selected:translate-x-5" />
+              </div>
+            </Switch>
+          </div>
         </div>
-      </div>
+      )}
 
       <div className="rounded-md border border-solid border-(--hl-sm) bg-(--hl-xs) p-4">
         <div className="flex items-center justify-between">
diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/components/index.ts b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/components/index.ts
index 107576960d..4e76eeda36 100644
--- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/components/index.ts
+++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/components/index.ts
@@ -1,3 +1,2 @@
 export { NewProjectButton } from './new-project-button';
 export { SidebarSearchField } from './sidebar-search-field';
-export { SideBarTabList } from './sidebar-tab-list';
diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/components/sidebar-tab-list.tsx b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/components/sidebar-tab-list.tsx
deleted file mode 100644
index 636cea874a..0000000000
--- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/components/sidebar-tab-list.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Tab, TabList } from 'react-aria-components';
-
-import { KongLogo } from '~/ui/components/kong-logo';
-
-export const SideBarTabList = ({
-  konnectSyncEnabled,
-  isScratchPad,
-  nonKonnectProjectLength,
-  konnectProjectsLength,
-}: {
-  konnectSyncEnabled: boolean;
-  isScratchPad: boolean;
-  nonKonnectProjectLength: number;
-  konnectProjectsLength: number;
-}) => {
-  return (
-    <TabList
-      aria-label="Sidebar navigation"
-      className="flex h-(--line-height-sm) w-full shrink-0 border-b border-solid border-b-(--hl-md)"
-    >
-      <Tab
-        id="projects"
-        className={`flex h-full shrink-0 items-center justify-between px-3 py-1 text-(--hl) outline-hidden transition-colors duration-300 select-none ${konnectSyncEnabled ? 'cursor-pointer hover:bg-(--hl-sm) hover:text-(--color-font) focus:bg-(--hl-sm) aria-selected:bg-(--hl-xs) aria-selected:text-(--color-font) aria-selected:hover:bg-(--hl-sm) aria-selected:focus:bg-(--hl-sm)' : 'text-(--color-font)!'}`}
-        data-testid="sidebar-tab-projects"
-      >
-        {isScratchPad ? 'Projects' : `Projects (${nonKonnectProjectLength})`}
-      </Tab>
-      {konnectSyncEnabled && !isScratchPad && (
-        <Tab
-          id="konnect"
-          className="flex h-full shrink-0 cursor-pointer items-center justify-between px-3 py-1 text-(--hl) outline-hidden transition-colors duration-300 select-none hover:bg-(--hl-sm) hover:text-(--color-font) focus:bg-(--hl-sm) aria-selected:bg-(--hl-xs) aria-selected:text-(--color-font) aria-selected:hover:bg-(--hl-sm) aria-selected:focus:bg-(--hl-sm)"
-          data-testid="sidebar-tab-konnect"
-        >
-          <span className="flex items-center gap-2">
-            <KongLogo />
-            Konnect ({konnectProjectsLength})
-          </span>
-        </Tab>
-      )}
-    </TabList>
-  );
-};
diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/empty-node.tsx b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/empty-node.tsx
index 783589de37..e3ecf8101c 100644
--- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/empty-node.tsx
+++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/empty-node.tsx
@@ -43,7 +43,6 @@ export const EmptyNode = ({ item, storageRules, depthOffset = 0 }: EmptyNodeProp
     isOpen: false,
   });
   const createNewCollection = () => setNewWorkspaceModalState({ scope: 'collection', isOpen: true, source: 'sidebar' });
-  const createNewDocument = () => setNewWorkspaceModalState({ scope: 'design', isOpen: true, source: 'sidebar' });
   const createNewMockServer = () =>
     setNewWorkspaceModalState({ scope: 'mock-server', isOpen: true, source: 'sidebar' });
   const createNewGlobalEnvironment = () =>
@@ -52,6 +51,7 @@ export const EmptyNode = ({ item, storageRules, depthOffset = 0 }: EmptyNodeProp
 
   const newRequestFetcher = useRequestNewActionFetcher();
   const newRequestGroupFetcher = useRequestGroupNewActionFetcher();
+
   const parentId = requestGroup?._id || workspace?._id || project._id;
 
   const createRequest = ({ requestType }: { requestType: CreateRequestType }) => {
@@ -150,18 +150,11 @@ export const EmptyNode = ({ item, storageRules, depthOffset = 0 }: EmptyNodeProp
   const createInProjectActionList: ActionItem[] = [
     {
       id: 'new-collection',
-      name: 'Request collection',
+      name: 'API Collection',
       scope: 'collection',
       icon: 'bars',
       action: createNewCollection,
     },
-    {
-      id: 'new-document',
-      name: 'Design document',
-      scope: 'design',
-      icon: 'file',
-      action: createNewDocument,
-    },
     {
       id: 'new-mcp-client',
       name: 'MCP Client',
@@ -193,7 +186,7 @@ export const EmptyNode = ({ item, storageRules, depthOffset = 0 }: EmptyNodeProp
         return 'Project is empty';
       }
       case 'emptyCollection': {
-        return 'Collection is empty';
+        return 'No requests yet';
       }
       case 'emptyFolder': {
         return 'Folder is empty';
@@ -210,7 +203,7 @@ export const EmptyNode = ({ item, storageRules, depthOffset = 0 }: EmptyNodeProp
         return 'empty project';
       }
       case 'emptyCollection': {
-        return 'empty collection';
+        return 'empty API collection';
       }
       case 'emptyFolder': {
         return 'empty folder';
@@ -243,6 +236,7 @@ export const EmptyNode = ({ item, storageRules, depthOffset = 0 }: EmptyNodeProp
       <span className={`${kind === 'emptyFolder' ? 'ml-7' : 'ml-3'} min-w-0 flex-1 truncate text-sm`}>
         {getLabel()}
       </span>
+
       <MenuTrigger>
         <Button
           aria-label={`Create in ${getAriaLabel()}`}
diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/konnect-sync-bar.tsx b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/konnect-sync-bar.tsx
new file mode 100644
index 0000000000..7fbb9c604a
--- /dev/null
+++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/konnect-sync-bar.tsx
@@ -0,0 +1,439 @@
+import { models, services } from 'insomnia-data';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { Button, Tooltip, TooltipTrigger } from 'react-aria-components';
+import { useNavigate } from 'react-router';
+import * as reactUse from 'react-use';
+
+import type { SyncResult } from '~/konnect/sync';
+import { useRootLoaderData } from '~/root';
+import { KongLogo } from '~/ui/components/kong-logo';
+import { showModal } from '~/ui/components/modals';
+import { AskModal } from '~/ui/components/modals/ask-modal';
+import { KonnectSettingsModal } from '~/ui/components/modals/konnect-settings-modal';
+import uiEventBus, { KONNECT_SYNC_TRIGGER } from '~/ui/event-bus';
+import { useKonnectSync } from '~/ui/hooks/use-konnect-sync';
+import insomniaLogo from '~/ui/images/insomnia-logo.svg';
+import { refreshKonnectAccess, useKonnectSyncEnabled } from '~/ui/organization-utils';
+
+import { Icon } from '../../icon';
+
+function getRelativeTimeString(timestamp: number, now: number = Date.now()): string {
+  const seconds = Math.floor((now - timestamp) / 1000);
+  if (seconds < 60) {
+    return `${seconds}s ago`;
+  }
+  const minutes = Math.floor(seconds / 60);
+  if (minutes < 60) {
+    return `${minutes}m ${seconds % 60}s ago`;
+  }
+  const hours = Math.floor(minutes / 60);
+  if (hours < 24) {
+    return `${hours}h ${minutes % 60}m ago`;
+  }
+  const days = Math.floor(hours / 24);
+  return `${days}d ${hours % 24}h ago`;
+}
+
+function LastSyncedLabel({ lastSyncedAt }: { lastSyncedAt: number | null }) {
+  return lastSyncedAt ? `Last synced: ${getRelativeTimeString(lastSyncedAt, Date.now())}` : 'Not yet synced';
+}
+
+interface UseKonnectSyncBarOptions {
+  organizationId: string;
+  /** Whether the Konnect organization currently has any (synced) projects. */
+  hasProjects: boolean;
+  /** Only meaningful when a sidebar tree is rendered alongside the bar — there is nothing to
+   * anchor the one-time environment-variable onboarding tooltip to otherwise. */
+  onFirstSyncEnvWorkspace?: (workspaceId: string) => void;
+  /** Only meaningful when a sidebar tree is rendered alongside the bar — there is nothing to
+   * expand when the sidebar has no tree yet. Owned by the caller since the full sidebar already
+   * keeps this in its own `useLocalStorage` state. */
+  setExpandedProjectAndWorkspaceIds?: (updater: (prev: string[] | undefined) => string[]) => void;
+}
+
+/**
+ * Owns all Konnect sync state (button/progress/last-result/settings modal) so it can be rendered
+ * both from the full sidebar (a project is selected) and the empty-state sidebar (zero projects) —
+ * the two are mutually exclusive routes, so only one KONNECT_SYNC_TRIGGER subscriber is ever mounted
+ * at a time.
+ */
+export function useKonnectSyncBar({
+  organizationId,
+  hasProjects,
+  onFirstSyncEnvWorkspace,
+  setExpandedProjectAndWorkspaceIds,
+}: UseKonnectSyncBarOptions) {
+  const navigate = useNavigate();
+  const { settings, userSession } = useRootLoaderData()!;
+  const konnectSyncEnabled = useKonnectSyncEnabled();
+  const { syncing, progress, startSync, cancelSync } = useKonnectSync();
+  const [lastSyncedAt, setLastSyncedAt] = reactUse.useLocalStorage<number | null>(
+    `${organizationId}:konnect-last-synced-at`,
+    null,
+  );
+  const [lastSyncResult, setLastSyncResult] = useState<SyncResult | null>(null);
+  const [showSyncDetails, setShowSyncDetails] = useState(false);
+  const [copiedReason, setCopiedReason] = useState<string | null>(null);
+  const [showKonnectConfigModal, setShowKonnectConfigModal] = useState(false);
+
+  const skippedRoutesByReason = useMemo(() => {
+    const map = new Map<string, string[]>();
+    for (const { routeName, reason, serviceName } of lastSyncResult?.skippedRoutes ?? []) {
+      const list = map.get(reason) ?? [];
+      list.push(`${routeName} — ${serviceName}`);
+      map.set(reason, list);
+    }
+    return map;
+  }, [lastSyncResult]);
+
+  const syncKonnectProjectsAndNotify = useCallback(async (konnectOrganizationId?: string | null) => {
+    setLastSyncResult(null);
+    const isFirstSync = lastSyncedAt == null;
+    const result = await startSync(
+      organizationId,
+      konnectOrganizationId !== undefined ? konnectOrganizationId : settings.konnectOrganizationId,
+    );
+    setLastSyncResult(result ?? null);
+    setShowSyncDetails(false);
+    setCopiedReason(null);
+    if (result?.success) {
+      setLastSyncedAt(Date.now());
+      // Navigate to and expand the first Konnect project after a successful sync
+      const allProjects = await services.project.listByOrganizationIds(organizationId);
+      const sortedKonnectProjects = models.project.sortProjects(
+        allProjects.filter(p => p.konnectControlPlaneId != null),
+      );
+      const firstKonnectProject = sortedKonnectProjects[0];
+      if (firstKonnectProject) {
+        const workspaces = await services.workspace.listByParentId(firstKonnectProject._id);
+        const envWorkspace = workspaces.find(w => w.scope === 'environment');
+        if (envWorkspace) {
+          // Show environment onboarding after first successful sync
+          if (isFirstSync) {
+            onFirstSyncEnvWorkspace?.(envWorkspace._id);
+          }
+          navigate(
+            `/organization/${organizationId}/project/${firstKonnectProject._id}/workspace/${envWorkspace._id}/environment`,
+          );
+        } else {
+          navigate(`/organization/${organizationId}/project/${firstKonnectProject._id}`);
+        }
+        setExpandedProjectAndWorkspaceIds?.(prev => {
+          const ids = prev || [];
+          return ids.includes(firstKonnectProject._id) ? ids : [...ids, firstKonnectProject._id];
+        });
+      }
+    }
+  }, [
+    lastSyncedAt,
+    startSync,
+    organizationId,
+    settings.konnectOrganizationId,
+    navigate,
+    onFirstSyncEnvWorkspace,
+    setExpandedProjectAndWorkspaceIds,
+    setLastSyncedAt,
+  ]);
+  useEffect(() => {
+    return uiEventBus.on(KONNECT_SYNC_TRIGGER, syncKonnectProjectsAndNotify);
+  }, [syncKonnectProjectsAndNotify]);
+
+  const handleSync = async () => {
+    if (!konnectSyncEnabled) {
+      return;
+    }
+
+    if (hasProjects) {
+      showModal(AskModal, {
+        title: 'Sync updates from Konnect',
+        message: (
+          <div className="flex flex-col gap-4">
+            <div className="flex items-center gap-3">
+              <div className="flex items-center gap-1">
+                <KongLogo width={20} height={20} />
+                <span className="text-sm font-medium">Konnect</span>
+              </div>
+              <span className="text-(--hl)">→</span>
+              <div className="flex items-center gap-1">
+                <img src={insomniaLogo} alt="Insomnia" className="h-5 w-5" />
+                <span className="text-sm font-medium">Insomnia</span>
+              </div>
+            </div>
+            <p className="text-sm text-(--hl)">
+              Sync the latest changes from your Konnect organization into Insomnia. This will:
+            </p>
+            <ul className="flex flex-col gap-1 text-sm">
+              <li className="flex items-start gap-2">
+                <span className="mt-1.5 h-1.5 w-1.5 shrink-0 rounded-full bg-(--color-font)" />
+                Keep your local custom changes (never pushed to Konnect)
+              </li>
+              <li className="flex items-start gap-2">
+                <span className="mt-1.5 h-1.5 w-1.5 shrink-0 rounded-full bg-(--color-font)" />
+                Update existing resources to match Konnect
+              </li>
+              <li className="flex items-start gap-2">
+                <span className="mt-1.5 h-1.5 w-1.5 shrink-0 rounded-full bg-(--color-font)" />
+                Remove collections or environments tied to control planes, services, or routes deleted in Konnect
+              </li>
+            </ul>
+          </div>
+        ),
+        yesText: 'Sync Now',
+        noText: 'Cancel',
+        color: 'surprise',
+        onDone: async (confirmed: boolean) => {
+          if (confirmed) {
+            await syncKonnectProjectsAndNotify();
+          }
+        },
+      });
+    } else {
+      await syncKonnectProjectsAndNotify();
+    }
+  };
+
+  return {
+    syncing,
+    progress,
+    cancelSync,
+    handleSync,
+    konnectSyncEnabled,
+    lastSyncedAt,
+    lastSyncResult,
+    setLastSyncResult,
+    showSyncDetails,
+    setShowSyncDetails,
+    skippedRoutesByReason,
+    copiedReason,
+    setCopiedReason,
+    showKonnectConfigModal,
+    setShowKonnectConfigModal,
+    onDisconnect: () => {
+      setLastSyncedAt(null);
+      // Removing the last Konnect projects can hide the organization itself. Navigating away from
+      // the now-invisible organization is handled declaratively by
+      // `organization.$organizationId._index.tsx`'s loader, which every "no reachable project"
+      // fallback already redirects through — not here, so it also covers deleting the last Konnect
+      // project one at a time rather than only the bulk Disconnect path.
+      refreshKonnectAccess(userSession.id, userSession.accountId, { force: true });
+    },
+  };
+}
+
+export type KonnectSyncBarState = ReturnType<typeof useKonnectSyncBar>;
+
+/** The Cancel/Sync + gear buttons — rendered inline with the sidebar's search field. */
+export function KonnectSyncActionsRow({
+  syncing,
+  cancelSync,
+  handleSync,
+  konnectSyncEnabled,
+  lastSyncedAt,
+  setShowKonnectConfigModal,
+}: KonnectSyncBarState) {
+  return (
+    <div className="flex items-center gap-1">
+      {syncing ? (
+        <Button
+          aria-label="Cancel sync"
+          onPress={cancelSync}
+          className="flex h-full items-center justify-center gap-1 rounded-xs border border-solid border-(--hl-sm) px-2 text-sm text-(--color-font) transition-all hover:bg-(--hl-xs) focus:outline-none"
+        >
+          Cancel
+          <Icon icon="stop-circle" />
+        </Button>
+      ) : (
+        <TooltipTrigger delay={300}>
+          <Button
+            aria-label="Sync Konnect"
+            onPress={handleSync}
+            isDisabled={!konnectSyncEnabled}
+            className="flex h-full items-center justify-center gap-1 rounded-xs border border-solid border-(--hl-sm) px-2 text-sm text-(--color-font) transition-all hover:bg-(--hl-xs) focus:outline-none disabled:cursor-not-allowed disabled:opacity-50"
+          >
+            <Icon icon="refresh" />
+            Sync
+          </Button>
+          <Tooltip
+            placement="bottom"
+            className="rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-3 py-1.5 text-xs text-(--color-font) shadow-lg select-none"
+          >
+            {konnectSyncEnabled ? (
+              <LastSyncedLabel lastSyncedAt={lastSyncedAt ?? null} />
+            ) : (
+              'Your account does not have access to Konnect control planes.'
+            )}
+          </Tooltip>
+        </TooltipTrigger>
+      )}
+      <Button
+        aria-label="Konnect settings"
+        onPress={() => setShowKonnectConfigModal(true)}
+        className="flex aspect-square h-full items-center justify-center rounded-xs border border-solid border-(--hl-sm) px-2 text-sm text-(--color-font) transition-all hover:bg-(--hl-xs) focus:outline-none"
+      >
+        <Icon icon="gear" />
+      </Button>
+    </div>
+  );
+}
+
+/** Sits right after the action row, mirroring where the full sidebar shows sync progress. */
+export function KonnectSyncProgressLine({ syncing, progress }: KonnectSyncBarState) {
+  if (!syncing) {
+    return null;
+  }
+  return <p className="truncate px-4 pb-1 text-xs text-(--hl) italic">{progress}</p>;
+}
+
+/** The last-sync-result panel and the Konnect settings modal (both are self-guarding, so this is
+ * safe to render unconditionally regardless of where in the layout it lands). */
+export function KonnectSyncResultPanel({
+  lastSyncResult,
+  setLastSyncResult,
+  showSyncDetails,
+  setShowSyncDetails,
+  skippedRoutesByReason,
+  copiedReason,
+  setCopiedReason,
+  showKonnectConfigModal,
+  setShowKonnectConfigModal,
+  onDisconnect,
+  konnectSyncEnabled,
+}: KonnectSyncBarState) {
+  return (
+    <>
+      {lastSyncResult && (
+        <div
+          className={`m-2 flex items-start justify-between gap-2 rounded-sm p-3 text-xs ${
+            !lastSyncResult.success
+              ? 'bg-[rgba(58,18,8,1)]'
+              : lastSyncResult.skippedRoutes.length > 0 || lastSyncResult.skippedRegions.length > 0
+                ? 'bg-[rgba(250,173,20,0.15)]'
+                : 'bg-[rgba(82,196,26,0.15)]'
+          }`}
+        >
+          <div className="flex min-w-0 items-start gap-3">
+            <Icon
+              icon={
+                lastSyncResult.success &&
+                lastSyncResult.skippedRoutes.length === 0 &&
+                lastSyncResult.skippedRegions.length === 0
+                  ? 'circle-check'
+                  : 'exclamation-triangle'
+              }
+              className={
+                lastSyncResult.success &&
+                lastSyncResult.skippedRoutes.length === 0 &&
+                lastSyncResult.skippedRegions.length === 0
+                  ? 'mt-1.5'
+                  : 'mt-1'
+              }
+            />
+            <div className="min-w-0">
+              <p className="font-semibold text-(--color-font)">
+                {lastSyncResult.success
+                  ? lastSyncResult.skippedRoutes.length > 0 || lastSyncResult.skippedRegions.length > 0
+                    ? 'Sync complete, with warnings'
+                    : 'Sync complete'
+                  : 'Sync failed'}
+              </p>
+              <p className="mt-0.5 text-(--hl)">
+                {!lastSyncResult.success
+                  ? lastSyncResult.error
+                  : lastSyncResult.routes.created === 0 &&
+                      lastSyncResult.routes.updated === 0 &&
+                      lastSyncResult.routes.deleted === 0 &&
+                      lastSyncResult.routes.skipped === 0 &&
+                      lastSyncResult.skippedRegions.length === 0
+                    ? 'Already up-to-date with Konnect.'
+                    : [
+                        lastSyncResult.routes.created > 0 && `${lastSyncResult.routes.created} request(s) added`,
+                        lastSyncResult.routes.updated > 0 && `${lastSyncResult.routes.updated} request(s) updated`,
+                        lastSyncResult.routes.deleted > 0 && `${lastSyncResult.routes.deleted} request(s) deleted`,
+                        lastSyncResult.routes.skipped > 0 && `${lastSyncResult.routes.skipped} route(s) skipped`,
+                        lastSyncResult.skippedRegions.length > 0 &&
+                          `${lastSyncResult.skippedRegions.length} region(s) skipped`,
+                      ]
+                        .filter(Boolean)
+                        .join(', ') + '.'}
+              </p>
+              {lastSyncResult.success &&
+                (lastSyncResult.skippedRoutes.length > 0 || lastSyncResult.skippedRegions.length > 0) && (
+                  <>
+                    <button
+                      className="mt-1 flex items-center gap-1 text-(--hl) hover:text-(--color-font)"
+                      onClick={() => setShowSyncDetails(prev => !prev)}
+                    >
+                      <Icon icon={showSyncDetails ? 'chevron-down' : 'chevron-right'} className="h-2.5 w-2.5" />
+                      {showSyncDetails ? 'Hide details' : 'Show details'}
+                    </button>
+                    {showSyncDetails && (
+                      <div className="mt-2 max-h-48 space-y-2 overflow-y-auto">
+                        {lastSyncResult.skippedRegions.length > 0 && (
+                          <div>
+                            <p className="text-(--hl)">Failed to fetch control planes for the following regions:</p>
+                            <ul className="mt-1 space-y-0.5 pl-3">
+                              {lastSyncResult.skippedRegions.map(r => (
+                                <li key={r} className="list-disc text-(--color-font)">
+                                  {r}
+                                </li>
+                              ))}
+                            </ul>
+                          </div>
+                        )}
+                        {[...skippedRoutesByReason.entries()].map(([reason, routes]) => {
+                          const MAX_SHOW = 5;
+                          const visible = routes.slice(0, MAX_SHOW);
+                          const extra = routes.length - MAX_SHOW;
+                          return (
+                            <div key={reason}>
+                              <p className="text-(--hl)">{reason} for the following routes:</p>
+                              <ul className="mt-1 space-y-0.5 pl-3">
+                                {visible.map(r => (
+                                  <li key={r} className="list-disc text-(--color-font)">
+                                    {r}
+                                  </li>
+                                ))}
+                              </ul>
+                              {extra > 0 && (
+                                <div className="mt-1 flex items-center gap-2 pl-3 text-(--hl)">
+                                  <span>+ {extra} more</span>
+                                  <button
+                                    className="underline hover:text-(--color-font)"
+                                    onClick={() => {
+                                      navigator.clipboard.writeText(routes.join('\n'));
+                                      setCopiedReason(reason);
+                                      setTimeout(() => setCopiedReason(null), 2000);
+                                    }}
+                                  >
+                                    {copiedReason === reason ? 'Copied' : 'Copy full list'}
+                                  </button>
+                                </div>
+                              )}
+                            </div>
+                          );
+                        })}
+                      </div>
+                    )}
+                  </>
+                )}
+            </div>
+          </div>
+          <button
+            className="-mt-2 shrink-0 text-xl text-(--hl) hover:text-(--color-font)"
+            onClick={() => setLastSyncResult(null)}
+          >
+            <Icon icon="close" />
+          </button>
+        </div>
+      )}
+
+      {showKonnectConfigModal && (
+        <KonnectSettingsModal
+          onClose={() => setShowKonnectConfigModal(false)}
+          onDisconnect={onDisconnect}
+          konnectSyncEnabled={konnectSyncEnabled}
+        />
+      )}
+    </>
+  );
+}
diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar.tsx b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar.tsx
index 36f2954b39..21aa5069fa 100644
--- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar.tsx
+++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar.tsx
@@ -4,10 +4,8 @@ import type { CollectionWorkspaceChildren, RequestGroup, Workspace } from 'insom
 import { models, services } from 'insomnia-data';
 import { fuzzyMatchAll } from 'insomnia-data/common';
 import {
-  type Dispatch,
   type ForwardedRef,
   forwardRef,
-  type SetStateAction,
   useCallback,
   useEffect,
   useImperativeHandle,
@@ -15,7 +13,7 @@ import {
   useRef,
   useState,
 } from 'react';
-import { Button, GridList, GridListItem, type Selection, Tabs, Tooltip, TooltipTrigger } from 'react-aria-components';
+import { GridList, GridListItem, type Selection, Tooltip, TooltipTrigger } from 'react-aria-components';
 import { href, useNavigate, useParams, useSearchParams } from 'react-router';
 import * as reactUse from 'react-use';
 
@@ -26,25 +24,16 @@ import type { SortOrder } from '~/common/constants';
 import { scopeToBgColorMap, scopeToIconMap, scopeToTextColorMap } from '~/common/get-workspace-label';
 import { getUnsyncedRemoteWorkspaces } from '~/common/project';
 import { sortMethodMap } from '~/common/sorting';
-import type { SyncResult } from '~/konnect/sync';
 import { useRootLoaderData } from '~/root';
 import { useProjectDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.delete';
-import { useWorkspaceUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.update';
 import { AnalyticsEvent } from '~/ui/analytics';
 import type { WorkspaceSortOrder } from '~/ui/components/dropdowns/sidebar-project-dropdown';
 import { SidebarShortcutActionsDropdown } from '~/ui/components/dropdowns/sidebar-shortcut-actions-dropdown';
 import { SidebarWorkspaceDropdown } from '~/ui/components/dropdowns/sidebar-workspace-dropdown';
 import { useKeyboardShortcuts } from '~/ui/components/keydown-binder';
-import { KongLogo } from '~/ui/components/kong-logo';
 import { showModal } from '~/ui/components/modals';
 import { AlertModal } from '~/ui/components/modals/alert-modal';
-import { AskModal } from '~/ui/components/modals/ask-modal';
-import { KonnectSettingsModal } from '~/ui/components/modals/konnect-settings-modal';
-import {
-  NewProjectButton,
-  SidebarSearchField,
-  SideBarTabList,
-} from '~/ui/components/sidebar/project-navigation-sidebar/components';
+import { NewProjectButton, SidebarSearchField } from '~/ui/components/sidebar/project-navigation-sidebar/components';
 import { EmptyNode } from '~/ui/components/sidebar/project-navigation-sidebar/empty-node';
 import { KonnectEnvOnboarding } from '~/ui/components/sidebar/project-navigation-sidebar/konnect-env-onboarding';
 import { KonnectSyncIntro } from '~/ui/components/sidebar/project-navigation-sidebar/konnect-sync-intro/konnect-sync-intro';
@@ -53,14 +42,17 @@ import { UnsyncedWorkspaceNode } from '~/ui/components/sidebar/project-navigatio
 import { useProjectNavigationSidebarData } from '~/ui/components/sidebar/project-navigation-sidebar/use-navigation-sidebar-data';
 import { useDBQueryClient } from '~/ui/context/app/insomnia-app-data-context';
 import { useTabNavigate } from '~/ui/hooks/use-insomnia-tab';
-import { useKonnectSync } from '~/ui/hooks/use-konnect-sync';
-import { useOrganizationPermissions } from '~/ui/hooks/use-organization-features';
 import { useRemoteFilesByProjectId } from '~/ui/hooks/use-remote-files';
 import { useSettingsPatcher } from '~/ui/hooks/use-request';
-import insomniaLogo from '~/ui/images/insomnia-logo.svg';
 import { isPrimaryClickModifier } from '~/ui/utils';
 
 import { Icon } from '../../icon';
+import {
+  KonnectSyncActionsRow,
+  KonnectSyncProgressLine,
+  KonnectSyncResultPanel,
+  useKonnectSyncBar,
+} from './konnect-sync-bar';
 import { getSidebarGridListItemId } from './project-navigation-sidebar-utils';
 import { ProjectNode } from './project-node';
 import { PinnedHeaderNode, RequestNode } from './request-node';
@@ -72,39 +64,13 @@ import { WorkspaceNode } from './workspace-node';
 interface ProjectNavigationSidebarProps {
   storageRules: StorageRules;
   activeNodeId?: string;
-  activeTab: ProjectNavigationSidebarTabId;
-  konnectSyncEnabled: boolean;
   onCreateProject: () => void;
-  setActiveTab: Dispatch<SetStateAction<ProjectNavigationSidebarTabId | undefined>>;
 }
 
 export interface ProjectNavigationSidebarHandle {
   expandProject: (projectId: string) => void;
 }
 
-export type ProjectNavigationSidebarTabId = 'projects' | 'konnect';
-
-function LastSyncedLabel({ lastSyncedAt }: { lastSyncedAt: number | null }) {
-  return lastSyncedAt ? `Last synced: ${getRelativeTimeString(lastSyncedAt, Date.now())}` : 'Not yet synced';
-}
-
-function getRelativeTimeString(timestamp: number, now: number = Date.now()): string {
-  const seconds = Math.floor((now - timestamp) / 1000);
-  if (seconds < 60) {
-    return `${seconds}s ago`;
-  }
-  const minutes = Math.floor(seconds / 60);
-  if (minutes < 60) {
-    return `${minutes}m ${seconds % 60}s ago`;
-  }
-  const hours = Math.floor(minutes / 60);
-  if (hours < 24) {
-    return `${hours}h ${minutes % 60}m ago`;
-  }
-  const days = Math.floor(hours / 24);
-  return `${days}d ${hours % 24}h ago`;
-}
-
 const workspaceManualSortMethod = (a: Workspace, b: Workspace, localOrder: string[]) => {
   const aIndex = localOrder.indexOf(a._id);
   const bIndex = localOrder.indexOf(b._id);
@@ -112,7 +78,7 @@ const workspaceManualSortMethod = (a: Workspace, b: Workspace, localOrder: strin
 };
 
 const ProjectNavigationSidebarInner = (
-  { storageRules, konnectSyncEnabled, onCreateProject, activeTab, setActiveTab }: ProjectNavigationSidebarProps,
+  { storageRules, onCreateProject }: ProjectNavigationSidebarProps,
   ref: ForwardedRef<ProjectNavigationSidebarHandle>,
 ) => {
   const navigate = useNavigate();
@@ -139,9 +105,6 @@ const ProjectNavigationSidebarInner = (
   const [focusedWorkspaceId, setFocusedWorkspaceId] = useState<string | null>(null);
   const [focusTransition, setFocusTransition] = useState<'none' | 'in' | 'out'>('none');
   const [isFocusedWorkspaceMenuOpen, setIsFocusedWorkspaceMenuOpen] = useState(false);
-  const [isRenamingFocusedWorkspace, setIsRenamingFocusedWorkspace] = useState(false);
-  const [renamingWorkspaceValue, setRenamingWorkspaceValue] = useState('');
-  const updateWorkspaceFetcher = useWorkspaceUpdateActionFetcher();
   const [projectWorkspaceSortOrder, setProjectWorkspaceSortOrder] = useState<Record<string, WorkspaceSortOrder>>({});
   // Customized workspace sort orders by projectId
   const [localWorkspaceOrders, setLocalWorkspaceOrders] = reactUse.useLocalStorage<Record<string, string[]>>(
@@ -152,39 +115,25 @@ const ProjectNavigationSidebarInner = (
     `${organizationId}:project-navigation-sidebar-filter`,
     '',
   );
-  const [konnectFilter, setKonnectFilter] = reactUse.useLocalStorage(
-    `${organizationId}:project-navigation-konnect-filter`,
-    '',
-  );
   const [expandedProjectAndWorkspaceIds, setExpandedProjectAndWorkspaceIds] = reactUse.useLocalStorage<string[]>(
     `${organizationId}:nav-expanded-projects-and-workspaces`,
     [],
   );
   const deleteProjectFetcher = useProjectDeleteActionFetcher();
-  const isProjectTabActive = activeTab === 'projects';
-  const { syncing, progress, startSync, cancelSync } = useKonnectSync();
-  const [lastSyncedAt, setLastSyncedAt] = reactUse.useLocalStorage<number | null>(
-    `${organizationId}:konnect-last-synced-at`,
-    null,
-  );
+  const isKonnectOrganization = models.organization.isKonnectOrganizationId(organizationId);
 
   const {
     organizationProjects,
     organizationWorkspaces,
     workspaceMetas,
-    activeProjects,
     collectionByWorkspaceIds,
     pendingCollectionWorkspaceIds,
-    nonKonnectProjects,
-    konnectProjects,
   } = useProjectNavigationSidebarData(organizationId, {
-    isProjectTabActive,
     projectNavigationSidebarFilter,
     expandedProjectAndWorkspaceIds,
   });
 
   const [filterInputValue, setFilterInputValue] = useState(projectNavigationSidebarFilter || '');
-  const [konnectFilterInputValue, setKonnectFilterInputValue] = useState(konnectFilter || '');
 
   useEffect(() => {
     // Keep input state aligned with storage only when organization context switches.
@@ -202,122 +151,23 @@ const ProjectNavigationSidebarInner = (
       }
     };
     setFilterInputValue(readLocalStorageString(`${organizationId}:project-navigation-sidebar-filter`));
-    setKonnectFilterInputValue(readLocalStorageString(`${organizationId}:project-navigation-konnect-filter`));
   }, [organizationId]);
 
   // Debounce update filter
   reactUse.useDebounce(() => setProjectNavigationSidebarFilter(filterInputValue), 300, [filterInputValue]);
-  reactUse.useDebounce(() => setKonnectFilter(konnectFilterInputValue), 300, [konnectFilterInputValue]);
-  const activeFilter = ((isProjectTabActive ? projectNavigationSidebarFilter : konnectFilter) || '').trim();
-
-  const syncKonnectProjectsAndNotifyRef = useRef<(konnectOrganizationId?: string | null) => Promise<void>>(
-    async () => {},
-  );
+  const activeFilter = (projectNavigationSidebarFilter || '').trim();
 
   const isScratchPad = activeProjectId === models.project.SCRATCHPAD_PROJECT_ID;
+  // The active project can't answer this while no project is selected, so gate the create-project
+  // affordance on the organization instead — the Scratch Pad organization never accepts new ones.
+  const isScratchPadOrganization = models.organization.isScratchpadOrganizationId(organizationId);
 
   // Unsynced remote files grouped by projectId, sourced from a shared server-data query
   // (deduped with the project view). Refresh is handled inside the hook via CLOUD_SYNC_FILE_CHANGE.
   const unsyncedFilesByProjectId = useRemoteFilesByProjectId(organizationId, organizationProjects);
 
-  const syncKonnectProjectsAndNotify = async (konnectOrganizationId?: string | null) => {
-    setLastSyncResult(null);
-    const isFirstSync = lastSyncedAt == null;
-    const result = await startSync(
-      organizationId,
-      konnectOrganizationId !== undefined ? konnectOrganizationId : settings.konnectOrganizationId,
-    );
-    setLastSyncResult(result ?? null);
-    setShowSyncDetails(false);
-    setCopiedReason(null);
-    if (result?.success) {
-      setLastSyncedAt(Date.now());
-      // Navigate to and expand the first Konnect project after a successful sync
-      const allProjects = await services.project.listByOrganizationIds(organizationId);
-      const sortedKonnectProjects = models.project.sortProjects(
-        allProjects.filter(p => p.konnectControlPlaneId != null),
-      );
-      const firstKonnectProject = sortedKonnectProjects[0];
-      if (firstKonnectProject) {
-        const workspaces = await services.workspace.listByParentId(firstKonnectProject._id);
-        const envWorkspace = workspaces.find(w => w.scope === 'environment');
-        if (envWorkspace) {
-          // Show environment onboarding after first successful sync
-          if (isFirstSync) {
-            setOnboardingEnvWorkspaceId(envWorkspace._id);
-          }
-          navigate(
-            `/organization/${organizationId}/project/${firstKonnectProject._id}/workspace/${envWorkspace._id}/environment`,
-          );
-        } else {
-          navigate(`/organization/${organizationId}/project/${firstKonnectProject._id}`);
-        }
-        setExpandedProjectAndWorkspaceIds(prev => {
-          const ids = prev || [];
-          return ids.includes(firstKonnectProject._id) ? ids : [...ids, firstKonnectProject._id];
-        });
-      }
-    }
-  };
-  syncKonnectProjectsAndNotifyRef.current = syncKonnectProjectsAndNotify;
-
-  const handleSync = async () => {
-    if (!konnectSyncEnabled) {
-      return;
-    }
-
-    const isResync = konnectProjects.length > 0;
-    if (isResync) {
-      showModal(AskModal, {
-        title: 'Sync updates from Konnect',
-        message: (
-          <div className="flex flex-col gap-4">
-            <div className="flex items-center gap-3">
-              <div className="flex items-center gap-1">
-                <KongLogo width={20} height={20} />
-                <span className="text-sm font-medium">Konnect</span>
-              </div>
-              <span className="text-(--hl)">→</span>
-              <div className="flex items-center gap-1">
-                <img src={insomniaLogo} alt="Insomnia" className="h-5 w-5" />
-                <span className="text-sm font-medium">Insomnia</span>
-              </div>
-            </div>
-            <p className="text-sm text-(--hl)">
-              Sync the latest changes from your Konnect organization into Insomnia. This will:
-            </p>
-            <ul className="flex flex-col gap-1 text-sm">
-              <li className="flex items-start gap-2">
-                <span className="mt-1.5 h-1.5 w-1.5 shrink-0 rounded-full bg-(--color-font)" />
-                Keep your local custom changes (never pushed to Konnect)
-              </li>
-              <li className="flex items-start gap-2">
-                <span className="mt-1.5 h-1.5 w-1.5 shrink-0 rounded-full bg-(--color-font)" />
-                Update existing resources to match Konnect
-              </li>
-              <li className="flex items-start gap-2">
-                <span className="mt-1.5 h-1.5 w-1.5 shrink-0 rounded-full bg-(--color-font)" />
-                Remove collections or environments tied to control planes, services, or routes deleted in Konnect
-              </li>
-            </ul>
-          </div>
-        ),
-        yesText: 'Sync Now',
-        noText: 'Cancel',
-        color: 'surprise',
-        onDone: async (confirmed: boolean) => {
-          if (confirmed) {
-            await syncKonnectProjectsAndNotify();
-          }
-        },
-      });
-    } else {
-      await syncKonnectProjectsAndNotify();
-    }
-  };
-
   useEffect(() => {
-    if (projectNavigationSidebarFilter || konnectFilter) {
+    if (projectNavigationSidebarFilter) {
       window.main.trackAnalyticsEvent({
         event: AnalyticsEvent.projectListFiltered,
         properties: {
@@ -325,7 +175,7 @@ const ProjectNavigationSidebarInner = (
         },
       });
     }
-  }, [projectNavigationSidebarFilter, konnectFilter, activeProjectId]);
+  }, [projectNavigationSidebarFilter, activeProjectId]);
 
   const flatItems = useMemo<FlatItem[]>(() => {
     const buildWorkspaceAndCollectionData = (): FlatItem[] => {
@@ -335,7 +185,7 @@ const ProjectNavigationSidebarInner = (
 
       const collectionChildrenAndMetaByWorkspaceIds = collectionByWorkspaceIds;
 
-      for (const project of activeProjects) {
+      for (const project of organizationProjects) {
         const projectId = project._id;
         const isProjectCollapsed = !(expandedProjectAndWorkspaceIds ?? []).includes(projectId);
         items.push({
@@ -397,7 +247,7 @@ const ProjectNavigationSidebarInner = (
             });
           } else {
             const { scope, _id: workspaceId } = workspace as Workspace;
-            const isCollection = scope === 'collection';
+            const isCollection = scope === 'collection' || scope === 'design';
             // Only collection workspace has nested children
             const isWorkspaceCollapsed = !(
               isCollection && (expandedProjectAndWorkspaceIds ?? []).includes(workspaceId)
@@ -570,12 +420,12 @@ const ProjectNavigationSidebarInner = (
     return buildWorkspaceAndCollectionData();
   }, [
     activeFilter,
-    activeProjects,
     collectionByWorkspaceIds,
     collectionSortOrders,
     expandedProjectAndWorkspaceIds,
     localWorkspaceOrders,
     organizationId,
+    organizationProjects,
     organizationWorkspaces,
     pendingCollectionWorkspaceIds,
     projectWorkspaceSortOrder,
@@ -691,8 +541,6 @@ const ProjectNavigationSidebarInner = (
   const clearFocusState = useCallback(() => {
     setFocusTransition('out');
     setFocusedWorkspaceId(null);
-    setIsRenamingFocusedWorkspace(false);
-    setRenamingWorkspaceValue('');
     setIsFocusedWorkspaceMenuOpen(false);
   }, []);
 
@@ -737,7 +585,7 @@ const ProjectNavigationSidebarInner = (
       return;
     }
     prevActiveWorkspaceIdRef.current = activeWorkspaceId;
-    if (workspaceItem.doc.scope === 'collection') {
+    if (workspaceItem.doc.scope === 'collection' || workspaceItem.doc.scope === 'design') {
       focusWorkspace(activeWorkspaceId, workspaceItem.project._id);
     } else {
       // Design docs, mock servers, environments etc. show the full tree.
@@ -832,6 +680,7 @@ const ProjectNavigationSidebarInner = (
         : undefined,
     [flatItems, focusedWorkspaceId],
   );
+  const focusedWorkspaceScope = focusedWorkspaceItem?.doc.scope ?? 'collection';
   // In focus mode the project + workspace rows are hidden, so strip those two
   // ancestor indent levels and let the tree indent from its first level.
   const treeDepthOffset = focusedWorkspaceId ? 2 : 0;
@@ -848,9 +697,9 @@ const ProjectNavigationSidebarInner = (
     virtualizer,
     onWorkspaceReorder: handleLocalWorkspaceReorder,
     expandedProjectAndWorkspaceIds,
+    depthOffset: treeDepthOffset,
   });
   const { selectedItemId, routeInfo } = useProjectNavigationSidebarNavigation({
-    setActiveTab,
     toggleRequestGroups,
     expandProjectOrWorkspaces,
     visibleFlatItems,
@@ -879,7 +728,7 @@ const ProjectNavigationSidebarInner = (
 
   useKeyboardShortcuts(() => parentRef.current!, {
     sidebar_showCreateDropdown: event => {
-      if (!isProjectTabActive) {
+      if (isKonnectOrganization) {
         return;
       }
 
@@ -933,11 +782,7 @@ const ProjectNavigationSidebarInner = (
   });
 
   const { hasKonnectPat } = settings;
-  const showKonnectSyncIntro = konnectSyncEnabled && !isProjectTabActive && !hasKonnectPat;
-  const [showKonnectConfigModal, setShowKonnectConfigModal] = useState(false);
-  const [lastSyncResult, setLastSyncResult] = useState<SyncResult | null>(null);
-  const [showSyncDetails, setShowSyncDetails] = useState(false);
-  const [copiedReason, setCopiedReason] = useState<string | null>(null);
+  const showKonnectSyncIntro = isKonnectOrganization && !hasKonnectPat;
   const [onboardingEnvWorkspaceId, setOnboardingEnvWorkspaceId] = useState<string | null>(null);
   const [envOnboardingNode, setEnvOnboardingNode] = useState<HTMLDivElement | null>(null);
 
@@ -945,6 +790,13 @@ const ProjectNavigationSidebarInner = (
     setOnboardingEnvWorkspaceId(null);
   }, []);
 
+  const konnectSyncBar = useKonnectSyncBar({
+    organizationId,
+    hasProjects: organizationProjects.length > 0,
+    onFirstSyncEnvWorkspace: setOnboardingEnvWorkspaceId,
+    setExpandedProjectAndWorkspaceIds,
+  });
+
   // One-time nudge explaining collection focus mode, anchored to the "back to
   // all projects" arrow (only rendered while a collection is actually focused).
   const patchSettings = useSettingsPatcher();
@@ -955,31 +807,10 @@ const ProjectNavigationSidebarInner = (
     patchSettings({ hasSeenSidebarFocusOnboarding: true });
   }, [patchSettings]);
 
-  const skippedRoutesByReason = useMemo(() => {
-    const map = new Map<string, string[]>();
-    for (const { routeName, reason, serviceName } of lastSyncResult?.skippedRoutes ?? []) {
-      const list = map.get(reason) ?? [];
-      list.push(`${routeName} — ${serviceName}`);
-      map.set(reason, list);
-    }
-    return map;
-  }, [lastSyncResult]);
-
   return (
     <div className="flex flex-1 flex-col overflow-hidden" data-testid="global-navigation-sidebar">
-      {/* In focused mode the whole sidebar belongs to the collection, so the project/konnect tabs are hidden too. */}
-      {!focusedWorkspaceId && (
-        <Tabs selectedKey={activeTab} onSelectionChange={key => setActiveTab(key as ProjectNavigationSidebarTabId)}>
-          <SideBarTabList
-            konnectSyncEnabled={konnectSyncEnabled}
-            isScratchPad={isScratchPad}
-            nonKonnectProjectLength={nonKonnectProjects.length}
-            konnectProjectsLength={konnectProjects.length}
-          />
-        </Tabs>
-      )}
       {showKonnectSyncIntro ? (
-        <KonnectSyncIntro onConfigure={() => setShowKonnectConfigModal(true)} />
+        <KonnectSyncIntro onConfigure={() => konnectSyncBar.setShowKonnectConfigModal(true)} />
       ) : (
         <>
           {focusedWorkspaceId ? (
@@ -1008,48 +839,28 @@ const ProjectNavigationSidebarInner = (
                   </Tooltip>
                 </TooltipTrigger>
                 <div
-                  className={`${scopeToBgColorMap.collection} ${scopeToTextColorMap.collection} flex h-5 w-5 shrink-0 items-center justify-center rounded-sm`}
+                  className={`${scopeToBgColorMap[focusedWorkspaceScope]} ${scopeToTextColorMap[focusedWorkspaceScope]} flex h-5 w-5 shrink-0 items-center justify-center rounded-sm`}
                 >
-                  <Icon icon={scopeToIconMap.collection} className="h-3 w-3" />
+                  <Icon icon={scopeToIconMap[focusedWorkspaceScope]} className="h-3 w-3" />
                 </div>
-                {isRenamingFocusedWorkspace ? (
-                  <input
-                    autoFocus
-                    type="text"
-                    value={renamingWorkspaceValue}
-                    onChange={e => setRenamingWorkspaceValue(e.target.value)}
-                    onFocus={e => e.currentTarget.select()}
-                    onBlur={() => {
-                      const trimmed = renamingWorkspaceValue.trim();
-                      if (focusedWorkspaceItem && trimmed && trimmed !== focusedWorkspaceItem.doc.name) {
-                        updateWorkspaceFetcher.submit({
-                          organizationId,
-                          projectId: focusedWorkspaceItem.project._id,
-                          patch: { name: trimmed, workspaceId: focusedWorkspaceItem.doc._id },
-                        });
-                      }
-                      setIsRenamingFocusedWorkspace(false);
-                    }}
-                    onKeyDown={e => {
-                      if (e.key === 'Enter') {
-                        e.currentTarget.blur();
-                      } else if (e.key === 'Escape') {
-                        setIsRenamingFocusedWorkspace(false);
-                      }
-                    }}
-                    className="min-w-0 flex-1 truncate rounded-xs bg-(--hl-sm) p-1 font-semibold text-(--color-font) focus:ring-1 focus:ring-(--color-surprise) focus:outline-none"
-                  />
-                ) : (
-                  <span
-                    onClick={() => {
-                      setRenamingWorkspaceValue(focusedWorkspaceItem?.doc.name || '');
-                      setIsRenamingFocusedWorkspace(true);
-                    }}
-                    className="flex-1 truncate rounded-xs p-1 font-semibold text-(--color-font) transition-colors hover:cursor-text hover:bg-(--hl-xs)"
-                  >
-                    {focusedWorkspaceItem?.doc.name || 'Collection'}
-                  </span>
-                )}
+                <span
+                  onClick={e => {
+                    if (focusedWorkspaceItem) {
+                      tabNavigate(
+                        {
+                          organization: organizationId,
+                          project: focusedWorkspaceItem.project,
+                          workspace: focusedWorkspaceItem.doc,
+                          item: focusedWorkspaceItem.doc,
+                        },
+                        { withTab: isPrimaryClickModifier(e), shouldNavigate: true, searchParams },
+                      );
+                    }
+                  }}
+                  className="flex-1 truncate rounded-xs p-1 font-semibold text-(--color-font) transition-colors hover:cursor-pointer hover:bg-(--hl-xs)"
+                >
+                  {focusedWorkspaceItem?.doc.name || 'API Collection'}
+                </span>
                 <div className="ml-auto shrink-0">
                   {focusedWorkspaceItem && (
                     <SidebarWorkspaceDropdown
@@ -1060,6 +871,7 @@ const ProjectNavigationSidebarInner = (
                       onSortOrderChange={(newOrder: SortOrder) => {
                         setCollectionSortOrders(prev => ({ ...prev, [focusedWorkspaceId]: newOrder }));
                       }}
+                      forceShowTrigger
                       isOpen={isFocusedWorkspaceMenuOpen}
                       onOpenChange={setIsFocusedWorkspaceMenuOpen}
                     />
@@ -1073,58 +885,19 @@ const ProjectNavigationSidebarInner = (
           ) : (
             <div className="flex justify-between gap-1 p-(--padding-sm)">
               <SidebarSearchField
-                value={isProjectTabActive ? filterInputValue : konnectFilterInputValue}
+                value={filterInputValue}
                 isDisabled={organizationProjects.length === 0}
-                onChange={isProjectTabActive ? setFilterInputValue : setKonnectFilterInputValue}
+                onChange={setFilterInputValue}
               />
-              {isProjectTabActive ? (
-                !isScratchPad && (
-                  <NewProjectButton onPress={onCreateProject} isDisabled={organizationProjects.length === 0} />
-                )
+              {isKonnectOrganization ? (
+                <KonnectSyncActionsRow {...konnectSyncBar} />
               ) : (
-                <div className="flex items-center gap-1">
-                  {syncing ? (
-                    <Button
-                      aria-label="Cancel sync"
-                      onPress={cancelSync}
-                      className="flex h-full items-center justify-center gap-1 rounded-xs border border-solid border-(--hl-sm) px-2 text-sm text-(--color-font) transition-all hover:bg-(--hl-xs) focus:outline-none"
-                    >
-                      Cancel
-                      <Icon icon="stop-circle" />
-                    </Button>
-                  ) : (
-                    <TooltipTrigger delay={300}>
-                      <Button
-                        aria-label="Sync Konnect"
-                        onPress={handleSync}
-                        className="flex h-full items-center justify-center gap-1 rounded-xs border border-solid border-(--hl-sm) px-2 text-sm text-(--color-font) transition-all hover:bg-(--hl-xs) focus:outline-none"
-                      >
-                        <Icon icon="refresh" />
-                        Sync
-                      </Button>
-                      <Tooltip
-                        placement="bottom"
-                        className="rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-3 py-1.5 text-xs text-(--color-font) shadow-lg select-none"
-                      >
-                        <LastSyncedLabel lastSyncedAt={lastSyncedAt ?? null} />
-                      </Tooltip>
-                    </TooltipTrigger>
-                  )}
-                  <Button
-                    aria-label="Konnect settings"
-                    onPress={() => setShowKonnectConfigModal(true)}
-                    className="flex aspect-square h-full items-center justify-center rounded-xs border border-solid border-(--hl-sm) px-2 text-sm text-(--color-font) transition-all hover:bg-(--hl-xs) focus:outline-none"
-                  >
-                    <Icon icon="gear" />
-                  </Button>
-                </div>
+                !isScratchPadOrganization && <NewProjectButton onPress={onCreateProject} />
               )}
             </div>
           )}
 
-          {!isProjectTabActive && syncing && (
-            <p className="truncate px-4 pb-1 text-xs text-(--hl) italic">{progress}</p>
-          )}
+          {isKonnectOrganization && <KonnectSyncProgressLine {...konnectSyncBar} />}
 
           <div
             ref={parentRef}
@@ -1262,6 +1035,20 @@ const ProjectNavigationSidebarInner = (
                           if (docId === onboardingEnvWorkspaceId) {
                             dismissEnvOnboarding();
                           }
+                        } else if (item.kind === 'emptyCollection') {
+                          const emptyCollectionWorkspace = item.workspace;
+                          if (emptyCollectionWorkspace) {
+                            focusWorkspace(emptyCollectionWorkspace._id, item.project._id);
+                            tabNavigate(
+                              {
+                                organization: organizationId,
+                                project: item.project,
+                                workspace: emptyCollectionWorkspace,
+                                item: emptyCollectionWorkspace,
+                              },
+                              { withTab: isPrimaryClickModifier(e), shouldNavigate: true, searchParams },
+                            );
+                          }
                         } else if (item.kind === 'collectionChild' || item.kind === 'pinnedRequest') {
                           // Clicking anything inside a collection (folder, request, etc.) focuses it.
                           // Guard so re-clicking within an already-focused collection doesn't replay the transition.
@@ -1385,141 +1172,14 @@ const ProjectNavigationSidebarInner = (
             />
           )}
 
-          {!isProjectTabActive && lastSyncResult && (
-            <div
-              className={`m-2 flex items-start justify-between gap-2 rounded-sm p-3 text-xs ${
-                !lastSyncResult.success
-                  ? 'bg-[rgba(58,18,8,1)]'
-                  : lastSyncResult.skippedRoutes.length > 0 || lastSyncResult.skippedRegions.length > 0
-                    ? 'bg-[rgba(250,173,20,0.15)]'
-                    : 'bg-[rgba(82,196,26,0.15)]'
-              }`}
-            >
-              <div className="flex min-w-0 items-start gap-3">
-                <Icon
-                  icon={
-                    lastSyncResult.success &&
-                    lastSyncResult.skippedRoutes.length === 0 &&
-                    lastSyncResult.skippedRegions.length === 0
-                      ? 'circle-check'
-                      : 'exclamation-triangle'
-                  }
-                  className={
-                    lastSyncResult.success &&
-                    lastSyncResult.skippedRoutes.length === 0 &&
-                    lastSyncResult.skippedRegions.length === 0
-                      ? 'mt-1.5'
-                      : 'mt-1'
-                  }
-                />
-                <div className="min-w-0">
-                  <p className="font-semibold text-(--color-font)">
-                    {lastSyncResult.success
-                      ? lastSyncResult.skippedRoutes.length > 0 || lastSyncResult.skippedRegions.length > 0
-                        ? 'Sync complete, with warnings'
-                        : 'Sync complete'
-                      : 'Sync failed'}
-                  </p>
-                  <p className="mt-0.5 text-(--hl)">
-                    {!lastSyncResult.success
-                      ? lastSyncResult.error
-                      : lastSyncResult.routes.created === 0 &&
-                          lastSyncResult.routes.updated === 0 &&
-                          lastSyncResult.routes.deleted === 0 &&
-                          lastSyncResult.routes.skipped === 0 &&
-                          lastSyncResult.skippedRegions.length === 0
-                        ? 'Already up-to-date with Konnect.'
-                        : [
-                            lastSyncResult.routes.created > 0 && `${lastSyncResult.routes.created} request(s) added`,
-                            lastSyncResult.routes.updated > 0 && `${lastSyncResult.routes.updated} request(s) updated`,
-                            lastSyncResult.routes.deleted > 0 && `${lastSyncResult.routes.deleted} request(s) deleted`,
-                            lastSyncResult.routes.skipped > 0 && `${lastSyncResult.routes.skipped} route(s) skipped`,
-                            lastSyncResult.skippedRegions.length > 0 &&
-                              `${lastSyncResult.skippedRegions.length} region(s) skipped`,
-                          ]
-                            .filter(Boolean)
-                            .join(', ') + '.'}
-                  </p>
-                  {lastSyncResult.success &&
-                    (lastSyncResult.skippedRoutes.length > 0 || lastSyncResult.skippedRegions.length > 0) && (
-                      <>
-                        <button
-                          className="mt-1 flex items-center gap-1 text-(--hl) hover:text-(--color-font)"
-                          onClick={() => setShowSyncDetails(prev => !prev)}
-                        >
-                          <Icon icon={showSyncDetails ? 'chevron-down' : 'chevron-right'} className="h-2.5 w-2.5" />
-                          {showSyncDetails ? 'Hide details' : 'Show details'}
-                        </button>
-                        {showSyncDetails && (
-                          <div className="mt-2 max-h-48 space-y-2 overflow-y-auto">
-                            {lastSyncResult.skippedRegions.length > 0 && (
-                              <div>
-                                <p className="text-(--hl)">Failed to fetch control planes for the following regions:</p>
-                                <ul className="mt-1 space-y-0.5 pl-3">
-                                  {lastSyncResult.skippedRegions.map(r => (
-                                    <li key={r} className="list-disc text-(--color-font)">
-                                      {r}
-                                    </li>
-                                  ))}
-                                </ul>
-                              </div>
-                            )}
-                            {[...skippedRoutesByReason.entries()].map(([reason, routes]) => {
-                              const MAX_SHOW = 5;
-                              const visible = routes.slice(0, MAX_SHOW);
-                              const extra = routes.length - MAX_SHOW;
-                              return (
-                                <div key={reason}>
-                                  <p className="text-(--hl)">{reason} for the following routes:</p>
-                                  <ul className="mt-1 space-y-0.5 pl-3">
-                                    {visible.map(r => (
-                                      <li key={r} className="list-disc text-(--color-font)">
-                                        {r}
-                                      </li>
-                                    ))}
-                                  </ul>
-                                  {extra > 0 && (
-                                    <div className="mt-1 flex items-center gap-2 pl-3 text-(--hl)">
-                                      <span>+ {extra} more</span>
-                                      <button
-                                        className="underline hover:text-(--color-font)"
-                                        onClick={() => {
-                                          navigator.clipboard.writeText(routes.join('\n'));
-                                          setCopiedReason(reason);
-                                          setTimeout(() => setCopiedReason(null), 2000);
-                                        }}
-                                      >
-                                        {copiedReason === reason ? 'Copied' : 'Copy full list'}
-                                      </button>
-                                    </div>
-                                  )}
-                                </div>
-                              );
-                            })}
-                          </div>
-                        )}
-                      </>
-                    )}
-                </div>
-              </div>
-              <button
-                className="-mt-2 shrink-0 text-xl text-(--hl) hover:text-(--color-font)"
-                onClick={() => setLastSyncResult(null)}
-              >
-                <Icon icon="close" />
-              </button>
-            </div>
-          )}
         </>
       )}
 
-      {showKonnectConfigModal && (
-        <KonnectSettingsModal
-          onClose={() => setShowKonnectConfigModal(false)}
-          syncKonnectProjectsAndNotifyRef={syncKonnectProjectsAndNotifyRef}
-          onDisconnect={() => setLastSyncedAt(null)}
-        />
-      )}
+      {/* Outside the branch above on purpose: this hosts the Konnect settings modal, and the
+          intro branch's "Configure" button is what opens it. Nesting it in the else branch made
+          that button set state nothing rendered, which is unrecoverable for an organization that
+          has Konnect projects but no PAT. */}
+      {isKonnectOrganization && <KonnectSyncResultPanel {...konnectSyncBar} />}
 
       {onboardingEnvWorkspaceId && envOnboardingNode && (
         <KonnectEnvOnboarding triggerElement={envOnboardingNode} onDismiss={dismissEnvOnboarding} />
@@ -1534,26 +1194,3 @@ const ProjectNavigationSidebarInner = (
 export const ProjectNavigationSidebar = forwardRef<ProjectNavigationSidebarHandle, ProjectNavigationSidebarProps>(
   ProjectNavigationSidebarInner,
 );
-
-export const EmptyProjectNavigationSidebar = ({ onCreateProject }: { onCreateProject: () => void }) => {
-  const { organizationId } = useParams() as { organizationId: string };
-  const isScratchPad = models.organization.isScratchpadOrganizationId(organizationId);
-  const { features } = useOrganizationPermissions();
-
-  return (
-    <div className="flex flex-1 flex-col overflow-hidden" data-testid="global-navigation-sidebar">
-      <Tabs>
-        <SideBarTabList
-          konnectSyncEnabled={features.konnectSync.enabled}
-          isScratchPad={isScratchPad}
-          nonKonnectProjectLength={0}
-          konnectProjectsLength={0}
-        />
-      </Tabs>
-      <div className="flex justify-between gap-1 p-(--padding-sm)">
-        <SidebarSearchField value="" isDisabled onChange={() => {}} />
-        {!isScratchPad && <NewProjectButton onPress={onCreateProject} />}
-      </div>
-    </div>
-  );
-};
diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-navigation-sidebar-data.ts b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-navigation-sidebar-data.ts
index 3b22c1e6c1..68a98531cd 100644
--- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-navigation-sidebar-data.ts
+++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-navigation-sidebar-data.ts
@@ -1,10 +1,10 @@
+import type { WorkspaceChildrenForScope } from 'insomnia-data';
 import { useMemo } from 'react';
 
 import { useOrganizationData } from '~/ui/hooks/use-organization-data';
 import { useMultipleWorkspacesData } from '~/ui/hooks/use-workspace-data';
 
 interface UseProjectNavigationSidebarDataOptions {
-  isProjectTabActive: boolean;
   projectNavigationSidebarFilter?: string;
   expandedProjectAndWorkspaceIds?: string[];
 }
@@ -13,24 +13,19 @@ export function useProjectNavigationSidebarData(
   organizationId: string,
   options: UseProjectNavigationSidebarDataOptions,
 ) {
-  const { isProjectTabActive, projectNavigationSidebarFilter, expandedProjectAndWorkspaceIds } = options;
+  const { projectNavigationSidebarFilter, expandedProjectAndWorkspaceIds } = options;
   const { projects, workspaces, workspaceMetas } = useOrganizationData(organizationId);
-  // Show konnect or none-konnect projects based on selected tab
-  const activeProjects = useMemo(
-    () => projects.filter(isProjectTabActive ? p => !p.konnectControlPlaneId : p => p.konnectControlPlaneId != null),
-    [projects, isProjectTabActive],
-  );
-  const projectIds = useMemo(() => activeProjects.map(p => p._id), [activeProjects]);
-  // Get the list of collection workspace ids that should be cached based on the current filter and expanded projects/workspaces.
+  const projectIds = useMemo(() => projects.map(p => p._id), [projects]);
 
-  const collectionWorkspaceIds = useMemo(() => {
+  // Get the list of collection/design workspace ids that should be cached based on the current filter and expanded projects/workspaces.
+  const collectionOrDesignWorkspaceIds = useMemo(() => {
     const ids: string[] = [];
     projectIds.forEach(projectId => {
       workspaces
         .filter(w => w.parentId === projectId)
         .forEach(workspace => {
           if (
-            workspace.scope === 'collection' &&
+            (workspace.scope === 'collection' || workspace.scope === 'design') &&
             (!!projectNavigationSidebarFilter || (expandedProjectAndWorkspaceIds || []).includes(workspace._id))
           ) {
             ids.push(workspace._id);
@@ -41,21 +36,18 @@ export function useProjectNavigationSidebarData(
   }, [projectIds, workspaces, projectNavigationSidebarFilter, expandedProjectAndWorkspaceIds]);
 
   const { dataByWorkspaceId: collectionByWorkspaceIds, pendingWorkspaceIds: pendingCollectionWorkspaceIds } =
-    useMultipleWorkspacesData(collectionWorkspaceIds, 'collection');
-
-  const nonKonnectProjects = useMemo(() => projects.filter(p => !p.konnectControlPlaneId), [projects]);
-  const konnectProjects = useMemo(() => projects.filter(p => p.konnectControlPlaneId != null), [projects]);
+    useMultipleWorkspacesData(collectionOrDesignWorkspaceIds);
 
   return {
     organizationProjects: projects,
     organizationWorkspaces: workspaces,
     workspaceMetas,
-    activeProjects,
     projectIds,
-    collectionWorkspaceIds,
-    collectionByWorkspaceIds,
+    collectionOrDesignWorkspaceIds,
+    collectionByWorkspaceIds: collectionByWorkspaceIds as Map<
+      string,
+      WorkspaceChildrenForScope<'collection' | 'design'>
+    >,
     pendingCollectionWorkspaceIds,
-    nonKonnectProjects,
-    konnectProjects,
   };
 }
diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-project-navigation-sidebar-navigation.ts b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-project-navigation-sidebar-navigation.ts
index 6e31f27745..480f1241c1 100644
--- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-project-navigation-sidebar-navigation.ts
+++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-project-navigation-sidebar-navigation.ts
@@ -1,6 +1,5 @@
 import type { Virtualizer } from '@tanstack/react-virtual';
 import { database, models, type Workspace } from 'insomnia-data';
-import type { Dispatch, SetStateAction } from 'react';
 import { useEffect, useRef, useState } from 'react';
 
 import type { NavigationResources } from '~/ui/hooks/use-insomnia-navigation';
@@ -25,13 +24,11 @@ const getSelectedItemId = (resources?: NavigationResources) => {
 };
 
 export const useProjectNavigationSidebarNavigation = ({
-  setActiveTab,
   toggleRequestGroups,
   expandProjectOrWorkspaces,
   visibleFlatItems,
   virtualizer,
 }: {
-  setActiveTab: Dispatch<SetStateAction<'projects' | 'konnect' | undefined>>;
   toggleRequestGroups: (requestGroupIds: string[], workspace: Workspace, collapsed?: boolean) => Promise<void>;
   expandProjectOrWorkspaces: (ids: string[]) => void;
   visibleFlatItems: FlatItem[];
@@ -42,10 +39,8 @@ export const useProjectNavigationSidebarNavigation = ({
   const [selectedItemId, setSelectedItemId] = useState<string | null>(null);
   const lastHandledScrollKeyRef = useRef<string | null>(null);
 
-  const setActiveTabRef = useRef(setActiveTab);
   const toggleRequestGroupsRef = useRef(toggleRequestGroups);
   const expandProjectOrWorkspacesRef = useRef(expandProjectOrWorkspaces);
-  setActiveTabRef.current = setActiveTab;
   toggleRequestGroupsRef.current = toggleRequestGroups;
   expandProjectOrWorkspacesRef.current = expandProjectOrWorkspaces;
 
@@ -69,9 +64,6 @@ export const useProjectNavigationSidebarNavigation = ({
         return;
       }
 
-      // update active tab
-      setActiveTabRef.current(resources.project.konnectControlPlaneId != null ? 'konnect' : 'projects');
-
       const idsToExpand = [resources.project._id];
       if (resources.workspace && models.workspace.isCollection(resources.workspace)) {
         idsToExpand.push(resources.workspace._id);
diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-sidebar-drag-and-drop.test.ts b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-sidebar-drag-and-drop.test.ts
new file mode 100644
index 0000000000..0831124d91
--- /dev/null
+++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-sidebar-drag-and-drop.test.ts
@@ -0,0 +1,525 @@
+import { describe, expect, it } from 'vitest';
+
+import type { CollectionChildFlatItem, EmptyNodeFlatItem, FlatItem, ProjectWithGitRepository } from './types';
+import type { BoundaryTargets, DropContext } from './use-sidebar-drag-and-drop';
+import {
+  canDrop,
+  getIndentLevel,
+  levelFromX,
+  resolveDrop,
+  SidebarDropTargetDelegate,
+} from './use-sidebar-drag-and-drop';
+
+// Fixtures mirror the sidebar's flat list: `level` is 0 for a direct child of a
+// workspace, and `ancestors` is the root-first folder chain, so
+// `ancestors.length === level`. Code under test indexes `ancestors` by level.
+
+const project = { _id: 'proj_1', remoteId: null, name: 'Local' } as unknown as ProjectWithGitRepository;
+const workspaceDoc = { _id: 'wrk_1', scope: 'collection', name: 'Collection' };
+
+const workspaceItem = {
+  kind: 'workspace',
+  doc: workspaceDoc,
+  project,
+  collapsed: false,
+  hidden: false,
+  organizationId: 'org_1',
+} as unknown as FlatItem;
+
+interface ChildOptions {
+  id: string;
+  level: number;
+  parentId: string;
+  ancestors: string[];
+  folder?: boolean;
+  metaSortKey?: number;
+  name?: string;
+}
+
+function child({ id, level, parentId, ancestors, folder = false, metaSortKey = 0, name }: ChildOptions) {
+  return {
+    kind: 'collectionChild',
+    doc: {
+      _id: id,
+      type: folder ? 'RequestGroup' : 'Request',
+      name: name ?? id,
+      parentId,
+      metaSortKey,
+    },
+    project,
+    workspace: workspaceDoc,
+    ancestors,
+    level,
+    pinned: false,
+    collapsed: false,
+    hidden: false,
+    organizationId: 'org_1',
+  } as unknown as CollectionChildFlatItem;
+}
+
+function emptyFolderNode(id: string, level: number, requestGroupId: string) {
+  return {
+    kind: 'emptyFolder',
+    doc: { _id: id, name: 'Folder is empty' },
+    project,
+    workspace: workspaceDoc,
+    requestGroup: { _id: requestGroupId },
+    level,
+    hidden: false,
+    organizationId: 'org_1',
+  } as unknown as EmptyNodeFlatItem;
+}
+
+// Rebuilds the lookups the hook derives from its flat list.
+function buildIndex(items: FlatItem[]) {
+  const visibles = items.filter(item => !item.hidden);
+  const flatItemsById = new Map(
+    visibles.map((item, index) => [item.doc._id, [item, visibles[index - 1], visibles[index + 1]] as const]),
+  );
+  const lookup = (id: string) => flatItemsById.get(id)?.[0] ?? null;
+  // Mirrors the hook: a childless expanded folder still shows an interior.
+  const hasVisibleChildren = (folderId: string) =>
+    visibles.some(candidate => {
+      if (candidate.hidden) {
+        return false;
+      }
+      if (candidate.kind === 'emptyFolder') {
+        return candidate.requestGroup?._id === folderId;
+      }
+      return candidate.kind === 'collectionChild' && candidate.doc.parentId === folderId;
+    });
+  return { flatItemsById, lookup, hasVisibleChildren };
+}
+
+type DropPosition = 'before' | 'after' | 'on';
+
+function boundaryAt(items: FlatItem[], dropPosition: DropPosition, key: string) {
+  const { flatItemsById, lookup, hasVisibleChildren } = buildIndex(items);
+  const entry = flatItemsById.get(key);
+  if (!entry) {
+    throw new Error(`fixture has no visible item with id ${key}`);
+  }
+  const [targetItem, prevItem, nextItem] = entry;
+  const boundary: BoundaryTargets = {
+    dropPosition,
+    targetItem,
+    realTargetItem: dropPosition === 'before' ? prevItem : targetItem,
+    nextItem,
+  };
+  return { boundary, flatItemsById, lookup, hasVisibleChildren };
+}
+
+function resolveAt(items: FlatItem[], dropPosition: DropPosition, key: string, preferredLevel: number) {
+  const { boundary, flatItemsById, lookup, hasVisibleChildren } = boundaryAt(items, dropPosition, key);
+  const ctx: DropContext = { hasVisibleChildren, lookup, flatItemsById, preferredLevel };
+  return { boundary, ...resolveDrop(boundary, ctx) };
+}
+
+// Produces every ambiguous gap in one tree.
+//
+//   folder A            level 0
+//     request A1        level 1
+//     subfolder B       level 1
+//       request B1      level 2
+//   request C           level 0
+const A = child({ id: 'A', level: 0, parentId: 'wrk_1', ancestors: [], folder: true, name: 'Alpha' });
+const A1 = child({ id: 'A1', level: 1, parentId: 'A', ancestors: ['A'], metaSortKey: 100 });
+const B = child({ id: 'B', level: 1, parentId: 'A', ancestors: ['A'], folder: true, metaSortKey: 200, name: 'Bravo' });
+const B1 = child({ id: 'B1', level: 2, parentId: 'B', ancestors: ['A', 'B'], metaSortKey: 300 });
+const C = child({ id: 'C', level: 0, parentId: 'wrk_1', ancestors: [], metaSortKey: 400 });
+const nestedTree: FlatItem[] = [workspaceItem, A, A1, B, B1, C];
+
+//   folder A            level 0
+//     subfolder E       level 1   (empty, expanded)
+//       "Folder empty"  level 1   (placeholder, not a real item)
+//   request C           level 0
+const E = child({ id: 'E', level: 1, parentId: 'A', ancestors: ['A'], folder: true, metaSortKey: 200, name: 'Echo' });
+const emptyPlaceholder = emptyFolderNode('empty_E', 1, 'E');
+const emptyTree: FlatItem[] = [workspaceItem, A, E, emptyPlaceholder, C];
+
+describe('levelFromX', () => {
+  // 1rem is 13px by default here, not the css default of 16.
+  it.each([
+    { level: 0, x: 39 },
+    { level: 1, x: 52 },
+    { level: 2, x: 65 },
+    { level: 3, x: 78 },
+  ])('maps a row indent guide to its own level at 13px per rem (level $level)', ({ level, x }) => {
+    expect(levelFromX(x, 0, 13)).toBe(level);
+  });
+
+  it.each([
+    { level: 0, x: 48 },
+    { level: 1, x: 64 },
+    { level: 2, x: 80 },
+  ])('maps a row indent guide to its own level at 16px per rem (level $level)', ({ level, x }) => {
+    expect(levelFromX(x, 0, 16)).toBe(level);
+  });
+
+  it('accounts for depthOffset, which strips ancestor levels in focus mode', () => {
+    // Focus mode renders level 0 at 1rem = 13px.
+    expect(levelFromX(13, 2, 13)).toBe(0);
+    expect(levelFromX(39, 2, 13)).toBe(2);
+  });
+
+  it('rounds, giving each level a half-step lead-in before its guide', () => {
+    // Level 1's guide is 52px; the lead-in makes deeper levels easier to hit.
+    expect(levelFromX(46, 0, 13)).toBe(1);
+    expect(levelFromX(45, 0, 13)).toBe(0);
+  });
+
+  it('returns negative levels left of the shallowest indent', () => {
+    // Callers clamp; this does not.
+    expect(levelFromX(0, 0, 13)).toBe(-3);
+    expect(levelFromX(0, 2, 13)).toBe(-1);
+  });
+});
+
+describe('getIndentLevel', () => {
+  it('reads the level off a collection child', () => {
+    expect(getIndentLevel(B1)).toBe(2);
+  });
+
+  it('treats a missing item as top level', () => {
+    expect(getIndentLevel(null)).toBe(0);
+  });
+
+  it('reports pinned requests as top level, matching how they render', () => {
+    const pinned = { ...(B1 as CollectionChildFlatItem), kind: 'pinnedRequest' } as unknown as FlatItem;
+    expect(getIndentLevel(pinned)).toBe(0);
+  });
+
+  it('falls back to top level for a node carrying no level', () => {
+    expect(getIndentLevel(emptyFolderNode('e', undefined as unknown as number, 'E'))).toBe(0);
+  });
+});
+
+describe('resolveDrop — folder trailing edge', () => {
+  it('lands inside the folder when the cursor asks to go deeper', () => {
+    expect(resolveAt(nestedTree, 'after', 'A', 1).normalized).toMatchObject({ dropPosition: 'on', targetItem: A });
+  });
+
+  it('stays beside the folder when the cursor stays at its level', () => {
+    const { normalized } = resolveAt(nestedTree, 'after', 'A', 0);
+    expect(normalized).toMatchObject({ dropPosition: 'after', targetItem: A });
+  });
+
+  it('does not merge into a folder with no visible children', () => {
+    const { normalized } = resolveAt([workspaceItem, A, E, C], 'after', 'E', 5);
+    expect(normalized).toMatchObject({ dropPosition: 'after', targetItem: E });
+  });
+});
+
+describe('resolveDrop — first child leading edge', () => {
+  // The form react-aria actually renders for the gap above.
+  it('keeps the child target when the cursor asks for the child level', () => {
+    const { normalized } = resolveAt(nestedTree, 'before', 'A1', 1);
+    expect(normalized).toMatchObject({ dropPosition: 'before', targetItem: A1 });
+  });
+
+  it('redirects to the parent folder when the cursor goes shallower', () => {
+    const { normalized } = resolveAt(nestedTree, 'before', 'A1', 0);
+    expect(normalized).toMatchObject({ dropPosition: 'after', targetItem: A });
+  });
+
+  it('never redirects shallower than the folder that owns the gap', () => {
+    // The gap spans "inside A" to "beside A" only.
+    const { normalized } = resolveAt(nestedTree, 'before', 'A1', -5);
+    expect(normalized).toMatchObject({ dropPosition: 'after', targetItem: A });
+  });
+});
+
+describe('resolveDrop — subtree tail', () => {
+  it.each([
+    { level: 2, expected: 'B1', description: 'deepest — stays inside the subfolder' },
+    { level: 1, expected: 'B', description: 'intermediate — inside the containing folder' },
+    { level: 0, expected: 'A', description: 'shallowest — beside the containing folder' },
+  ])('walks the ancestor chain to level $level ($description)', ({ level, expected }) => {
+    const { normalized } = resolveAt(nestedTree, 'after', 'B1', level);
+    expect(normalized.targetItem.doc._id).toBe(expected);
+  });
+
+  it('clamps a cursor left of the shallow row rather than escaping the gap', () => {
+    expect(resolveAt(nestedTree, 'after', 'B1', -4).normalized.targetItem.doc._id).toBe('A');
+  });
+
+  it('clamps a cursor past the deep row onto that row', () => {
+    expect(resolveAt(nestedTree, 'after', 'B1', 99).normalized.targetItem.doc._id).toBe('B1');
+  });
+});
+
+describe('resolveDrop — empty folder placeholder', () => {
+  it('keeps the placeholder form when landing inside the empty folder', () => {
+    const { normalized } = resolveAt(emptyTree, 'before', 'empty_E', 2);
+    expect(normalized).toMatchObject({ dropPosition: 'before', targetItem: emptyPlaceholder });
+  });
+
+  it('rewrites to the folder trailing edge when landing beside the folder', () => {
+    // Also fixes ordering: the placeholder form carries a first-child sort key.
+    const { normalized } = resolveAt(emptyTree, 'before', 'empty_E', 1);
+    expect(normalized).toMatchObject({ dropPosition: 'after', targetItem: E });
+  });
+});
+
+describe('resolveDrop — destination parent', () => {
+  it('parents on the workspace root at the top of a collection', () => {
+    expect(resolveAt(nestedTree, 'before', 'A', 0).parentId).toBe('wrk_1');
+  });
+
+  it('parents inside a folder for an "on" drop', () => {
+    expect(resolveAt(nestedTree, 'after', 'A', 1).parentId).toBe('A');
+  });
+
+  it('parents on the workspace for a top-level sibling insert', () => {
+    expect(resolveAt(nestedTree, 'before', 'C', 0).parentId).toBe('wrk_1');
+  });
+
+  it('moves a nested request out to the collection top level', () => {
+    // Requests may live directly under a collection, with no folder at all.
+    expect(resolveAt(nestedTree, 'after', 'B1', 0).parentId).toBe('wrk_1');
+    expect(resolveAt(nestedTree, 'after', 'B1', 0).folderName).toBeNull();
+  });
+
+  it('parents inside the empty folder when the cursor stays deep', () => {
+    expect(resolveAt(emptyTree, 'before', 'empty_E', 2).parentId).toBe('E');
+  });
+
+  it('parents outside the empty folder when the cursor goes shallow', () => {
+    expect(resolveAt(emptyTree, 'before', 'empty_E', 1).parentId).toBe('A');
+  });
+});
+
+describe('both raw forms of one gap agree', () => {
+  // The invariant the module exists to uphold: react-stately may hand the commit
+  // path one form and the render path the other.
+  it.each([-2, -1, 0, 1, 2, 3, 10])('subtree tail resolves identically at level %i', level => {
+    const viaAfter = resolveAt(nestedTree, 'after', 'B1', level);
+    const viaBefore = resolveAt(nestedTree, 'before', 'C', level);
+    expect(viaAfter.parentId).toBe(viaBefore.parentId);
+    expect(viaAfter.folderName).toBe(viaBefore.folderName);
+  });
+
+  it.each([-2, -1, 0, 1, 2, 3, 10])('folder trailing edge resolves identically at level %i', level => {
+    const viaAfter = resolveAt(nestedTree, 'after', 'A', level);
+    const viaBefore = resolveAt(nestedTree, 'before', 'A1', level);
+    expect(viaAfter.parentId).toBe(viaBefore.parentId);
+  });
+
+  it.each([-2, -1, 0, 1, 2, 3, 10])('empty folder boundary resolves identically at level %i', level => {
+    const viaAfter = resolveAt(emptyTree, 'after', 'E', level);
+    const viaBefore = resolveAt(emptyTree, 'before', 'empty_E', level);
+    expect(viaAfter.parentId).toBe(viaBefore.parentId);
+  });
+});
+
+describe('resolveDrop — destination folder name', () => {
+  it('names the folder a nested insert actually lands in', () => {
+    expect(resolveAt(nestedTree, 'after', 'B1', 2).folderName).toBe('Bravo');
+  });
+
+  it('names the containing folder once the cursor steps out one level', () => {
+    expect(resolveAt(nestedTree, 'after', 'B1', 1).folderName).toBe('Alpha');
+  });
+
+  it('names nothing at top level', () => {
+    expect(resolveAt(nestedTree, 'after', 'B1', 0).folderName).toBeNull();
+  });
+
+  it('stays silent on a folder trailing edge that did not merge inside', () => {
+    expect(resolveAt(nestedTree, 'after', 'A', 0).folderName).toBeNull();
+  });
+
+  it('names the folder when the trailing edge did merge inside', () => {
+    expect(resolveAt(nestedTree, 'after', 'A', 1).folderName).toBe('Alpha');
+  });
+});
+
+describe('canDrop', () => {
+  const at = (items: FlatItem[], dropPosition: DropPosition, key: string) =>
+    boundaryAt(items, dropPosition, key).boundary;
+  // canDrop judges containment against the resolved destination.
+  const dest = (items: FlatItem[], parentId: string | null) => ({
+    parentId,
+    parentItem: parentId ? (buildIndex(items).flatItemsById.get(parentId)?.[0] ?? null) : null,
+  });
+
+  it('rejects a drop that lands exactly where the item already is', () => {
+    expect(canDrop(B1, at(nestedTree, 'after', 'B1'), dest(nestedTree, 'B'))).toBe(false);
+  });
+
+  it('allows a drop beside the item when the level changes its parent', () => {
+    // Same boundary, cursor moved left: a real move out of the subfolder.
+    expect(canDrop(B1, at(nestedTree, 'after', 'B1'), dest(nestedTree, 'A'))).toBe(true);
+  });
+
+  it('rejects moving a folder into its own descendant', () => {
+    expect(canDrop(B, at(nestedTree, 'on', 'B1'), dest(nestedTree, 'B1'))).toBe(false);
+  });
+
+  it('allows moving a request into an unrelated folder', () => {
+    expect(canDrop(A1, at(nestedTree, 'on', 'B'), dest(nestedTree, 'B'))).toBe(true);
+  });
+
+  it('rejects an "on" drop onto a request rather than a folder', () => {
+    expect(canDrop(A1, at(nestedTree, 'on', 'C'), dest(nestedTree, 'wrk_1'))).toBe(false);
+  });
+
+  it('allows inserting after an empty-folder placeholder', () => {
+    // "after" the placeholder is the gap after the folder it stands in for.
+    expect(canDrop(C, at(emptyTree, 'after', 'empty_E'), dest(emptyTree, 'A'))).toBe(true);
+  });
+
+  // Self-parenting is unrecoverable: the folder and its subtree vanish.
+  it('never lets a folder become its own parent (leading edge of its first child)', () => {
+    const resolved = resolveAt(nestedTree, 'before', 'A1', 1);
+    expect(resolved.parentId).toBe('A');
+    expect(canDrop(A, at(nestedTree, 'before', 'A1'), dest(nestedTree, resolved.parentId))).toBe(false);
+  });
+
+  it('never lets a folder become its own parent (its own trailing edge)', () => {
+    expect(canDrop(A, at(nestedTree, 'on', 'A'), dest(nestedTree, 'A'))).toBe(false);
+  });
+
+  it('never lets a folder land inside its own descendant', () => {
+    expect(canDrop(A, at(nestedTree, 'after', 'B1'), dest(nestedTree, 'B'))).toBe(false);
+  });
+
+  it('lets a folder escape via the gap below its own subtree', () => {
+    // The anchor row (B1) is inside B, but the destination is not.
+    expect(canDrop(B, at(nestedTree, 'after', 'B1'), dest(nestedTree, 'wrk_1'))).toBe(true);
+  });
+
+  it('allows moving a nested request out to the collection top level', () => {
+    // Previous row is a collection child, not the workspace header.
+    expect(canDrop(B1, at(nestedTree, 'before', 'C'), dest(nestedTree, 'wrk_1'))).toBe(true);
+  });
+});
+
+describe('SidebarDropTargetDelegate', () => {
+  // Rows 20px tall. `y` arrives already in this space, so scrollOffset must not
+  // be added — react-aria measures against the GridList inside the scroller.
+  const rows = [
+    { key: 'A', index: 0, start: 0, end: 20, size: 20, lane: 0 },
+    { key: 'A1', index: 1, start: 20, end: 40, size: 20, lane: 0 },
+    { key: 'B', index: 2, start: 40, end: 60, size: 20, lane: 0 },
+  ];
+
+  const delegateWith = (scrollOffset: number, rendered = rows) => {
+    const virtualizer = { getVirtualItems: () => rendered, scrollOffset } as never;
+    const delegate = new SidebarDropTargetDelegate(virtualizer);
+    delegate.configure(0, () => {});
+    return delegate;
+  };
+
+  const acceptBeforeAfter = (target: { type: string; dropPosition?: string }) =>
+    target.type === 'item' && target.dropPosition !== 'on';
+
+  it('hit-tests against y directly when unscrolled', () => {
+    expect(delegateWith(0).getDropTargetFromPoint(40, 45, acceptBeforeAfter)).toMatchObject({ key: 'B' });
+  });
+
+  it('ignores scrollOffset — y is already in content space', () => {
+    // y is near the top on purpose: double-counting lands past every row.
+    for (const scrollOffset of [0, 100, 5000]) {
+      expect(delegateWith(scrollOffset).getDropTargetFromPoint(40, 5, acceptBeforeAfter)).toMatchObject({ key: 'A' });
+    }
+  });
+
+  it('resolves the row under the cursor rather than the last rendered row', () => {
+    const scrolled = [
+      { key: 'X', index: 10, start: 200, end: 220, size: 20, lane: 0 },
+      { key: 'Y', index: 11, start: 220, end: 240, size: 20, lane: 0 },
+    ];
+    expect(delegateWith(200, scrolled).getDropTargetFromPoint(40, 205, acceptBeforeAfter)).toMatchObject({ key: 'X' });
+  });
+
+  it('falls back to root when nothing is rendered', () => {
+    expect(delegateWith(0, []).getDropTargetFromPoint(40, 45, acceptBeforeAfter)).toEqual({ type: 'root' });
+  });
+});
+
+describe('dropping at the very top of a collection', () => {
+  // The only boundary anchored on the collection header, so it takes its own
+  // path through canDrop — including on cloud-synced projects.
+  const topGap = (remoteId: string | null) => {
+    const cloudProject = { _id: 'proj_1', remoteId, name: 'P' } as unknown as ProjectWithGitRepository;
+    const withProject = (item: FlatItem) => ({ ...item, project: cloudProject }) as FlatItem;
+    const items = [workspaceItem, A, C].map(withProject);
+    const [wsRow, folderRow, requestRow] = items;
+    const { flatItemsById, lookup, hasVisibleChildren } = buildIndex(items);
+    const boundary: BoundaryTargets = {
+      dropPosition: 'before',
+      targetItem: folderRow,
+      realTargetItem: wsRow,
+      nextItem: requestRow,
+    };
+    const ctx: DropContext = { hasVisibleChildren, lookup, flatItemsById, preferredLevel: 0 };
+    return { dragged: requestRow, boundary, resolved: resolveDrop(boundary, ctx) };
+  };
+
+  it.each([
+    { kind: 'local', remoteId: null },
+    { kind: 'cloud-synced', remoteId: 'remote_1' },
+  ])('parents on the collection itself ($kind project)', ({ remoteId }) => {
+    expect(topGap(remoteId).resolved.parentId).toBe('wrk_1');
+  });
+
+  it.each([
+    { kind: 'local', remoteId: null },
+    { kind: 'cloud-synced', remoteId: 'remote_1' },
+  ])('allows the drop ($kind project)', ({ remoteId }) => {
+    const { dragged, boundary, resolved } = topGap(remoteId);
+    expect(canDrop(dragged, boundary, resolved)).toBe(true);
+  });
+});
+
+describe('the region below an empty folder placeholder', () => {
+  //   folder A          level 0
+  //     subfolder E     level 1   (expanded, empty)
+  //       "Folder empty"          (placeholder)
+  //     subfolder S     level 1   <- want to drop above this
+  //     request R       level 1
+  const S = child({ id: 'S', level: 1, parentId: 'A', ancestors: ['A'], folder: true, metaSortKey: 300, name: 'Sierra' });
+  const R = child({ id: 'R', level: 1, parentId: 'A', ancestors: ['A'], metaSortKey: 400 });
+  const tree: FlatItem[] = [workspaceItem, A, E, emptyPlaceholder, S, R];
+
+  const resolveHere = (dropPosition: DropPosition, key: string, preferredLevel: number) => {
+    const { boundary, flatItemsById, lookup, hasVisibleChildren } = boundaryAt(tree, dropPosition, key);
+    const ctx: DropContext = { hasVisibleChildren, lookup, flatItemsById, preferredLevel };
+    const resolved = resolveDrop(boundary, ctx);
+    return { ...resolved, valid: canDrop(R, boundary, resolved) };
+  };
+
+  it.each([0, 1])('accepts a drop below the placeholder, shallow cursor (L%i)', level => {
+    // Both raw forms of that one gap.
+    for (const [dropPosition, key] of [['after', 'empty_E'], ['before', 'S']] as const) {
+      const resolved = resolveHere(dropPosition, key, level);
+      expect({ dropPosition, ...resolved }).toMatchObject({ parentId: 'A', valid: true });
+    }
+  });
+
+  it('means one thing regardless of cursor depth', () => {
+    // Not level-aware: the opposite raw form cannot express "inside".
+    for (const level of [0, 1, 2, 5]) {
+      expect(resolveHere('after', 'empty_E', level)).toMatchObject({ parentId: 'A', valid: true });
+    }
+  });
+
+  it('agrees across both raw forms at every level', () => {
+    for (const level of [-1, 0, 1, 2, 3]) {
+      expect(resolveHere('after', 'empty_E', level).parentId).toBe(resolveHere('before', 'S', level).parentId);
+    }
+  });
+
+  it('still refuses to insert beside an empty COLLECTION placeholder', () => {
+    const emptyCollection = {
+      ...emptyFolderNode('empty_ws', 0, 'wrk_1'),
+      kind: 'emptyCollection',
+      requestGroup: undefined,
+    } as unknown as FlatItem;
+    const items: FlatItem[] = [workspaceItem, emptyCollection];
+    const { boundary, flatItemsById, lookup, hasVisibleChildren } = boundaryAt(items, 'after', 'empty_ws');
+    const ctx: DropContext = { hasVisibleChildren, lookup, flatItemsById, preferredLevel: 0 };
+    expect(canDrop(R, boundary, resolveDrop(boundary, ctx))).toBe(false);
+  });
+});
diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-sidebar-drag-and-drop.tsx b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-sidebar-drag-and-drop.tsx
index 028b19d2e1..c3853f6ba5 100644
--- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-sidebar-drag-and-drop.tsx
+++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-sidebar-drag-and-drop.tsx
@@ -1,10 +1,11 @@
 import type { Virtualizer } from '@tanstack/react-virtual';
 import { models, type WorkspaceScope } from 'insomnia-data';
-import { useCallback, useMemo, useRef } from 'react';
-import type { DragAndDropHooks, ItemDropTarget } from 'react-aria-components';
+import { useCallback, useMemo, useRef, useState } from 'react';
+import type { DragAndDropHooks, DropTarget, ItemDropTarget } from 'react-aria-components';
 import { DropIndicator, useDragAndDrop } from 'react-aria-components';
 
 import { useDebugReorderActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder';
+import { Icon } from '~/ui/components/icon';
 
 import type { CollectionChildFlatItem, EmptyNodeFlatItem, FlatItem } from './types';
 
@@ -31,27 +32,282 @@ function isEmptyNode(item: FlatItem): item is EmptyNodeFlatItem {
   return emptyNodeKinds.includes(item.kind);
 }
 
-function canDrop(
+export function getIndentLevel(item: FlatItem | null): number {
+  if (!item || item.kind === 'pinnedRequest') {
+    return 0;
+  }
+  return 'level' in item && typeof item.level === 'number' ? item.level : 0;
+}
+
+type HasVisibleChildren = (folderId: string) => boolean;
+type FlatItemById = (id: string) => FlatItem | null;
+// Every visible row mapped to itself plus its previous and next visible rows.
+type FlatItemsById = Map<string, readonly [FlatItem, FlatItem | undefined, FlatItem | undefined]>;
+type DropPositionKind = ItemDropTarget['dropPosition'];
+
+function isCollectionChild(item: FlatItem | null | undefined): item is CollectionChildFlatItem {
+  return item?.kind === 'collectionChild';
+}
+
+function isFolderItem(item: FlatItem | null | undefined): item is CollectionChildFlatItem {
+  return isCollectionChild(item) && models.requestGroup.isRequestGroup(item.doc);
+}
+
+// realTargetItem is the row the drop attaches to: the preceding row for a
+// "before" drop, the target itself otherwise.
+export interface BoundaryTargets {
+  dropPosition: DropPositionKind;
+  targetItem: FlatItem;
+  realTargetItem?: FlatItem | null;
+  nextItem?: FlatItem | null;
+}
+
+export interface DropContext {
+  hasVisibleChildren: HasVisibleChildren;
+  lookup: FlatItemById;
+  flatItemsById: FlatItemsById;
+  // Nesting level the cursor's x currently selects (see levelFromX).
+  preferredLevel: number;
+}
+
+interface NormalizedBoundary {
+  dropPosition: DropPositionKind;
+  targetItem: FlatItem;
+  redirected: boolean;
+}
+
+// Not 16: the app sets html font-size from the interface fontSize setting
+// (13px default) in use-settings-side-effects.ts, so it has to be measured.
+const FALLBACK_PX_PER_REM = 16;
+function measurePxPerRem(): number {
+  const rootFontSize = Number.parseFloat(getComputedStyle(document.documentElement).fontSize);
+  return Number.isFinite(rootFontSize) && rootFontSize > 0 ? rootFontSize : FALLBACK_PX_PER_REM;
+}
+
+// Mirrors the rows' paddingLeft (request-node.tsx). levelFromX and
+// indentRemForLevel must stay exact inverses of each other.
+const ROOT_INDENT_REM = 3;
+const MIN_INDENT_REM = 1;
+
+export function levelFromX(x: number, depthOffset: number, pxPerRem: number): number {
+  return Math.round(x / pxPerRem) - ROOT_INDENT_REM + depthOffset;
+}
+
+function indentRemForLevel(level: number, depthOffset: number): number {
+  return Math.max(level + ROOT_INDENT_REM - depthOffset, MIN_INDENT_REM);
+}
+
+// Deeper and shallower side of a multi-depth gap, or null for a same-level
+// insert. Both raw forms of one gap map to the same pair.
+function resolveGapSides(
+  { dropPosition, targetItem, realTargetItem, nextItem }: BoundaryTargets,
+): { deep: CollectionChildFlatItem; shallow: CollectionChildFlatItem } | null {
+  const otherItem = dropPosition === 'before' ? realTargetItem : nextItem;
+  if (!isCollectionChild(targetItem) || !isCollectionChild(otherItem)) {
+    return null;
+  }
+  const targetLevel = getIndentLevel(targetItem);
+  const otherLevel = getIndentLevel(otherItem);
+  if (targetLevel === otherLevel) {
+    return null;
+  }
+  // A folder's own trailing edge; the merge-inside branch handles it.
+  if (dropPosition === 'after' && targetLevel < otherLevel) {
+    return null;
+  }
+  return targetLevel > otherLevel
+    ? { deep: targetItem, shallow: otherItem }
+    : { deep: otherItem, shallow: targetItem };
+}
+
+// react-stately treats `after X` and `before nextKey(X)` as one insertion point
+// (getOppositeTarget in useDroppableCollectionState). In a tree they must differ
+// — beside a folder vs. inside it — so both raw forms are normalized here, and
+// every caller resolves through this. Doing it in the delegate instead breaks
+// rendering: react-aria only tests candidates tied to specific rows.
+//
+// A gap can span several depths; preferredLevel picks one by indexing the deeper
+// row's `ancestors` (root-first, so index === level).
+export function normalizeBoundaryTarget(
+  boundary: BoundaryTargets,
+  { hasVisibleChildren, preferredLevel, lookup }: DropContext,
+): NormalizedBoundary {
+  const { dropPosition, targetItem, realTargetItem } = boundary;
+  // Same gap as "before" its first child: land inside only if the cursor asks
+  // to go deeper than the folder itself.
+  if (
+    dropPosition === 'after' &&
+    isFolderItem(targetItem) &&
+    hasVisibleChildren(targetItem.doc._id) &&
+    preferredLevel > getIndentLevel(targetItem)
+  ) {
+    return { dropPosition: 'on', targetItem, redirected: false };
+  }
+  // A "Folder is empty" placeholder stands in for the folder's interior, so the
+  // gap above it is the folder's trailing edge. Rewriting also fixes ordering:
+  // the placeholder form carries a first-child sort key.
+  if (
+    dropPosition === 'before' &&
+    isEmptyNode(targetItem) &&
+    isFolderItem(realTargetItem) &&
+    preferredLevel <= getIndentLevel(realTargetItem)
+  ) {
+    return { dropPosition: 'after', targetItem: realTargetItem, redirected: true };
+  }
+  // The placeholder's lower edge: the gap after the folder's whole interior.
+  // Not level-aware on purpose — the opposite raw form can't express "inside",
+  // so offering it here would make the two forms disagree.
+  if (dropPosition === 'after' && isEmptyNode(targetItem)) {
+    const owningFolder = targetItem.requestGroup ? lookup(targetItem.requestGroup._id) : null;
+    if (isFolderItem(owningFolder)) {
+      return { dropPosition: 'after', targetItem: owningFolder, redirected: true };
+    }
+  }
+
+  // Clamp the requested level to the range the gap spans, then walk the deeper
+  // row's ancestor chain. Three raw forms share this one walk by design.
+  const gap = resolveGapSides(boundary);
+  if (gap) {
+    const deepLevel = getIndentLevel(gap.deep);
+    const level = Math.min(Math.max(preferredLevel, getIndentLevel(gap.shallow)), deepLevel);
+    const ancestorId = level < deepLevel ? gap.deep.ancestors?.[level] : undefined;
+    const ancestor = ancestorId ? lookup(ancestorId) : null;
+    if (isCollectionChild(ancestor)) {
+      return { dropPosition: 'after', targetItem: ancestor, redirected: ancestor !== targetItem };
+    }
+    // Deepest landing. If the deep row is the target the caller's form already
+    // says so; otherwise re-anchor onto it.
+    return gap.deep === targetItem
+      ? { dropPosition, targetItem, redirected: false }
+      : { dropPosition: 'after', targetItem: gap.deep, redirected: true };
+  }
+
+  return { dropPosition, targetItem, redirected: false };
+}
+
+// The dragged item's new parent, sent to the reorder route outright so there is
+// one implementation of "where does this land".
+function destinationParentIdFor(
+  { targetItem, dropPosition }: NormalizedBoundary,
+  { realTargetItem }: BoundaryTargets,
+): string | null {
+  // At the top of a collection the previous row is the workspace header itself.
+  if (realTargetItem?.kind === 'workspace' && models.workspace.isCollection(realTargetItem.doc)) {
+    return realTargetItem.doc._id;
+  }
+
+  if (dropPosition === 'on' && isFolderItem(targetItem)) {
+    return targetItem.doc._id;
+  }
+
+  // Only the "inside" case reaches here; normalizeBoundaryTarget rewrites the
+  // shallower one.
+  if (isEmptyNode(targetItem) && isFolderItem(realTargetItem)) {
+    return realTargetItem.doc._id;
+  }
+
+  if (isCollectionChild(targetItem) && 'parentId' in targetItem.doc) {
+    return targetItem.doc.parentId;
+  }
+
+  return null;
+}
+
+// Folder a drop lands inside, or null at top level. Worth naming because the
+// folder adjacent to a boundary is often not the destination.
+function destinationFolderNameFor(normalized: NormalizedBoundary, parentItem: FlatItem | null): string | null {
+  // Hovering a folder's own row without merging to 'on': naming it would read
+  // as "into it" when the drop goes beside it. A redirect is unambiguous.
+  if (normalized.dropPosition === 'after' && !normalized.redirected && isFolderItem(normalized.targetItem)) {
+    return null;
+  }
+  return isFolderItem(parentItem) ? parentItem.doc.name || 'Untitled folder' : null;
+}
+
+export interface ResolvedDrop {
+  normalized: NormalizedBoundary;
+  parentId: string | null;
+  // The destination as a row, when visible — canDrop needs its ancestry.
+  parentItem: FlatItem | null;
+  folderName: string | null;
+  landingLevel: number;
+}
+
+// One normalization pass, shared by the indicator and the commit so they cannot
+// disagree about where a drop lands.
+export function resolveDrop(boundary: BoundaryTargets, ctx: DropContext): ResolvedDrop {
+  const normalized = normalizeBoundaryTarget(boundary, ctx);
+  const parentId = destinationParentIdFor(normalized, boundary);
+  const parentItem = parentId ? (ctx.flatItemsById.get(parentId)?.[0] ?? null) : null;
+  return {
+    normalized,
+    parentId,
+    parentItem,
+    folderName: destinationFolderNameFor(normalized, parentItem),
+    landingLevel: getIndentLevel(normalized.targetItem),
+  };
+}
+
+export function canDrop(
   dragItem: FlatItem,
-  dropItem: FlatItem,
-  { dropPosition }: ItemDropTarget,
-  dropPrevItem: FlatItem | null,
-  dropNextItem: FlatItem | null,
+  boundary: BoundaryTargets,
+  // Level selection can redirect the landing far from the row the boundary sits
+  // on, so containment below is tested against this, not the anchor row.
+  destination: Pick<ResolvedDrop, 'parentId' | 'parentItem'>,
   expandedProjectAndWorkspaceIds?: string[],
 ) {
-  const realDropItem = dropPosition === 'before' ? dropPrevItem : dropItem;
+  const { dropPosition, targetItem: dropItem, realTargetItem: realDropItem, nextItem } = boundary;
+  const { parentId: destinationParentId, parentItem: destinationParentItem } = destination;
+  if (dropPosition === 'on') {
+    // Dropping directly "on" a row means "move inside this folder" — only valid
+    // when dragging a request/request group onto another folder.
+    if (
+      dragItem.doc._id === dropItem.doc._id ||
+      dragItem.kind !== 'collectionChild' ||
+      !isAllowDragItem(dragItem) ||
+      !isFolderItem(dropItem)
+    ) {
+      return false;
+    }
+    // moving a folder into itself or one of its own descendants is not allowed
+    return !(models.requestGroup.isRequestGroup(dragItem.doc) && dropItem.ancestors?.includes(dragItem.doc._id));
+  }
+
   // The item following realDropItem in the list
-  const itemAfterRealDrop = dropPosition === 'before' ? dropItem : dropNextItem;
-  // drag and drop items are same.
-  if (
-    !realDropItem ||
-    dragItem.doc._id === dropItem.doc._id ||
-    dragItem.doc._id === realDropItem.doc._id ||
-    !isAllowDropTarget(realDropItem)
-  ) {
+  const itemAfterRealDrop = dropPosition === 'before' ? dropItem : nextItem;
+  if (!realDropItem || !isAllowDropTarget(realDropItem)) {
     return false;
   }
 
+  // Nothing may land inside itself, and no folder inside its own descendants.
+  // Self-parenting is unrecoverable: roots come from `parentId === workspaceId`,
+  // so the folder and its subtree would vanish from the sidebar.
+  if (isCollectionChild(dragItem)) {
+    if (destinationParentId === dragItem.doc._id) {
+      return false;
+    }
+    if (
+      models.requestGroup.isRequestGroup(dragItem.doc) &&
+      isCollectionChild(destinationParentItem) &&
+      destinationParentItem.ancestors?.includes(dragItem.doc._id)
+    ) {
+      return false;
+    }
+  }
+
+  // Beside the dragged item is normally a no-op, but level selection can make it
+  // a real move out of the parent — so only reject it if the parent is unchanged.
+  const isBesideDragItem = dragItem.doc._id === dropItem.doc._id || dragItem.doc._id === realDropItem.doc._id;
+  if (isBesideDragItem) {
+    const changesParent =
+      dragItem.kind === 'collectionChild' &&
+      destinationParentId != null &&
+      destinationParentId !== dragItem.doc.parentId;
+    if (!changesParent) {
+      return false;
+    }
+  }
+
   if (!isAllowDragItem(dragItem)) {
     return false;
   }
@@ -60,6 +316,15 @@ function canDrop(
   const dragInCloud = models.project.isRemoteProject(dragItem.project);
   if (dragItem.kind === 'workspace') {
     const dragWorkspaceScope = dragItem.doc.scope;
+    // Konnect workspaces are keyed to their project's control plane, so moving one across projects
+    // would orphan it and make the next sync delete or duplicate it.
+    const dropProject = realDropItem.kind === 'project' ? realDropItem.doc : realDropItem.project;
+    const dropToAnotherKonnectProject =
+      dragItem.project._id !== dropProject._id &&
+      (dragItem.project.konnectControlPlaneId != null || dropProject.konnectControlPlaneId != null);
+    if (dropToAnotherKonnectProject) {
+      return false;
+    }
     if (realDropItem) {
       if (realDropItem.kind === 'project') {
         const dropToAnotherProject = dragItem.project._id !== realDropItem.doc._id;
@@ -122,17 +387,187 @@ function canDrop(
     models.workspace.isCollection(realDropItem.doc) &&
     (models.requestGroup.isRequestGroup(dragItem.doc) || models.request.isRequest(dragItem.doc))
   ) {
-    // not same collection and none are in cloud
+    // Repositioning inside its own collection is not a cross-collection move, so
+    // the cloud rule below does not apply.
+    if (isCollectionChild(dragItem) && dragItem.workspace._id === realDropItem.doc._id) {
+      return true;
+    }
+    // Moving BETWEEN collections cannot involve cloud sync on either side.
     const dropInCloud = models.project.isRemoteProject(realDropItem.project);
     return !dragInCloud && !dropInCloud;
   }
 
-  // move other things into workspace is not allowed, or move after empty node is not allowed
-  if (realDropItem.kind === 'workspace' || isEmptyNode(realDropItem)) {
+  // An empty PROJECT or COLLECTION placeholder has no sibling list to join. An
+  // empty FOLDER's does, since it stands in for that folder's interior.
+  if (realDropItem.kind === 'workspace' || (isEmptyNode(realDropItem) && realDropItem.kind !== 'emptyFolder')) {
     return false;
   }
 
-  return !(models.requestGroup.isRequestGroup(dragItem.doc) && realDropItem.ancestors?.includes(dragItem.doc._id));
+  return true;
+}
+
+// Widens react-aria's 5px before/after band around an "on"-capable row.
+const EDGE_PX = 10;
+
+interface VirtualRow {
+  key: string | number | bigint;
+  start: number;
+  end: number;
+  size: number;
+}
+
+// Hit-tests from the virtualizer's row geometry, with no DOM measurement. Knows
+// only row positions; normalizeBoundaryTarget interprets the result.
+export class SidebarDropTargetDelegate {
+  private depthOffset = 0;
+  private onHoverLevelChange: ((level: number) => void) | null = null;
+  private pxPerRem = FALLBACK_PX_PER_REM;
+
+  constructor(private virtualizer: Virtualizer<HTMLDivElement, Element>) {}
+
+  // onHoverLevelChange is setState-backed: React bails out on an unchanged
+  // value, so calling it every dragover only re-renders when the level moves.
+  configure(depthOffset: number, onHoverLevelChange: (level: number) => void) {
+    this.depthOffset = depthOffset;
+    this.onHoverLevelChange = onHoverLevelChange;
+  }
+
+  // Once per drag: it can't change mid-drag, and reading it per pointer hit
+  // forces a style recalculation in the drag hot path.
+  sampleRootFontSize() {
+    this.pxPerRem = measurePxPerRem();
+  }
+
+  private classify(
+    contentY: number,
+    virtualItems: VirtualRow[],
+    isValidDropTarget: (target: DropTarget) => boolean,
+  ): DropTarget {
+    let matchIndex = virtualItems.findIndex(v => contentY >= v.start && contentY < v.end);
+    if (matchIndex === -1) {
+      matchIndex = contentY < virtualItems[0].start ? 0 : virtualItems.length - 1;
+    }
+    const match = virtualItems[matchIndex];
+
+    // Virtual item keys can technically be bigint; our own keys are always
+    // doc ids (strings), and react-aria's Key type doesn't include bigint.
+    const key = String(match.key);
+    const onTarget: ItemDropTarget = { type: 'item', key, dropPosition: 'on' };
+    const { start, end, size } = match;
+
+    if (isValidDropTarget(onTarget)) {
+      const edge = Math.min(EDGE_PX, size / 3);
+      if (contentY <= start + edge) {
+        const before: ItemDropTarget = { ...onTarget, dropPosition: 'before' };
+        if (isValidDropTarget(before)) {
+          return before;
+        }
+      }
+      if (contentY >= end - edge) {
+        const after: ItemDropTarget = { ...onTarget, dropPosition: 'after' };
+        if (isValidDropTarget(after)) {
+          return after;
+        }
+      }
+      return onTarget;
+    }
+
+    const mid = start + size / 2;
+    if (contentY <= mid) {
+      const before: ItemDropTarget = { ...onTarget, dropPosition: 'before' };
+      if (isValidDropTarget(before)) {
+        return before;
+      }
+    }
+    const after: ItemDropTarget = { ...onTarget, dropPosition: 'after' };
+    if (isValidDropTarget(after)) {
+      return after;
+    }
+    return onTarget;
+  }
+
+  getDropTargetFromPoint(x: number, y: number, isValidDropTarget: (target: DropTarget) => boolean): DropTarget {
+    this.onHoverLevelChange?.(levelFromX(x, this.depthOffset, this.pxPerRem));
+
+    const virtualItems = this.virtualizer.getVirtualItems();
+    if (virtualItems.length === 0) {
+      return { type: 'root' };
+    }
+
+    // Do NOT add scrollOffset: react-aria measures y against the GridList, which
+    // is inside the scroller at full content height, so the offset cancels out.
+    return this.classify(y, virtualItems, isValidDropTarget);
+  }
+}
+
+interface SidebarDropIndicatorProps {
+  target: ItemDropTarget;
+  rowStart: number;
+  rowEnd: number;
+  rowHeight: number;
+  isValid: boolean;
+  // Indent matching the level the item will land at.
+  indentRem: number;
+  folderName: string | null;
+}
+
+function SidebarDropIndicator({
+  target,
+  rowStart,
+  rowEnd,
+  rowHeight,
+  isValid,
+  indentRem,
+  folderName,
+}: SidebarDropIndicatorProps) {
+  const outlineClass = isValid ? 'outline-(--color-surprise)' : 'outline-(--color-danger)';
+
+  // "on" means inside: outline the whole row rather than draw a line.
+  if (target.dropPosition === 'on') {
+    return (
+      <DropIndicator
+        target={target}
+        className={`absolute right-1 left-1 z-10 flex items-center rounded-sm outline-2 outline-solid ${outlineClass}`}
+        style={{ transform: `translateY(${rowStart}px)`, height: `${rowHeight}px` }}
+      >
+        <Icon
+          icon="turn-down"
+          className={`ml-2 h-3 w-3 ${isValid ? 'text-(--color-surprise)' : 'text-(--color-danger)'}`}
+        />
+      </DropIndicator>
+    );
+  }
+
+  return (
+    <DropIndicator
+      target={target}
+      className={`absolute top-0 z-10 outline-1 outline-solid ${outlineClass}`}
+      style={{
+        left: `${indentRem}rem`,
+        right: 0,
+        transform: `translateY(${target.dropPosition === 'before' ? rowStart : rowEnd}px)`,
+      }}
+    >
+      {folderName ? (
+        <span
+          className={`absolute -top-2.5 left-0 z-10 flex items-center gap-1 rounded-full px-1.5 py-0.5 text-[10px] leading-none whitespace-nowrap ${
+            isValid
+              ? 'bg-(--color-surprise) text-(--color-font-surprise)'
+              : 'bg-(--color-danger) text-(--color-font-danger)'
+          }`}
+        >
+          <Icon icon="turn-down" className="h-2.5 w-2.5" />
+          {folderName}
+        </span>
+      ) : (
+        <span
+          className={`absolute -top-0.75 -left-0.75 block h-1.75 w-1.75 rounded-full ${
+            isValid ? 'bg-(--color-surprise)' : 'bg-(--color-danger)'
+          }`}
+        />
+      )}
+    </DropIndicator>
+  );
 }
 
 interface UseSidebarDragAndDropOptions {
@@ -148,6 +583,8 @@ interface UseSidebarDragAndDropOptions {
     dropPosition: 'before' | 'after',
   ) => void;
   expandedProjectAndWorkspaceIds?: string[];
+  // Ancestor indent levels stripped from row rendering (see request-node.tsx).
+  depthOffset?: number;
 }
 
 export const useSidebarDragAndDrop = ({
@@ -156,6 +593,7 @@ export const useSidebarDragAndDrop = ({
   virtualizer,
   onWorkspaceReorder,
   expandedProjectAndWorkspaceIds,
+  depthOffset = 0,
 }: UseSidebarDragAndDropOptions): DragAndDropHooks => {
   const reorderFetcher = useDebugReorderActionFetcher();
 
@@ -166,6 +604,32 @@ export const useSidebarDragAndDrop = ({
       visibles.map((item, index) => [item.doc._id, [item, visibles[index - 1], visibles[index + 1]]] as const),
     );
   }, [flatItems]);
+
+  const dropTargetDelegateRef = useRef<SidebarDropTargetDelegate | null>(null);
+  if (!dropTargetDelegateRef.current) {
+    dropTargetDelegateRef.current = new SidebarDropTargetDelegate(virtualizer);
+  }
+
+  // Nesting level the cursor's x selects, for gaps spanning several depths.
+  const [hoverLevel, setHoverLevel] = useState(0);
+  dropTargetDelegateRef.current.configure(depthOffset, setHoverLevel);
+
+  // Whether the folder currently shows an interior to drop into — which an
+  // expanded but childless folder does, via its placeholder row.
+  const hasVisibleChildren = useCallback<HasVisibleChildren>(
+    folderId =>
+      flatItems.some(candidate => {
+        if (candidate.hidden) {
+          return false;
+        }
+        if (candidate.kind === 'emptyFolder') {
+          return candidate.requestGroup?._id === folderId;
+        }
+        return candidate.kind === 'collectionChild' && candidate.doc.parentId === folderId;
+      }),
+    [flatItems],
+  );
+
   const draggingCollectionItemIdRef = useRef<string | null>(null);
 
   const getCollectionItemByKey = useCallback(
@@ -179,27 +643,54 @@ export const useSidebarDragAndDrop = ({
     [flatItemsById],
   );
 
+  const dropContext: DropContext = {
+    hasVisibleChildren,
+    lookup: getCollectionItemByKey,
+    flatItemsById,
+    preferredLevel: hoverLevel,
+  };
+
   const collectionDragAndDrop = useDragAndDrop({
     getItems: keys => [...keys].map(key => ({ 'text/plain': key.toString() })),
+    // Without this, the browser allows copy/move/link and picks the cursor icon itself,
+    // which shows up as a flickering "+" (copy) cursor instead of a stable move cursor.
+    getAllowedDropOperations: () => ['move'],
+    // Our own delegate replaces react-aria's default hit-testing (which uses
+    // a hardcoded, easy-to-jitter-across 5px edge band) with wider zones
+    // computed from the virtualizer's own row geometry.
+    dropTargetDelegate: dropTargetDelegateRef.current,
     onDragStart(event) {
       const [draggedKey] = event.keys;
       draggingCollectionItemIdRef.current = draggedKey?.toString() || null;
+      dropTargetDelegateRef.current?.sampleRootFontSize();
     },
     onDragEnd() {
       draggingCollectionItemIdRef.current = null;
+      // Or the next drag opens against this one's last cursor column.
+      setHoverLevel(0);
     },
     getDropOperation(target, _types) {
-      if (target.type !== 'item' || target.dropPosition === 'on') {
+      if (target.type !== 'item') {
+        return 'cancel';
+      }
+      if (target.dropPosition === 'on') {
+        const dropItem = getCollectionItemByKey(target.key);
+        // Only allow the "on" drop position (move inside) for folders. This lets
+        // react-aria carve out real before/after edge zones for every other row,
+        // instead of the whole row being one big "move inside" target.
+        if (isFolderItem(dropItem)) {
+          return 'move';
+        }
         return 'cancel';
       }
       return 'move';
     },
     onMove(event) {
-      const { type, dropPosition: _dropPosition, key } = event.target;
+      const { type, dropPosition: rawDropPosition, key } = event.target;
       if (type !== 'item') {
         return;
       }
-      let dropPosition = _dropPosition;
+      let dropPosition = rawDropPosition;
       const isBefore = dropPosition === 'before';
       const droppedKey = key.toString();
 
@@ -207,24 +698,29 @@ export const useSidebarDragAndDrop = ({
       const draggedItem = getCollectionItemByKey(draggedKey) as AllowDragItem | null;
       const targetItem = getCollectionItemByKey(droppedKey) as AllowDropTarget | null;
       const realTargetItem = isBefore ? flatItemsById.get(droppedKey)?.[1] : targetItem;
+      const nextTargetItem = flatItemsById.get(droppedKey)?.[2];
+      // Resolved from the RAW target, the same way the indicator resolves it.
+      const boundary: BoundaryTargets | null = targetItem && {
+        dropPosition: rawDropPosition,
+        targetItem,
+        realTargetItem,
+        nextItem: nextTargetItem,
+      };
+      const resolved = boundary ? resolveDrop(boundary, dropContext) : null;
+      const destinationParentId = resolved?.parentId ?? null;
       if (
         !draggedItem ||
         !targetItem ||
-        !canDrop(
-          draggedItem,
-          targetItem,
-          event.target,
-          flatItemsById.get(droppedKey)?.[1] || null,
-          flatItemsById.get(droppedKey)?.[2] || null,
-          expandedProjectAndWorkspaceIds,
-        )
+        !boundary ||
+        !resolved ||
+        !canDrop(draggedItem, boundary, resolved, expandedProjectAndWorkspaceIds)
       ) {
         return;
       }
 
       // move workspace to another project or reorder within same project
       if (draggedItem.kind === 'workspace') {
-        if (_dropPosition === 'on') {
+        if (rawDropPosition === 'on') {
           return;
         }
         // Dropping after the last child of a collection
@@ -277,7 +773,7 @@ export const useSidebarDragAndDrop = ({
               targetProjectId,
               draggedItem.doc._id,
               targetItem.doc._id,
-              _dropPosition,
+              rawDropPosition,
             );
           }
         } else {
@@ -289,7 +785,7 @@ export const useSidebarDragAndDrop = ({
               draggedItem.project._id,
               draggedItem.doc._id,
               targetItem.doc._id,
-              _dropPosition,
+              rawDropPosition,
             );
           }
         }
@@ -298,7 +794,7 @@ export const useSidebarDragAndDrop = ({
 
       // move request or request group into collection
       if (realTargetItem?.kind === 'workspace' && models.workspace.isCollection(realTargetItem!.doc)) {
-        const siblingItem = flatItems.find(
+        const firstChildOfCollection = flatItems.find(
           (item): item is CollectionChildFlatItem =>
             item.kind === 'collectionChild' && item.doc.parentId === realTargetItem!.doc._id,
         );
@@ -310,55 +806,57 @@ export const useSidebarDragAndDrop = ({
             targetId: realTargetItem!.doc._id,
             id: draggedItem.doc._id,
             dropPosition: 'after', // collection only accepts move into, so treat all drops as "after"
-            metaSortKey: siblingItem?.doc.metaSortKey != null ? siblingItem.doc.metaSortKey - 100 : -1 * Date.now(),
+            metaSortKey: firstChildOfCollection?.doc.metaSortKey != null ? firstChildOfCollection.doc.metaSortKey - 100 : -1 * Date.now(),
           },
         });
         return;
       }
 
+      const normalized = normalizeBoundaryTarget(boundary, dropContext);
+      dropPosition = normalized.dropPosition;
+      // normalizeBoundaryTarget only ever swaps in a 'collectionChild'.
+      const normalizedTargetItem = normalized.targetItem as AllowDropTarget;
+
       const id = draggedItem.doc._id;
-      let targetId = targetItem.doc._id;
-      const targetIsEmptyNode = isEmptyNode(targetItem);
+      let targetId = normalizedTargetItem.doc._id;
+      const targetIsEmptyNode = isEmptyNode(normalizedTargetItem);
       const workspaceCollectionItems = flatItems.filter(
         (item): item is CollectionChildFlatItem =>
           item.kind === 'collectionChild' && item.workspace._id === draggedItem.workspace._id,
       );
       let metaSortKey = 0;
-      const isMovingItemInsideFolder =
-        !targetIsEmptyNode && models.requestGroup.isRequestGroup(targetItem.doc) && dropPosition === 'after';
-
-      const isMovingOnEmptyNode =
-        realTargetItem &&
-        'type' in realTargetItem.doc &&
-        models.requestGroup.isRequestGroup(realTargetItem.doc) &&
-        targetIsEmptyNode;
+      const isMovingItemInsideFolder = dropPosition === 'on' && isFolderItem(normalizedTargetItem);
+      const isMovingIntoEmptyFolder = targetIsEmptyNode && isFolderItem(realTargetItem);
 
       if (isMovingItemInsideFolder) {
-        // The reorder route interprets "after folder" as moving into that folder.
+        // Sort ahead of the folder's current first child so it lands at the top.
         const children = workspaceCollectionItems.filter(item => item.doc.parentId === targetId);
         metaSortKey = children.length > 0 ? children[0].doc.metaSortKey - 100 : -1 * Date.now();
-      } else if (isMovingOnEmptyNode) {
+      } else if (isMovingIntoEmptyFolder) {
+        // The placeholder has no doc of its own to sort against, so target the
+        // folder that owns it; parentId below puts the item inside that folder.
         targetId = realTargetItem.doc._id;
-        dropPosition = 'after';
         metaSortKey = -1 * Date.now();
       } else {
         // move before or after another request in same or different collection
         const siblingItems = workspaceCollectionItems.filter(
-          item => 'parentId' in targetItem.doc && item.doc.parentId === targetItem.doc.parentId,
+          item => 'parentId' in normalizedTargetItem.doc && item.doc.parentId === normalizedTargetItem.doc.parentId,
         );
         const targetIndex = siblingItems.findIndex(item => item.doc._id === targetId);
 
-        if ('metaSortKey' in targetItem.doc && targetItem.doc.metaSortKey != null) {
+        if ('metaSortKey' in normalizedTargetItem.doc && normalizedTargetItem.doc.metaSortKey != null) {
           if (dropPosition === 'after') {
             const afterItem = siblingItems[targetIndex + 1];
             metaSortKey = afterItem
-              ? targetItem.doc.metaSortKey - (targetItem.doc.metaSortKey - afterItem.doc.metaSortKey) / 2
-              : targetItem.doc.metaSortKey + 100;
+              ? normalizedTargetItem.doc.metaSortKey -
+                (normalizedTargetItem.doc.metaSortKey - afterItem.doc.metaSortKey) / 2
+              : normalizedTargetItem.doc.metaSortKey + 100;
           } else {
             const beforeItem = siblingItems[targetIndex - 1];
             metaSortKey = beforeItem
-              ? targetItem.doc.metaSortKey - (targetItem.doc.metaSortKey - beforeItem.doc.metaSortKey) / 2
-              : targetItem.doc.metaSortKey - 100;
+              ? normalizedTargetItem.doc.metaSortKey -
+                (normalizedTargetItem.doc.metaSortKey - beforeItem.doc.metaSortKey) / 2
+              : normalizedTargetItem.doc.metaSortKey - 100;
           }
         }
       }
@@ -376,53 +874,52 @@ export const useSidebarDragAndDrop = ({
           id,
           dropPosition,
           metaSortKey,
+          parentId: destinationParentId ?? undefined,
         },
       });
     },
     renderDropIndicator(target) {
-      if (target.type === 'item') {
-        const item = virtualizer.getVirtualItems().find(virtualItem => virtualItem.key === target.key);
-        if (item) {
-          const draggedItem = getCollectionItemByKey(draggingCollectionItemIdRef.current);
-          const targetItem = getCollectionItemByKey(target.key);
-          if (
-            draggedItem == null ||
-            targetItem == null ||
-            !canDrop(
-              draggedItem as FlatItem,
-              targetItem as FlatItem,
-              target,
-              flatItemsById.get(target.key.toString())?.[1] || null,
-              flatItemsById.get(target.key.toString())?.[2] || null,
-              expandedProjectAndWorkspaceIds,
-            )
-          ) {
-            return (
-              <DropIndicator
-                target={target}
-                className="absolute top-0 left-0 z-10 w-full outline-1 outline-(--color-danger) outline-solid"
-                style={{
-                  transform: `translateY(${target.dropPosition === 'before' ? item.start : item.end}px)`,
-                }}
-              />
-            );
-          }
-          return (
-            <DropIndicator
-              target={target}
-              className="absolute top-0 left-0 z-10 w-full outline-1 outline-(--color-surprise) outline-solid"
-              style={{
-                transform: `translateY(${target.dropPosition === 'before' ? item.start : item.end}px)`,
-              }}
-            />
-          );
-        }
+      const row =
+        target.type === 'item'
+          ? virtualizer.getVirtualItems().find(virtualItem => virtualItem.key === target.key)
+          : undefined;
+      if (target.type !== 'item' || !row) {
+        return (
+          <DropIndicator
+            target={target}
+            className="absolute top-0 left-0 outline-1 outline-(--color-surprise) outline-solid"
+          />
+        );
       }
 
+      const entry = flatItemsById.get(target.key.toString());
+      const draggedItem = getCollectionItemByKey(draggingCollectionItemIdRef.current);
+      const targetItem = getCollectionItemByKey(target.key);
+      const boundary: BoundaryTargets | null = targetItem && {
+        dropPosition: target.dropPosition,
+        targetItem,
+        realTargetItem: target.dropPosition === 'before' ? entry?.[1] : targetItem,
+        nextItem: entry?.[2],
+      };
+
+      // One pass drives validity, indent and the named destination.
+      const resolved = boundary ? resolveDrop(boundary, dropContext) : null;
+      const isValid =
+        draggedItem != null &&
+        boundary != null &&
+        resolved != null &&
+        canDrop(draggedItem, boundary, resolved, expandedProjectAndWorkspaceIds);
+
       return (
-        <DropIndicator
+        <SidebarDropIndicator
           target={target}
-          className="absolute top-0 left-0 outline-1 outline-(--color-surprise) outline-solid"
+          rowStart={row.start}
+          rowEnd={row.end}
+          rowHeight={row.size}
+          isValid={isValid}
+          indentRem={indentRemForLevel(resolved?.landingLevel ?? 0, depthOffset)}
+          // A rejected boundary must not name a folder.
+          folderName={isValid ? (resolved?.folderName ?? null) : null}
         />
       );
     },
diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/workspace-node.tsx b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/workspace-node.tsx
index 3f199aa149..2867292809 100644
--- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/workspace-node.tsx
+++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/workspace-node.tsx
@@ -29,7 +29,7 @@ export const WorkspaceNode = ({
   const { doc, collapsed, project, organizationId, hasUncommittedChanges, hasUnpushedChanges } = item;
   const { name: workspaceName, _id: workspaceId, scope: workspaceScope } = doc;
   const [isContextMenuOpen, setIsContextMenuOpen] = useState(false);
-  const isCollection = workspaceScope === 'collection';
+  const isCollection = workspaceScope === 'collection' || workspaceScope === 'design';
 
   return (
     <div
diff --git a/packages/insomnia/src/ui/components/spec-view.tsx b/packages/insomnia/src/ui/components/spec-view.tsx
new file mode 100644
index 0000000000..c9cbd4dc04
--- /dev/null
+++ b/packages/insomnia/src/ui/components/spec-view.tsx
@@ -0,0 +1,1428 @@
+import { type IRuleResult } from '@stoplight/spectral-core';
+import CodeMirror from 'codemirror';
+import { type ApiSpec, models } from 'insomnia-data';
+import type { OpenAPIV3 } from 'openapi-types';
+import { type ReactNode, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import {
+  Button,
+  Dialog,
+  GridList,
+  GridListItem,
+  Heading,
+  ListBox,
+  ListBoxItem,
+  Menu,
+  MenuItem,
+  MenuTrigger,
+  Modal,
+  ModalOverlay,
+  Popover,
+  ToggleButton,
+  Tooltip,
+  TooltipTrigger,
+} from 'react-aria-components';
+import {
+  type ImperativePanelGroupHandle,
+  type ImperativePanelHandle,
+  Panel,
+  PanelGroup,
+  PanelResizeHandle,
+} from 'react-resizable-panels';
+import * as reactUse from 'react-use';
+import { SwaggerUIBundle } from 'swagger-ui-dist';
+import YAML from 'yaml';
+
+import { convertApiSpecSyntax, detectApiSpecSyntax, parseApiSpec } from '~/common/api-specs';
+import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants';
+import { debounce } from '~/common/misc';
+import { utf8ByteLength } from '~/common/utils/utf8-bytes';
+import { useRootLoaderData } from '~/root';
+import { useDeleteProjectRulesetActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.delete-ruleset';
+import { useRefreshProjectRulesetActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.refresh-ruleset';
+import { useUpdateProjectRulesetActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.update-ruleset';
+import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
+import { useRequestNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new';
+import { useRequestGroupNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.new';
+import { useSpecGenerateRequestCollectionActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection';
+import { useSpecUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update';
+import { AnalyticsEvent } from '~/ui/analytics';
+import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor';
+import { Badge } from '~/ui/components/base/badge';
+import { DesignEmptyState } from '~/ui/components/design-empty-state';
+import { Icon } from '~/ui/components/icon';
+import { showError, showModal } from '~/ui/components/modals';
+import { AskModal } from '~/ui/components/modals/ask-modal';
+import { NewWorkspaceModal } from '~/ui/components/modals/new-workspace-modal';
+import { PromptModal } from '~/ui/components/modals/prompt-modal';
+import { formatMethodName } from '~/ui/components/tags/method-tag';
+import { showToast } from '~/ui/components/toast-notification';
+import { useAIFeatureStatus } from '~/ui/hooks/use-organization-features';
+import { useOrganizationStorageRule } from '~/ui/hooks/use-organization-storage-rule';
+import { useGitVCSVersion } from '~/ui/hooks/use-vcs-version';
+import { selectFileOrFolder } from '~/ui/utils/select-file-or-folder';
+
+const SwaggerUIDiv = ({ text }: { text: string }) => {
+  useEffect(() => {
+    let spec = {};
+    try {
+      spec = parseApiSpec(text).contents || {};
+    } catch {}
+    SwaggerUIBundle({ spec, dom_id: '#swagger-ui' });
+  }, [text]);
+  return (
+    <div
+      id="swagger-ui"
+      style={{
+        overflowY: 'auto',
+        height: '100%',
+        background: '#FFF',
+      }}
+    />
+  );
+};
+
+interface LintMessage {
+  type: 'error' | 'warning' | 'info';
+  message: string;
+  line: number;
+  range: IRuleResult['range'];
+  code: string;
+  path: string;
+}
+interface GroupedLintMessage {
+  code: string;
+  type: 'error' | 'warning' | 'info';
+  message: string;
+  occurrences: { line: number; range: IRuleResult['range']; path: string }[];
+}
+
+interface SpecActionItem {
+  id: string;
+  name: string;
+  icon?: ReactNode;
+  badge?: ReactNode;
+  isDisabled?: boolean;
+  tooltip?: string;
+  action: () => void;
+}
+
+const getMethodsFromOpenApiPathItem = (pathItem: OpenAPIV3.PathItemObject): string[] => {
+  const methods = ['get', 'put', 'post', 'delete', 'options', 'head', 'patch', 'trace'].filter(
+    method =>
+      // @ts-expect-error -- shrug I don't care what pathItem has in it
+      pathItem[method],
+  );
+
+  return methods;
+};
+
+const lintOptions = {
+  delay: 1000,
+};
+
+export interface SpecViewProps {
+  organizationId: string;
+  projectId: string;
+  workspaceId: string;
+  gitSyncRulesetPath: string;
+  isConnectedGitProject: boolean;
+  rulesetContent: string;
+  rulesetLastCompiledAt: number | null;
+  rulesetImportIssue: string | null;
+  parsedSpec: OpenAPIV3.Document | undefined;
+  apiSpec?: ApiSpec;
+}
+
+export const SpecView = ({
+  organizationId,
+  projectId,
+  workspaceId,
+  gitSyncRulesetPath,
+  isConnectedGitProject,
+  rulesetContent,
+  rulesetLastCompiledAt,
+  rulesetImportIssue,
+  parsedSpec,
+  apiSpec,
+}: SpecViewProps) => {
+  const { activeProject, vcsVersion, activeWorkspace } = useWorkspaceLoaderData()!;
+  const { settings } = useRootLoaderData()!;
+
+  const [isViewRulesetModalOpen, setIsViewRulesetModalOpen] = useState(false);
+  const [isNewMockServerModalOpen, setNewMockServerModalOpen] = useState(false);
+
+  const storageRules = useOrganizationStorageRule(organizationId);
+
+  const { isGenerateMockServersWithAIEnabled } = useAIFeatureStatus();
+
+  const [lintMessages, setLintMessages] = useState<LintMessage[]>([]);
+  const [expandedLintMessageCodes, setExpandedLintMessageCodes] = useState<string[]>([]);
+
+  const editor = useRef<CodeEditorHandle>(null);
+  const { submit: updateApiSpec } = useSpecUpdateActionFetcher();
+  const { submit: updateProjectRuleset } = useUpdateProjectRulesetActionFetcher();
+  const { submit: deleteProjectRuleset } = useDeleteProjectRulesetActionFetcher();
+  const { submit: refreshProjectRuleset } = useRefreshProjectRulesetActionFetcher();
+  const [isRefreshing, setIsRefreshing] = useState(false);
+  const generateRequestCollectionFetcher = useSpecGenerateRequestCollectionActionFetcher();
+  const newRequestFetcher = useRequestNewActionFetcher();
+  const newRequestGroupFetcher = useRequestGroupNewActionFetcher();
+  const gitVersion = useGitVCSVersion();
+  const [isLintPaneOpen, setIsLintPaneOpen] = useState(false);
+  const [isSpecPaneOpen, setIsSpecPaneOpen] = useState(Boolean(parsedSpec));
+  const [selectedRulesetPath, setSelectedRulesetPath] = useState<string>('');
+
+  // Spectral requires a file path on disk to lint with a ruleset. Ref: lint-process.mjs.
+  // Cloud/local projects have no RepoFileWatcher, so rulesetContent from NeDB is mirrored
+  // to this per-project scratch path. Git projects lint against gitSyncRulesetPath, which
+  // the RepoFileWatcher keeps in sync with the record.
+  const rulesetWritePath = useMemo(
+    () => window.path.join(window.app.getPath('userData'), `projects/${projectId}/.spectral.yaml`),
+    [projectId],
+  );
+
+  const rulesetHasRemoteExtendsEntries = useMemo(() => {
+    if (!rulesetContent) return false;
+
+    try {
+      const parsedRuleset = YAML.parse(rulesetContent);
+      if (!parsedRuleset.extends) return false;
+
+      const formattedRulesetExtendsEntries = Array.isArray(parsedRuleset.extends)
+        ? parsedRuleset.extends
+        : [parsedRuleset.extends];
+      return formattedRulesetExtendsEntries.some((entry: string) => entry.startsWith('https://'));
+    } catch {
+      return false;
+    }
+  }, [rulesetContent]);
+
+  const groupedLintMessages = useMemo<GroupedLintMessage[]>(() => {
+    const map = new Map<string, GroupedLintMessage>();
+    for (const msg of lintMessages) {
+      const key = msg.code;
+      const existing = map.get(key);
+      if (existing) {
+        existing.occurrences.push({ line: msg.line, range: msg.range, path: msg.path });
+      } else {
+        map.set(key, {
+          code: msg.code ?? '',
+          type: msg.type,
+          message: msg.message,
+          occurrences: [{ line: msg.line, range: msg.range, path: msg.path }],
+        });
+      }
+    }
+
+    return Array.from(map.values());
+  }, [lintMessages]);
+
+  const { components, info, servers, paths } = parsedSpec || {};
+  const { requestBodies, responses, parameters, headers, schemas, securitySchemes } = components || {};
+  const showSpecInfo = Boolean(info || servers || paths || components);
+
+  const lintErrors = lintMessages.filter(message => message.type === 'error');
+  const lintWarnings = lintMessages.filter(message => message.type === 'warning');
+
+  const registerCodeMirrorLint = useCallback(
+    (rulesetContent: string) => {
+      CodeMirror.registerHelper('lint', 'openapi', async (contents: string) => {
+        try {
+          const { diagnostics, error, cancelled } = await window.main.lintSpec({
+            documentContent: contents,
+            projectId,
+            rulesetContent,
+          });
+          if (cancelled) {
+            return [];
+          }
+          if (error) {
+            console.log('Handled error detected while linting:', error);
+            setLintMessages([]);
+            showError({
+              title: 'Linting Error',
+              message: `An error occurred while linting the OpenAPI specification: ${error}`,
+            });
+            return [];
+          }
+          const lintResult = diagnostics?.map(({ severity, code, message, range, path }) => {
+            return {
+              from: CodeMirror.Pos(range.start.line, range.start.character),
+              to: CodeMirror.Pos(range.end.line, range.end.character),
+              code: String(code),
+              message,
+              severity: ['error', 'warning'][severity] ?? 'info',
+              type: (['error', 'warning'][severity] ?? 'info') as LintMessage['type'],
+              range,
+              line: range.start.line,
+              path: path.join('.'),
+            };
+          });
+          setLintMessages?.(lintResult || []);
+          return lintResult;
+        } catch (error) {
+          // return a rejected promise so that codemirror do nothing
+          console.log('Unhandled error while linting:', error);
+          setLintMessages([]);
+          showError({
+            title: 'Linting Error',
+            message: `An error occurred while linting the OpenAPI specification: ${error}`,
+          });
+          return [];
+        }
+      });
+    },
+    [projectId],
+  );
+
+  useEffect(() => {
+    registerCodeMirrorLint(rulesetContent);
+    // when first time into document editor, the lint helper register later than codemirror init, we need to trigger lint through execute setOption
+    editor.current?.tryToSetOption('lint', { ...lintOptions });
+  }, [rulesetContent, projectId, registerCodeMirrorLint]);
+
+  useEffect(() => {
+    setSelectedRulesetPath(
+      isConnectedGitProject && gitSyncRulesetPath && rulesetContent
+        ? gitSyncRulesetPath
+        : rulesetContent
+          ? rulesetWritePath
+          : '',
+    );
+  }, [gitSyncRulesetPath, isConnectedGitProject, rulesetWritePath, rulesetContent]);
+
+  useEffect(() => {
+    if (showSpecInfo) {
+      specSidebarRef.current?.expand();
+    } else {
+      specSidebarRef.current?.collapse();
+    }
+  }, [showSpecInfo]);
+
+  reactUse.useUnmount(() => {
+    // delete the helper to avoid it run multiple times when user enter the page next time
+    CodeMirror.registerHelper('lint', 'openapi', () => {});
+  });
+
+  const onCodeEditorChange = useMemo(() => {
+    const handler = async (contents: string) => {
+      return updateApiSpec({
+        organizationId,
+        projectId,
+        workspaceId,
+        contents: contents,
+      });
+    };
+
+    return debounce(handler, 500);
+  }, [organizationId, projectId, updateApiSpec, workspaceId]);
+
+  const handleScrollToSelection = useCallback(
+    (chStart: number, chEnd: number, lineStart: number, lineEnd: number) => {
+      if (!editor.current) {
+        return;
+      }
+      editor.current.scrollToSelection(chStart, chEnd, lineStart, lineEnd);
+    },
+    [editor],
+  );
+
+  const handleScrollToLintMessage = useCallback(
+    (occurrence: GroupedLintMessage['occurrences'][number]) => {
+      if (!editor.current) {
+        return;
+      }
+      const { start, end } = occurrence.range;
+      editor.current.scrollToSelection(start.character, end.character, start.line, end.line);
+    },
+    [editor],
+  );
+
+  const [expandedKeys, setExpandedKeys] = useState<string[]>([]);
+
+  const navigateToPath = (path: string): void => {
+    if (!apiSpec) {
+      return;
+    }
+    const pathSegments = path.split('.');
+    const scrollPosition = {
+      start: { line: 0, col: 0 },
+      end: { line: 0, col: 200 },
+    };
+
+    try {
+      JSON.parse(apiSpec.contents);
+      // Account for JSON (as string) line number shift
+      scrollPosition.start.line = 1;
+    } catch {}
+
+    const lineCounter = new YAML.LineCounter();
+    const doc = YAML.parseDocument(apiSpec.contents, { lineCounter });
+    const astNode = doc.getIn(pathSegments, true) as YAML.Node;
+    const nodePosition = astNode.range && lineCounter.linePos(astNode.range[0]);
+    if (nodePosition) {
+      scrollPosition.start.line += nodePosition.line;
+    }
+    const isServersSection = pathSegments[0] === 'servers';
+    if (!isServersSection) {
+      scrollPosition.start.line -= 1;
+    }
+
+    scrollPosition.end.line = scrollPosition.start.line;
+    // NOTE: We're subtracting 1 from everything because YAML CST uses
+    //   1-based indexing and we use 0-based.
+    handleScrollToSelection(
+      scrollPosition.start.col - 1,
+      scrollPosition.end.col - 1,
+      scrollPosition.start.line - 1,
+      scrollPosition.end.line - 1,
+    );
+  };
+
+  const sidebarPanelRef = useRef<ImperativePanelGroupHandle>(null);
+  const specSidebarRef = useRef<ImperativePanelHandle>(null);
+  const lintPanelRef = useRef<ImperativePanelHandle>(null);
+
+  const specFormat = useMemo((): 'json' | 'yaml' | null => {
+    const contents = apiSpec?.contents?.trim();
+    if (!contents) {
+      return null;
+    }
+    return detectApiSpecSyntax(contents);
+  }, [apiSpec?.contents]);
+
+  const switchFormat = (to: 'json' | 'yaml') => {
+    const editorValue = editor.current?.getValue();
+    if (!editorValue) {
+      return;
+    }
+    let contents: string;
+    try {
+      contents = convertApiSpecSyntax(editorValue, to);
+    } catch {
+      showToast({
+        title: 'Failed to convert spec format',
+        icon: 'circle-exclamation',
+        status: 'error',
+        description: `Spec is not valid, cannot convert to ${to.toUpperCase()}`,
+      });
+      return;
+    }
+    editor.current?.setValue(contents);
+    updateApiSpec({ organizationId, projectId, workspaceId, contents });
+  };
+
+  const handleSelectSpectralFile = async () => {
+    const { filePath, canceled } = await selectFileOrFolder({
+      itemTypes: ['file'],
+      extensions: ['yaml', 'yml'],
+      showHiddenFiles: true,
+    });
+
+    if (canceled || !filePath) {
+      return;
+    }
+
+    // We bundle the ruleset to resolve any extended rulesets and to validate the content
+    const { content, error } = await window.main.bundleSpectralRuleset({ sourcePath: filePath });
+    if (error || !content) {
+      showError({
+        title: 'Invalid Spectral Ruleset',
+        message: error ?? 'Failed to bundle ruleset.',
+      });
+      return;
+    }
+
+    const RULESET_MAX_BYTES = 1 * 1024 * 1024; // 1 MB
+    if (utf8ByteLength(content) > RULESET_MAX_BYTES) {
+      showError({
+        title: 'Ruleset Too Large',
+        message: 'The selected ruleset exceeds the maximum allowed size of 1 MB.',
+      });
+      return;
+    }
+
+    await updateProjectRuleset({ organizationId, projectId, rulesetContent: content });
+
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.uploadLintRulesetClicked,
+      properties: {
+        project_type: models.project.isGitProject(activeProject)
+          ? 'git'
+          : models.project.isRemoteProject(activeProject)
+            ? 'remote'
+            : 'local',
+      },
+    });
+
+    setSelectedRulesetPath(gitSyncRulesetPath || rulesetWritePath);
+  };
+
+  const handleRefreshRuleset = async () => {
+    if (!rulesetContent) {
+      return;
+    }
+    setIsRefreshing(true);
+    try {
+      await window.main.refreshCompiledRuleset({ projectId, rulesetContent });
+      refreshProjectRuleset({ organizationId, projectId });
+      editor.current?.tryToSetOption('lint', { ...lintOptions });
+    } catch (err) {
+      showError({
+        title: 'Refresh Failed',
+        message: `Failed to refresh ruleset: ${err instanceof Error ? err.message : String(err)}`,
+      });
+    } finally {
+      setIsRefreshing(false);
+    }
+  };
+
+  const handleUnselectSpectralFile = async () => {
+    showModal(AskModal, {
+      title: 'Remove Ruleset File',
+      message:
+        'Are you sure you want to remove this custom ruleset? This will disable all custom linting rules and use the default Spectral ruleset.',
+      yesText: 'Remove',
+      color: 'danger',
+      noText: 'Cancel',
+      onDone: async (confirmed: boolean) => {
+        if (confirmed) {
+          await deleteProjectRuleset({
+            organizationId,
+            projectId,
+          });
+          await window.main.deleteCompiledRuleset({ projectId });
+          setSelectedRulesetPath('');
+        }
+      },
+    });
+  };
+
+  const generateActionList: SpecActionItem[] = [
+    {
+      id: 'generate-request-collection',
+      name: 'Requests',
+      icon: (
+        <span className="flex h-5 w-5 items-center justify-center rounded-sm bg-(--color-surprise) text-(--color-font-surprise)">
+          <Icon className="w-3" icon="bars" />
+        </span>
+      ),
+      isDisabled: !apiSpec?.contents || lintErrors.length > 0 || generateRequestCollectionFetcher.state !== 'idle',
+      tooltip:
+        lintErrors.length > 0
+          ? 'You cannot generate an API collection when spec errors exist. Fix the errors or change the ruleset first.'
+          : 'Auto populate this API collection with a request for each endpoint in the spec',
+      action: () =>
+        generateRequestCollectionFetcher.submit({
+          organizationId,
+          projectId,
+          workspaceId,
+        }),
+    },
+    {
+      id: 'generate-mock-server',
+      name: 'Mock Server',
+      icon: (
+        <span className="flex h-5 w-5 items-center justify-center rounded-sm bg-(--color-warning) text-(--color-font-warning)">
+          <Icon className="w-3" icon="server" />
+        </span>
+      ),
+      badge: <Badge icon="sparkles" color="surprise" label="AI" style={{ marginLeft: 'auto', marginRight: '0' }} />,
+      isDisabled: !apiSpec?.contents || !isGenerateMockServersWithAIEnabled,
+      action: () => {
+        window.main.trackAnalyticsEvent({
+          event: AnalyticsEvent.designerGenerateMockClicked,
+        });
+        setNewMockServerModalOpen(true);
+      },
+    },
+  ];
+
+  const specFormatActionList: SpecActionItem[] = [
+    {
+      id: 'json',
+      name: 'JSON',
+      action: () => switchFormat('json'),
+    },
+    {
+      id: 'yaml',
+      name: 'YAML',
+      action: () => switchFormat('yaml'),
+    },
+  ];
+
+  const generateDisabledKeys = generateActionList.filter(item => item.isDisabled).map(item => item.id);
+  const historyKey = `${activeWorkspace._id}::${apiSpec?._id}::${apiSpec?.created}::${gitVersion}::${vcsVersion}`;
+
+  const [direction, setDirection] = useState<'horizontal' | 'vertical'>(
+    settings.forceVerticalLayout ? 'vertical' : 'horizontal',
+  );
+  useLayoutEffect(() => {
+    if (settings.forceVerticalLayout) {
+      setDirection('vertical');
+      return () => {};
+    }
+    // Listen on media query changes
+    const mediaQuery = window.matchMedia('(max-width: 880px)');
+    setDirection(mediaQuery.matches ? 'vertical' : 'horizontal');
+
+    const handleChange = (e: MediaQueryListEvent) => {
+      setDirection(e.matches ? 'vertical' : 'horizontal');
+    };
+
+    mediaQuery.addEventListener('change', handleChange);
+
+    return () => {
+      mediaQuery.removeEventListener('change', handleChange);
+    };
+  }, [settings.forceVerticalLayout, direction]);
+
+  const specEditor = (
+    <div className="relative flex h-full w-full overflow-hidden">
+      <CodeEditor
+        id="spec-editor"
+        key={historyKey}
+        showPrettifyButton
+        ref={editor}
+        lintOptions={lintOptions}
+        mode={apiSpec?.contents ? 'openapi' : undefined}
+        defaultValue={apiSpec?.contents || ''}
+        onChange={onCodeEditorChange}
+        historyKey={historyKey}
+      />
+      {apiSpec?.contents ? null : (
+        <DesignEmptyState
+          onImport={(value, generateRequestCollection = false) => {
+            updateApiSpec({
+              organizationId,
+              projectId,
+              workspaceId,
+              contents: value,
+              fromTemplate: true,
+              generateRequestCollection,
+            });
+          }}
+          onCreateRequest={requestType => {
+            newRequestFetcher.submit({
+              organizationId,
+              projectId,
+              workspaceId,
+              requestType,
+              parentId: workspaceId,
+            });
+          }}
+          onCreateFolder={() =>
+            showModal(PromptModal, {
+              title: 'New Folder',
+              defaultValue: 'My Folder',
+              submitName: 'Create',
+              label: 'Name',
+              selectText: true,
+              onComplete: (name: string) =>
+                newRequestGroupFetcher.submit({
+                  organizationId,
+                  projectId,
+                  workspaceId,
+                  parentId: workspaceId,
+                  name,
+                }),
+            })
+          }
+        />
+      )}
+    </div>
+  );
+
+  const specPaneToolbar = apiSpec?.contents ? (
+    <div className="flex h-10 shrink-0 items-center gap-2 overflow-hidden border-b border-solid border-(--hl-md) px-(--padding-sm)">
+      <span className="truncate text-sm text-(--hl) italic">
+        {parsedSpec?.openapi ? `OpenAPI ${parsedSpec.openapi}` : ''}
+      </span>
+      <span className="flex-1" />
+      <MenuTrigger>
+        <Button
+          aria-label="Generate"
+          className="flex shrink-0 items-center justify-center gap-2 rounded-md border border-solid border-(--hl-md) px-2.5 py-1 text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
+        >
+          <span>Generate</span>
+          <Icon icon="chevron-down" className="w-2.5 text-(--hl)" />
+        </Button>
+        <Popover className="flex min-w-max flex-col overflow-y-hidden">
+          <Menu
+            aria-label="Generate menu"
+            selectionMode="single"
+            disabledKeys={generateDisabledKeys}
+            onAction={key => {
+              const item = generateActionList.find(item => item.id === key);
+              if (item) {
+                item.action();
+              }
+            }}
+            items={generateActionList}
+            className="min-w-max overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) py-2 text-sm shadow-lg select-none focus:outline-hidden"
+          >
+            {item => (
+              <TooltipTrigger delay={0} isDisabled={!item.tooltip}>
+                <MenuItem
+                  id={item.id}
+                  textValue={item.name}
+                  className="flex h-(--line-height-xs) w-full items-center gap-2 bg-transparent px-(--padding-sm) whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden disabled:cursor-not-allowed aria-disabled:cursor-not-allowed aria-disabled:text-(--hl-md) aria-selected:font-bold"
+                  aria-label={item.name}
+                >
+                  {item.icon}
+                  <span>{item.name}</span>
+                  {item.badge && (
+                    <span className="flex origin-left scale-90 items-center pl-2 text-xs">{item.badge}</span>
+                  )}
+                </MenuItem>
+                <Tooltip
+                  offset={8}
+                  className="max-w-xs rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-2 py-1 text-sm text-(--color-font) shadow-lg"
+                >
+                  {item.tooltip}
+                </Tooltip>
+              </TooltipTrigger>
+            )}
+          </Menu>
+        </Popover>
+      </MenuTrigger>
+      <MenuTrigger>
+        <Button
+          aria-label="Spec format"
+          className="flex shrink-0 items-center justify-center gap-2 rounded-md border border-solid border-(--hl-md) px-2.5 py-1 text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
+        >
+          <span>{specFormat ? specFormat.toUpperCase() : 'JSON'}</span>
+          <Icon icon="chevron-down" className="w-2.5 text-(--hl)" />
+        </Button>
+        <Popover className="flex min-w-max flex-col overflow-y-hidden">
+          <div className="min-w-max overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) py-2 text-sm shadow-lg select-none">
+            <span className="block px-(--padding-md) py-1 text-xs text-(--hl)">Spec format</span>
+            <Menu
+              aria-label="Spec format menu"
+              selectionMode="single"
+              selectedKeys={specFormat ? [specFormat] : []}
+              onAction={key => {
+                const item = specFormatActionList.find(item => item.id === key);
+                if (item) {
+                  item.action();
+                }
+              }}
+              items={specFormatActionList}
+              className="min-w-max focus:outline-hidden"
+            >
+              {item => (
+                <MenuItem
+                  className="flex h-(--line-height-xs) w-full items-center gap-2 bg-transparent px-(--padding-sm) whitespace-nowrap text-(--color-font) transition-colors hover:bg-(--hl-sm) focus:bg-(--hl-xs) focus:outline-hidden aria-selected:font-bold"
+                  aria-label={item.name}
+                >
+                  <span>{item.name}</span>
+                </MenuItem>
+              )}
+            </Menu>
+          </div>
+        </Popover>
+      </MenuTrigger>
+      <TooltipTrigger delay={0}>
+        <ToggleButton
+          aria-label="Toggle preview"
+          data-testid="preview-toggle"
+          isSelected={isSpecPaneOpen}
+          className="flex shrink-0 items-center justify-center rounded-md border border-solid border-(--hl-md) px-2 py-1 text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset"
+          onChange={value => {
+            setIsSpecPaneOpen(value);
+            window.main.trackAnalyticsEvent({
+              event: AnalyticsEvent.designerPreviewToggled,
+              properties: {
+                status: !value ? 'open' : 'collapsed',
+              },
+            });
+          }}
+        >
+          {({ isSelected }) => (
+            <span className="flex h-5 w-5 items-center justify-center">
+              <Icon icon={isSelected ? 'eye-slash' : 'eye'} fixedWidth />
+            </span>
+          )}
+        </ToggleButton>
+        <Tooltip
+          offset={8}
+          className="rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-2 py-1 text-sm text-(--color-font) shadow-lg"
+        >
+          {isSpecPaneOpen ? 'Hide docs preview' : 'Show docs preview'}
+        </Tooltip>
+      </TooltipTrigger>
+    </div>
+  ) : null;
+
+  const isRulesetInvalid = !!rulesetImportIssue && !rulesetContent;
+
+  const lintToolbar = (
+    <div
+      className={`flex h-(--line-height-sm) items-center gap-2 overflow-hidden border-solid border-(--hl-md) px-(--padding-sm) ${isLintPaneOpen ? 'border-b' : ''}`}
+    >
+      <div className="inline-flex items-center gap-2">
+        <Icon icon={selectedRulesetPath && !isRulesetInvalid ? 'file-circle-check' : 'file-circle-xmark'} />
+        {!isRulesetInvalid && selectedRulesetPath && (
+          <>
+            <TooltipTrigger delay={0}>
+              <Button
+                aria-label="View selected ruleset content"
+                className="underline"
+                onPress={() => setIsViewRulesetModalOpen(true)}
+              >
+                Custom Ruleset
+              </Button>
+              <Tooltip
+                placement="top end"
+                offset={8}
+                className="max-h-[85vh] max-w-xs overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-4 py-2 text-sm text-(--color-font) shadow-lg select-none focus:outline-hidden"
+              >
+                <p className="mb-2">Using ruleset from</p>
+                <code className="block p-0 break-all whitespace-pre-wrap">{selectedRulesetPath}</code>
+              </Tooltip>
+            </TooltipTrigger>
+            {rulesetHasRemoteExtendsEntries && (
+              <TooltipTrigger delay={0}>
+                <Button
+                  aria-label="Refresh ruleset from remote sources"
+                  isDisabled={isRefreshing}
+                  onPress={handleRefreshRuleset}
+                  className="flex aspect-square h-6 shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset disabled:opacity-50 aria-pressed:bg-(--hl-sm)"
+                >
+                  <Icon icon={isRefreshing ? 'spinner' : 'rotate'} className={isRefreshing ? 'animate-spin' : ''} />
+                </Button>
+                <Tooltip
+                  placement="top end"
+                  offset={8}
+                  className="max-h-[85vh] max-w-xs overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-4 py-2 text-sm text-(--color-font) shadow-lg select-none focus:outline-hidden"
+                >
+                  <p>Recompile ruleset, including re-fetching any referenced remote entries.</p>
+                  {rulesetLastCompiledAt && (
+                    <p className="mt-1">{`Last updated ${new Date(rulesetLastCompiledAt).toLocaleString()}`}.</p>
+                  )}
+                </Tooltip>
+              </TooltipTrigger>
+            )}
+            <TooltipTrigger delay={0}>
+              <Button
+                aria-label="Remove custom ruleset"
+                onPress={handleUnselectSpectralFile}
+                className="flex aspect-square h-6 shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
+              >
+                <Icon icon="xmark" />
+              </Button>
+              <Tooltip
+                placement="top end"
+                offset={8}
+                className="max-h-[85vh] max-w-xs overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-4 py-2 text-sm text-(--color-font) shadow-lg select-none focus:outline-hidden"
+              >
+                <p>Clear custom ruleset and use default OAS ruleset</p>
+              </Tooltip>
+            </TooltipTrigger>
+          </>
+        )}
+        {!selectedRulesetPath && (
+          <>
+            <span>Default OAS Ruleset</span>
+            {isRulesetInvalid && (
+              <TooltipTrigger delay={0}>
+                <Button
+                  aria-label="Invalid ruleset details"
+                  className="flex aspect-square h-6 shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
+                >
+                  <Icon icon="triangle-exclamation" className="text-(--color-warning)" />
+                </Button>
+                <Tooltip
+                  placement="top end"
+                  offset={8}
+                  className="max-h-[85vh] max-w-xs overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-4 py-2 text-sm text-(--color-font) shadow-lg select-none focus:outline-hidden"
+                >
+                  <p className="mb-2">
+                    The custom ruleset in this project contains invalid content: {rulesetImportIssue}
+                  </p>
+                  <p>Fix the syntax in your connected git repository. The default OAS ruleset is used until then.</p>
+                </Tooltip>
+              </TooltipTrigger>
+            )}
+            <TooltipTrigger delay={0}>
+              <Button
+                aria-label="Upload custom ruleset"
+                onPress={handleSelectSpectralFile}
+                className="flex aspect-square h-6 shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
+              >
+                <Icon icon="upload" />
+              </Button>
+              <Tooltip
+                placement="top end"
+                offset={8}
+                className="max-h-[85vh] max-w-xs overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-4 py-2 text-sm text-(--color-font) shadow-lg select-none focus:outline-hidden"
+              >
+                <p>
+                  Upload a custom Spectral ruleset
+                  {isConnectedGitProject && (
+                    <span>
+                      {' '}
+                      or add a <code className="p-0">.spectral.yaml</code> file to the root of your connected git
+                      repository
+                    </span>
+                  )}
+                  . Any local files or remote URLs referenced via <code className="p-0">extends</code> will be bundled
+                  into a single ruleset on upload.
+                </p>
+              </Tooltip>
+            </TooltipTrigger>
+          </>
+        )}
+      </div>
+      <span className="flex-1" />
+      <div className="flex items-center gap-2">
+        {lintErrors.length > 0 && (
+          <div className="flex items-center gap-2 select-none">
+            <Icon icon="circle-xmark" className="text-(--color-danger)" />
+          </div>
+        )}
+        {lintWarnings.length > 0 && (
+          <div className="flex items-center gap-2 select-none">
+            <Icon icon="triangle-exclamation" className="text-(--color-warning)" />
+          </div>
+        )}
+        {apiSpec?.contents && (
+          <div className="flex items-center gap-2 select-none">
+            {lintMessages.length === 0 && <Icon icon="check-square" className="text-(--color-success)" />}
+            {lintMessages.length === 0 ? (
+              'No lint problems'
+            ) : (
+              <Button
+                data-testid="lint-panel-toggle"
+                onPress={() => (isLintPaneOpen ? lintPanelRef.current?.collapse() : lintPanelRef.current?.expand())}
+              >
+                <span className="underline">
+                  {lintErrors.length} {lintErrors.length === 1 ? 'error' : 'errors'}, {lintWarnings.length}{' '}
+                  {lintWarnings.length === 1 ? 'warning' : 'warnings'}
+                </span>
+              </Button>
+            )}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+
+  const lintMessageList = (
+    <div className="flex-1 overflow-y-auto select-none">
+      {groupedLintMessages.map(item => (
+        <div
+          key={item.code}
+          className="flex flex-col text-xs"
+          aria-expanded={expandedLintMessageCodes.includes(item.code)}
+        >
+          <Button
+            className="flex cursor-pointer items-center gap-2 p-(--padding-sm) outline-hidden transition-colors hover:bg-(--hl-sm)"
+            onPress={() =>
+              setExpandedLintMessageCodes(prev =>
+                prev.includes(item.code) ? prev.filter(c => c !== item.code) : [...prev, item.code],
+              )
+            }
+          >
+            <Icon
+              icon={expandedLintMessageCodes.includes(item.code) ? 'chevron-down' : 'chevron-right'}
+              className="h-2.5 w-2.5"
+            />
+            ({item.occurrences.length})
+            <Icon
+              className={item.type === 'error' ? 'text-(--color-danger)' : 'text-(--color-warning)'}
+              icon={item.type === 'error' ? 'circle-xmark' : 'triangle-exclamation'}
+            />
+            <span className="truncate">
+              {item.code}: {item.message}
+            </span>
+          </Button>
+          {expandedLintMessageCodes.includes(item.code) && (
+            <div className="flex flex-col gap-0.5">
+              {item.occurrences.map(occurrence => (
+                <Button
+                  key={`${occurrence.line}-${occurrence.path}-${occurrence.range.start.line}:${occurrence.range.start.character}-${occurrence.range.end.line}:${occurrence.range.end.character}`}
+                  className="flex gap-2 p-(--padding-sm) pl-5.5 text-left hover:bg-(--hl-sm)"
+                  onPress={() => handleScrollToLintMessage(occurrence)}
+                >
+                  <span className="shrink-0 underline">Ln {occurrence.line + 1}</span>
+                  {occurrence.path && <span className="truncate opacity-60">{occurrence.path}</span>}
+                </Button>
+              ))}
+            </div>
+          )}
+        </div>
+      ))}
+    </div>
+  );
+
+  return (
+    <PanelGroup
+      ref={sidebarPanelRef}
+      autoSaveId="spec-panel-group"
+      id="spec-panel-group"
+      className="new-sidebar w-full flex-1 text-(--color-font)"
+      direction="horizontal"
+    >
+      <Panel
+        id="spec-sidebar"
+        ref={specSidebarRef}
+        className="sidebar theme--sidebar"
+        defaultSize={DEFAULT_SIDEBAR_SIZE}
+        maxSize={40}
+        minSize={10}
+        collapsible
+      >
+        <div className="flex flex-1 flex-col divide-y divide-solid divide-(--hl-md) overflow-hidden">
+          <div className="flex flex-1 flex-col divide-y divide-solid divide-(--hl-md) overflow-y-auto">
+            {/* Info */}
+            {info && (
+              <div className="divide-y divide-solid divide-(--hl-md)">
+                <Button
+                  className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
+                  onPress={() => {
+                    expandedKeys.includes('info')
+                      ? setExpandedKeys(expandedKeys.filter(key => key !== 'info'))
+                      : setExpandedKeys([...expandedKeys, 'info']);
+                  }}
+                >
+                  <span className="truncate">Info</span>
+                  <Icon icon={expandedKeys.includes('info') ? 'minus' : 'plus'} className="text-xs" />
+                </Button>
+                {/* Info */}
+                {expandedKeys.includes('info') && (
+                  <ListBox onAction={key => navigateToPath(key.toString())}>
+                    <ListBoxItem
+                      className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
+                      id="info.title"
+                    >
+                      <span className="truncate">Title: {info.title}</span>
+                    </ListBoxItem>
+                    <ListBoxItem
+                      className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
+                      id="info.description"
+                    >
+                      <span className="truncate">Description: {info.description}</span>
+                    </ListBoxItem>
+                    <ListBoxItem
+                      className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
+                      id="info.version"
+                    >
+                      <span className="truncate">Version: {info.version}</span>
+                    </ListBoxItem>
+                    <ListBoxItem
+                      className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
+                      id="info.license"
+                    >
+                      <span className="truncate">License: {info.license?.name}</span>
+                    </ListBoxItem>
+                  </ListBox>
+                )}
+              </div>
+            )}
+            {/* Servers */}
+            {servers && (
+              <div className="divide-y divide-solid divide-(--hl-md)">
+                <div>
+                  <Button
+                    className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
+                    onPress={() => {
+                      expandedKeys.includes('servers')
+                        ? setExpandedKeys(expandedKeys.filter(key => key !== 'servers'))
+                        : setExpandedKeys([...expandedKeys, 'servers']);
+                    }}
+                  >
+                    <span className="truncate">Servers</span>
+                    <Icon icon={expandedKeys.includes('servers') ? 'minus' : 'plus'} className="text-xs" />
+                  </Button>
+                </div>
+                {expandedKeys.includes('servers') && (
+                  <ListBox
+                    items={servers.map((server, index) => ({
+                      path: index,
+                      ...server,
+                    }))}
+                    onAction={key => navigateToPath(key.toString())}
+                  >
+                    {item => (
+                      <ListBoxItem
+                        className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
+                        id={`servers.${item.path}`}
+                      >
+                        {item.url}
+                      </ListBoxItem>
+                    )}
+                  </ListBox>
+                )}
+              </div>
+            )}
+            {/* Paths */}
+            {paths && (
+              <div className="divide-y divide-solid divide-(--hl-md)">
+                <div>
+                  <Button
+                    className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
+                    onPress={() => {
+                      expandedKeys.includes('paths')
+                        ? setExpandedKeys(expandedKeys.filter(key => key !== 'paths'))
+                        : setExpandedKeys([...expandedKeys, 'paths']);
+                    }}
+                  >
+                    <span className="truncate">Paths</span>
+                    <Icon icon={expandedKeys.includes('paths') ? 'minus' : 'plus'} className="text-xs" />
+                  </Button>
+                </div>
+                {expandedKeys.includes('paths') && (
+                  <GridList
+                    items={Object.entries(paths).map(([path, item]) => ({
+                      ...item,
+                      id: path,
+                      path,
+                    }))}
+                    onAction={key => navigateToPath(key.toString())}
+                  >
+                    {item => (
+                      <GridListItem className="group outline-hidden select-none" id={`paths.${item.path}`}>
+                        <div className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none group-hover:bg-(--hl-xs) group-focus:bg-(--hl-sm) group-aria-selected:text-(--color-font)">
+                          <span className="truncate">{item.path}</span>
+                          <span className="flex-1" />
+                          {getMethodsFromOpenApiPathItem(item).map(method => (
+                            <Button
+                              key={method}
+                              onPress={() => navigateToPath(`paths.${item.path}.${method}`)}
+                              className={`flex w-10 shrink-0 items-center justify-center rounded-xs border border-solid border-(--hl-sm) text-[0.65rem] http-method-${method.toUpperCase()}`}
+                            >
+                              {formatMethodName(method.toUpperCase())}
+                            </Button>
+                          ))}
+                        </div>
+                      </GridListItem>
+                    )}
+                  </GridList>
+                )}
+              </div>
+            )}
+            {/* RequestBodies */}
+            {requestBodies && (
+              <div className="divide-y divide-solid divide-(--hl-md)">
+                <div>
+                  <Button
+                    className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
+                    onPress={() => {
+                      expandedKeys.includes('requestBodies')
+                        ? setExpandedKeys(expandedKeys.filter(key => key !== 'requestBodies'))
+                        : setExpandedKeys([...expandedKeys, 'requestBodies']);
+                    }}
+                  >
+                    <span className="truncate">Request bodies</span>
+                    <Icon icon={expandedKeys.includes('requestBodies') ? 'minus' : 'plus'} className="text-xs" />
+                  </Button>
+                </div>
+                {expandedKeys.includes('requestBodies') && (
+                  <ListBox
+                    items={Object.entries(requestBodies).map(([path, item]) => ({
+                      ...item,
+                      id: path,
+                      path,
+                    }))}
+                    onAction={key => navigateToPath(key.toString())}
+                  >
+                    {item => (
+                      <ListBoxItem
+                        className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
+                        id={`components.requestBodies.${item.path}`}
+                      >
+                        <span className="truncate">{item.path}</span>
+                      </ListBoxItem>
+                    )}
+                  </ListBox>
+                )}
+              </div>
+            )}
+            {/* Responses */}
+            {responses && (
+              <div className="divide-y divide-solid divide-(--hl-md)">
+                <div>
+                  <Button
+                    className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
+                    onPress={() => {
+                      expandedKeys.includes('responses')
+                        ? setExpandedKeys(expandedKeys.filter(key => key !== 'responses'))
+                        : setExpandedKeys([...expandedKeys, 'responses']);
+                    }}
+                  >
+                    <span className="truncate">Responses</span>
+                    <Icon icon={expandedKeys.includes('responses') ? 'minus' : 'plus'} className="text-xs" />
+                  </Button>
+                </div>
+                {expandedKeys.includes('responses') && (
+                  <ListBox
+                    items={Object.entries(responses).map(([path, item]) => ({
+                      ...item,
+                      id: path,
+                      path,
+                    }))}
+                    onAction={key => navigateToPath(key.toString())}
+                  >
+                    {item => (
+                      <ListBoxItem
+                        className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
+                        id={`components.responses.${item.path}`}
+                      >
+                        <span className="truncate">{item.path}</span>
+                      </ListBoxItem>
+                    )}
+                  </ListBox>
+                )}
+              </div>
+            )}
+            {/* Parameters */}
+            {parameters && (
+              <div className="divide-y divide-solid divide-(--hl-md)">
+                <div>
+                  <Button
+                    className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
+                    onPress={() => {
+                      expandedKeys.includes('parameters')
+                        ? setExpandedKeys(expandedKeys.filter(key => key !== 'parameters'))
+                        : setExpandedKeys([...expandedKeys, 'parameters']);
+                    }}
+                  >
+                    <span className="truncate">Parameters</span>
+                    <Icon icon={expandedKeys.includes('parameters') ? 'minus' : 'plus'} className="text-xs" />
+                  </Button>
+                </div>
+                {expandedKeys.includes('parameters') && (
+                  <ListBox
+                    items={Object.entries(parameters).map(([path, item]) => ({
+                      ...item,
+                      id: path,
+                      path,
+                    }))}
+                    onAction={key => navigateToPath(key.toString())}
+                  >
+                    {item => (
+                      <ListBoxItem
+                        className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
+                        id={`components.parameters.${item.path}`}
+                      >
+                        <span className="truncate">{item.path}</span>
+                      </ListBoxItem>
+                    )}
+                  </ListBox>
+                )}
+              </div>
+            )}
+            {/* Headers */}
+            {headers && (
+              <div className="divide-y divide-solid divide-(--hl-md)">
+                <div>
+                  <Button
+                    className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
+                    onPress={() => {
+                      expandedKeys.includes('headers')
+                        ? setExpandedKeys(expandedKeys.filter(key => key !== 'headers'))
+                        : setExpandedKeys([...expandedKeys, 'headers']);
+                    }}
+                  >
+                    <span className="truncate">Headers</span>
+                    <Icon icon={expandedKeys.includes('headers') ? 'minus' : 'plus'} className="text-xs" />
+                  </Button>
+                </div>
+                {expandedKeys.includes('headers') && (
+                  <ListBox
+                    items={Object.entries(headers).map(([path, item]) => ({
+                      ...item,
+                      id: path,
+                      path,
+                    }))}
+                    onAction={key => navigateToPath(key.toString())}
+                  >
+                    {item => (
+                      <ListBoxItem
+                        className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
+                        id={`components.headers.${item.path}`}
+                      >
+                        <span className="truncate">{item.path}</span>
+                      </ListBoxItem>
+                    )}
+                  </ListBox>
+                )}
+              </div>
+            )}
+            {/* Schemas */}
+            {schemas && (
+              <div className="divide-y divide-solid divide-(--hl-md)">
+                <div>
+                  <Button
+                    className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
+                    onPress={() => {
+                      expandedKeys.includes('schemas')
+                        ? setExpandedKeys(expandedKeys.filter(key => key !== 'schemas'))
+                        : setExpandedKeys([...expandedKeys, 'schemas']);
+                    }}
+                  >
+                    <span className="truncate">Schemas</span>
+                    <Icon icon={expandedKeys.includes('schemas') ? 'minus' : 'plus'} className="text-xs" />
+                  </Button>
+                </div>
+                {expandedKeys.includes('schemas') && (
+                  <ListBox
+                    items={Object.entries(schemas).map(([path, item]) => ({
+                      ...item,
+                      id: path,
+                      path,
+                    }))}
+                    onAction={key => navigateToPath(key.toString())}
+                  >
+                    {item => (
+                      <ListBoxItem
+                        className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
+                        id={`components.schemas.${item.path}`}
+                      >
+                        <span className="truncate">{item.path}</span>
+                      </ListBoxItem>
+                    )}
+                  </ListBox>
+                )}
+              </div>
+            )}
+            {/* Security */}
+            {securitySchemes && (
+              <div className="divide-y divide-solid divide-(--hl-md)">
+                <div>
+                  <Button
+                    className="flex w-full items-center justify-between gap-2 p-(--padding-sm) text-sm text-(--hl) uppercase select-none hover:bg-(--hl-sm) focus:bg-(--hl-sm)"
+                    onPress={() => {
+                      expandedKeys.includes('security')
+                        ? setExpandedKeys(expandedKeys.filter(key => key !== 'security'))
+                        : setExpandedKeys([...expandedKeys, 'security']);
+                    }}
+                  >
+                    <span className="truncate">Security</span>
+                    <Icon icon={expandedKeys.includes('security') ? 'minus' : 'plus'} className="text-xs" />
+                  </Button>
+                </div>
+                {expandedKeys.includes('security') && (
+                  <ListBox
+                    items={Object.entries(securitySchemes).map(([path, item]) => ({
+                      ...item,
+                      id: path,
+                      path,
+                    }))}
+                    onAction={key => navigateToPath(key.toString())}
+                  >
+                    {item => (
+                      <ListBoxItem
+                        className="relative flex h-(--line-height-xs) w-full items-center gap-2 overflow-hidden px-4 text-(--hl) outline-hidden transition-colors select-none hover:bg-(--hl-xs) focus:bg-(--hl-sm)"
+                        id={`components.securitySchemes.${item.path}`}
+                      >
+                        <span className="truncate">{item.path}</span>
+                      </ListBoxItem>
+                    )}
+                  </ListBox>
+                )}
+              </div>
+            )}
+          </div>
+          {isNewMockServerModalOpen && apiSpec && (
+            <NewWorkspaceModal
+              isOpen={isNewMockServerModalOpen}
+              project={activeProject}
+              storageRules={storageRules}
+              scope="mock-server"
+              sourceApiSpec={apiSpec}
+              source="design-view"
+              onOpenChange={setNewMockServerModalOpen}
+            />
+          )}
+          {isViewRulesetModalOpen && (
+            <ModalOverlay
+              isOpen={isViewRulesetModalOpen}
+              onOpenChange={setIsViewRulesetModalOpen}
+              isDismissable
+              className="fixed top-0 left-0 z-10 flex h-(--visual-viewport-height) w-full items-center justify-center bg-black/30"
+            >
+              <Modal className="max-h-full w-full max-w-225 overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) p-(--padding-lg) text-(--color-font)">
+                <Dialog className="relative outline-hidden">
+                  {({ close }) => (
+                    <>
+                      <div className="flex items-center justify-between gap-2 pb-(--padding-sm)">
+                        <Heading slot="title" className="mb-3.5 text-[22px] leading-8.5">
+                          Existing Ruleset Contents
+                        </Heading>
+                        <Button
+                          aria-label="Close ruleset content viewer"
+                          onPress={close}
+                          className="fa fa-times absolute top-0 right-0 text-xl"
+                        />
+                      </div>
+                      {rulesetContent && (
+                        <CodeEditor
+                          id="ruleset-viewer"
+                          mode="yaml"
+                          readOnly
+                          noLint
+                          defaultValue={rulesetContent}
+                          className="h-100"
+                        />
+                      )}
+                    </>
+                  )}
+                </Dialog>
+              </Modal>
+            </ModalOverlay>
+          )}
+        </div>
+      </Panel>
+      <PanelResizeHandle className="h-full w-px bg-(--hl-md)" />
+      <Panel id="spec-content" className="flex flex-col">
+        {specPaneToolbar}
+        <PanelGroup autoSaveId="spec-panels" direction={direction} className="min-h-0 flex-1">
+          <Panel id="spec-pane-one" minSize={10} className="pane-one theme--pane">
+            <div className="flex h-full w-full flex-col">
+              <PanelGroup autoSaveId="insomnia-spec-vertical" direction="vertical" className="min-h-0 flex-1">
+                <Panel id="spec-editor" defaultSize={80} minSize={20} className="relative overflow-hidden">
+                  {specEditor}
+                </Panel>
+                {apiSpec?.contents && (
+                  <>
+                    <PanelResizeHandle className="h-px w-full bg-(--hl-md)" />
+                    <Panel
+                      ref={lintPanelRef}
+                      id="lint-panel"
+                      defaultSize={0}
+                      minSize={10}
+                      collapsible
+                      onCollapse={() => setIsLintPaneOpen(false)}
+                      onExpand={() => setIsLintPaneOpen(true)}
+                      className="flex flex-col overflow-hidden"
+                    >
+                      {isLintPaneOpen && (
+                        <div data-testid="lint-panel" className="box-border flex h-full flex-col">
+                          {lintToolbar}
+                          {lintMessageList}
+                        </div>
+                      )}
+                    </Panel>
+                  </>
+                )}
+              </PanelGroup>
+              {apiSpec?.contents && !isLintPaneOpen ? lintToolbar : null}
+            </div>
+          </Panel>
+          {isSpecPaneOpen && !!parsedSpec && (
+            <>
+              <PanelResizeHandle
+                className={direction === 'horizontal' ? 'h-full w-px bg-(--hl-md)' : 'h-px w-full bg-(--hl-md)'}
+              />
+              <Panel id="pane-two" minSize={10} className="pane-two theme--pane">
+                <SwaggerUIDiv text={apiSpec?.contents || ''} />
+              </Panel>
+            </>
+          )}
+        </PanelGroup>
+      </Panel>
+    </PanelGroup>
+  );
+};
diff --git a/packages/insomnia/src/ui/components/tabs/tab.tsx b/packages/insomnia/src/ui/components/tabs/tab.tsx
index 74b6b99763..b7d58c7d2e 100644
--- a/packages/insomnia/src/ui/components/tabs/tab.tsx
+++ b/packages/insomnia/src/ui/components/tabs/tab.tsx
@@ -4,6 +4,7 @@ import { models } from 'insomnia-data';
 import React, { useCallback } from 'react';
 import { Button, GridListItem } from 'react-aria-components';
 
+import { scopeToBgColorMap, scopeToIconMap, scopeToTextColorMap } from '~/common/get-workspace-label';
 import type { WorkspaceFileIssue } from '~/main/git-service';
 import { scrollElementIntoView } from '~/ui/utils';
 
@@ -56,24 +57,24 @@ const REQUEST_METHOD_STYLE_MAP: Record<string, string> = {
 
 const WORKSPACE_TAB_UI_MAP: Partial<Record<TabType, any>> = {
   collection: {
-    icon: 'bars',
-    bgColor: 'bg-(--color-surprise)',
-    textColor: 'text-(--color-font-surprise)',
+    icon: scopeToIconMap.collection,
+    bgColor: scopeToBgColorMap.collection,
+    textColor: scopeToTextColorMap.collection,
   },
   environment: {
-    icon: 'code',
-    bgColor: 'bg-(--color-font)',
-    textColor: 'text-(--color-bg)',
+    icon: scopeToIconMap.environment,
+    bgColor: scopeToBgColorMap.environment,
+    textColor: scopeToTextColorMap.environment,
   },
   mockServer: {
-    icon: 'server',
-    bgColor: 'bg-(--color-warning)',
-    textColor: 'text-(--color-font-warning)',
+    icon: scopeToIconMap['mock-server'],
+    bgColor: scopeToBgColorMap['mock-server'],
+    textColor: scopeToTextColorMap['mock-server'],
   },
   document: {
-    icon: 'file',
-    bgColor: 'bg-(--color-info)',
-    textColor: 'text-(--color-font-info)',
+    icon: scopeToIconMap.design,
+    bgColor: scopeToBgColorMap.design,
+    textColor: scopeToTextColorMap.design,
   },
 };
 
diff --git a/packages/insomnia/src/ui/components/templating/tag-editor.tsx b/packages/insomnia/src/ui/components/templating/tag-editor.tsx
index 6d9b4afb9f..091c06a167 100644
--- a/packages/insomnia/src/ui/components/templating/tag-editor.tsx
+++ b/packages/insomnia/src/ui/components/templating/tag-editor.tsx
@@ -2,12 +2,11 @@ import classnames from 'classnames';
 import clone from 'clone';
 import type { BaseModel, CloudProviderCredential, PluginData, Request, RequestGroup, Workspace } from 'insomnia-data';
 import { models, services } from 'insomnia-data';
-import React, { type FC, useCallback, useEffect, useState } from 'react';
+import React, { type FC, useCallback, useEffect, useRef, useState } from 'react';
 import { Button, Link } from 'react-aria-components';
 import * as reactUse from 'react-use';
 
 import { getAppBundlePlugins } from '~/common/constants';
-import { generateId } from '~/common/misc';
 import { localTemplateTags } from '~/common/templating/local-template-tags';
 import type { NunjucksParsedTag, NunjucksParsedTagArg } from '~/common/templating/types';
 import * as templateUtils from '~/common/templating/utils';
@@ -42,6 +41,7 @@ interface Props {
   workspace: Workspace;
   editorId?: string;
   close: () => void;
+  onRenderingChange: (rendering: boolean) => void;
 }
 
 interface State {
@@ -89,6 +89,15 @@ export const TagEditor: FC<Props> = props => {
   });
   const { handleRender, handleGetRenderContext } = useNunjucks({ renderContext: { purpose: 'preview' } });
 
+  const isEditorMountedRef = useRef(true);
+  useEffect(() => {
+    isEditorMountedRef.current = true;
+    return () => {
+      // Mark the editor as unmounted to prevent state updates on an unmounted component.
+      isEditorMountedRef.current = false;
+    };
+  }, []);
+
   const refreshModels = useCallback(async () => {
     setState(state => ({ ...state, loadingDocs: true }));
     const allDocs: Record<string, BaseModel[]> = {};
@@ -193,7 +202,7 @@ export const TagEditor: FC<Props> = props => {
   // Generate a unique tag id for the vault and link it to the credential in pluginData.
   // Update the tag arg to store the unique id instead of the raw (per-user) credential id.
   function convertLegacyCredentialTag(legacyCredentialId: string, argIndex: number) {
-    const tagUniqueId = generateId('externalVaultTag');
+    const tagUniqueId = templateUtils.generateExternalVaultTagId();
     updateArg(tagUniqueId, argIndex);
     return services.pluginData
       .upsertByKey(vaultPluginName, tagUniqueId, legacyCredentialId)
@@ -226,6 +235,7 @@ export const TagEditor: FC<Props> = props => {
   ) {
     const start = Date.now();
     setState(state => ({ ...state, rendering: true }));
+    props.onRenderingChange(true);
     let preview = '';
     let error = '';
     let activeTagData: NunjucksParsedTag | null = tagData;
@@ -253,6 +263,11 @@ export const TagEditor: FC<Props> = props => {
       }
     }
 
+    if (!isEditorMountedRef.current) {
+      // Editor is not mounted, abort the onChange
+      return;
+    }
+
     setState(state => ({
       ...state,
       tagDefinitions,
@@ -267,6 +282,7 @@ export const TagEditor: FC<Props> = props => {
     // Make rendering take at least this long so we can see a spinner
     await delay(300 - (Date.now() - start));
     setState(state => ({ ...state, rendering: false, preview }));
+    props.onRenderingChange(false);
   }
 
   const { error, preview, activeTagDefinition, activeTagData, rendering } = state;
diff --git a/packages/insomnia/src/ui/components/toast-notification.tsx b/packages/insomnia/src/ui/components/toast-notification.tsx
index 6e0d8b4bc2..58a4fdffe5 100644
--- a/packages/insomnia/src/ui/components/toast-notification.tsx
+++ b/packages/insomnia/src/ui/components/toast-notification.tsx
@@ -34,6 +34,33 @@ const logTransitionError = (error: unknown) => {
   console.warn('Transition error:', error);
 };
 
+type DocumentWithActiveViewTransition = Document & { activeViewTransition?: ViewTransition | null };
+
+// While a view transition is running - including the moment one gets skipped by a newer one -
+// Chromium retargets hit-testing for the whole viewport to <html>, so a click can arrive with
+// document.documentElement as its target. react-aria's interact-outside reads such an event as a
+// click outside an open modal and closes it (e.g. the settings modal when pressing Check for
+// updates repeatedly). Drop those events: their real target cannot be recovered while the
+// transition is running, and the browser was suppressing hit-testing for that click anyway.
+// Events that land on real elements are untouched, so dialogs, popovers and menus keep behaving
+// as before. This complements the ::view-transition rules in styles.css, which keep clicks
+// reaching real elements in the first place.
+const isRetargetedByViewTransition = (event: Event) =>
+  event.target === document.documentElement &&
+  Boolean((document as DocumentWithActiveViewTransition).activeViewTransition);
+
+const dropRetargetedEvents = (event: Event) => {
+  if (isRetargetedByViewTransition(event)) {
+    event.stopPropagation();
+  }
+};
+
+// Guarded because this module is also evaluated in Node (dev server, prerender), where `window` does not exist.
+if (typeof window !== 'undefined') {
+  window.addEventListener('pointerdown', dropRetargetedEvents, true);
+  window.addEventListener('click', dropRetargetedEvents, true);
+}
+
 // Create a global ToastQueue.
 export const queue = new ToastQueue<RAToastContent>({
   // Wrap state updates in a CSS view transition.
@@ -110,7 +137,7 @@ export const Toaster = () => (
       <Toast
         toast={toast}
         style={{ viewTransitionName: toast.key }}
-        className={`flex items-center gap-4 rounded-lg border border-solid border-(--hl-sm) bg-(--color-bg) px-3 py-2 text-sm text-(--color-font) shadow-lg outline-hidden [view-transition-name:toast]`}
+        className={`flex items-center gap-4 rounded-lg border border-solid border-(--hl-sm) bg-(--color-bg) px-3 py-2 text-sm text-(--color-font) shadow-lg outline-hidden`}
       >
         <ToastContent className="flex min-w-0 flex-1 flex-col">
           <div className="flex items-center gap-2">
diff --git a/packages/insomnia/src/ui/components/unsynced-file-delete-button.tsx b/packages/insomnia/src/ui/components/unsynced-file-delete-button.tsx
new file mode 100644
index 0000000000..8ca6276546
--- /dev/null
+++ b/packages/insomnia/src/ui/components/unsynced-file-delete-button.tsx
@@ -0,0 +1,98 @@
+import { useEffect, useState } from 'react';
+import { Button, Dialog, Heading, Modal, ModalOverlay, Tooltip, TooltipTrigger } from 'react-aria-components';
+
+import { useInsomniaSyncDeleteRemoteFileActionFetcher } from '~/routes/organization.$organizationId.insomnia-sync.delete-remote-file';
+import { Icon } from '~/ui/components/icon';
+import { showToast } from '~/ui/components/toast-notification';
+
+interface Props {
+  organizationId: string;
+  backendProjectId: string;
+  name: string;
+}
+
+export const UnsyncedFileDeleteButton = ({ organizationId, backendProjectId, name }: Props) => {
+  const [isConfirmModalOpen, setIsConfirmModalOpen] = useState(false);
+  const deleteRemoteFileFetcher = useInsomniaSyncDeleteRemoteFileActionFetcher();
+  const isDeleting = deleteRemoteFileFetcher.state !== 'idle';
+  const error = deleteRemoteFileFetcher.data?.error;
+
+  useEffect(() => {
+    if (error && deleteRemoteFileFetcher.state === 'idle') {
+      showToast({
+        title: 'Failed to delete remote file',
+        icon: 'star',
+        status: 'error',
+        description: `Failed to delete ${name}: ${error}`,
+      });
+    }
+  }, [error, deleteRemoteFileFetcher.state, name]);
+
+  return (
+    <>
+      <TooltipTrigger>
+        <Button
+          aria-label="Delete unsynced file"
+          isDisabled={isDeleting}
+          onPress={() => setIsConfirmModalOpen(true)}
+          className="flex aspect-square h-5 shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) opacity-0 ring-1 ring-transparent transition-all group-hover:opacity-100 group-focus:opacity-100 hover:bg-(--hl-xs) hover:text-(--color-danger) focus:opacity-100 focus:ring-(--hl-md) focus:ring-inset"
+        >
+          <Icon icon={isDeleting ? 'spinner' : 'trash'} spin={isDeleting} />
+        </Button>
+        <Tooltip
+          placement="top"
+          offset={8}
+          className="flex max-h-[85vh] min-w-max items-center gap-2 overflow-y-auto rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-4 py-2 text-sm text-(--color-font) shadow-lg select-none focus:outline-hidden"
+        >
+          Delete permanently
+        </Tooltip>
+      </TooltipTrigger>
+      {isConfirmModalOpen && (
+        <ModalOverlay
+          isOpen
+          onOpenChange={() => setIsConfirmModalOpen(false)}
+          isDismissable
+          className="fixed top-0 left-0 z-10 flex h-(--visual-viewport-height) w-full items-center justify-center bg-black/30"
+        >
+          <Modal
+            onOpenChange={() => setIsConfirmModalOpen(false)}
+            className="max-h-full w-full max-w-2xl rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) p-(--padding-lg) text-(--color-font)"
+          >
+            <Dialog className="outline-hidden">
+              {({ close }) => (
+                <div className="flex flex-col gap-4">
+                  <div className="flex items-center justify-between gap-2">
+                    <Heading className="text-2xl">Delete file</Heading>
+                    <Button
+                      className="flex aspect-square h-6 shrink-0 items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
+                      onPress={close}
+                    >
+                      <Icon icon="x" />
+                    </Button>
+                  </div>
+                  <p className="line-clamp-5">
+                    This will permanently delete <strong className="break-all whitespace-pre-wrap">{name}</strong> from
+                    the Cloud for everyone. You cannot undo this action.
+                  </p>
+                  <div className="flex justify-end">
+                    <Button
+                      aria-label="Delete unsynced file permanently"
+                      isDisabled={isDeleting}
+                      onPress={() => {
+                        deleteRemoteFileFetcher.submit({ organizationId, backendProjectId });
+                        close();
+                      }}
+                      className="rounded-xs border border-solid border-(--hl-md) bg-(--color-danger) px-3 py-2 text-(--color-font-danger) transition-colors hover:bg-(--color-danger)/90 hover:no-underline"
+                    >
+                      Delete
+                    </Button>
+                  </div>
+                </div>
+              )}
+            </Dialog>
+          </Modal>
+        </ModalOverlay>
+      )}
+    </>
+  );
+};
diff --git a/packages/insomnia/src/ui/components/websockets/event-view.tsx b/packages/insomnia/src/ui/components/websockets/event-view.tsx
index 9243fa1c46..062294e024 100644
--- a/packages/insomnia/src/ui/components/websockets/event-view.tsx
+++ b/packages/insomnia/src/ui/components/websockets/event-view.tsx
@@ -74,7 +74,7 @@ export const MessageEventView: FC<Props<CurlMessageEvent | WebSocketMessageEvent
           }}
         />
       </div>
-      <div className="grow p-4">
+      <div className="grow p-4 pb-0">
         <CodeEditor
           id="websocket-body-preview"
           hideLineNumbers
diff --git a/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx b/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx
index 24741f5d9c..a0bc5687b1 100644
--- a/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx
+++ b/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx
@@ -10,12 +10,24 @@ import type {
 import { models } from 'insomnia-data';
 import { deserializeNDJSON } from 'insomnia-data/common';
 import React, { type FC, useEffect, useMemo, useState } from 'react';
-import { Button, Input, SearchField, Tab, TabList, TabPanel, Tabs } from 'react-aria-components';
+import {
+  Button,
+  Input,
+  SearchField,
+  Tab,
+  TabList,
+  TabPanel,
+  Tabs,
+  TextField,
+  Tooltip,
+  TooltipTrigger,
+} from 'react-aria-components';
 import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels';
 
 import { docsMcpAuthentication } from '~/common/documentation';
 import { useMcpReadyState } from '~/ui/hooks/use-mcp-ready-state';
 import { useRealtimeConnectionNotifications } from '~/ui/hooks/use-realtime-connection-notifications';
+import { useStreamSummary } from '~/ui/hooks/use-stream-summary';
 
 import { getSetCookieHeaders } from '../../../common/misc';
 import type { McpEvent } from '../../../main/mcp/types';
@@ -26,9 +38,11 @@ import { useRequestLoaderData } from '../../../routes/organization.$organization
 import { AnalyticsEvent } from '../../../ui/analytics';
 import { useReadyState } from '../../hooks/use-ready-state';
 import { useRealtimeConnectionEvents } from '../../hooks/use-realtime-connection-events';
+import { Dropdown, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
 import { ResponseHistoryDropdown } from '../dropdowns/response-history-dropdown';
 import { ErrorBoundary } from '../error-boundary';
 import { Icon } from '../icon';
+import { MarkdownPreview } from '../markdown-preview';
 import { McpEventView } from '../mcp/event-view';
 import { McpNotificationTab } from '../mcp/mcp-notification-tab';
 import { Pane, PaneHeader } from '../panes/pane';
@@ -45,6 +59,94 @@ import { ResponseTimelineViewer } from '../viewers/response-timeline-viewer';
 import { EventLogView } from './event-log-view';
 import { EventView } from './event-view';
 
+const StreamSummaryPanel: FC<{ requestId: string; streamSummary: ReturnType<typeof useStreamSummary> }> = ({
+  requestId,
+  streamSummary,
+}) => {
+  const showWarning = Boolean(streamSummary.resultPath) && streamSummary.summary.fragmentCount === 0;
+  return (
+    <div className="flex h-full flex-col">
+      <div className="flex items-center gap-(--padding-sm) p-(--padding-sm)">
+        <TextField
+          // Uncontrolled: `key` resets the field when switching requests, but typing isn't
+          // clobbered by the round-trip through patchRequestMeta -> loader revalidation
+          // (same reason code-editor.tsx's filter input uses defaultValue, not value).
+          key={requestId}
+          aria-label="Stream summary JSONPath"
+          defaultValue={streamSummary.resultPath ?? ''}
+          onChange={value => {
+            if (value === '') {
+              streamSummary.setResultPath('');
+            }
+          }}
+          className="w-full"
+        >
+          <Input
+            placeholder={streamSummary.inferredPath ?? 'JSONPath, e.g. $.choices[0].delta.content'}
+            onKeyDown={e => {
+              if (e.key === 'Enter') {
+                streamSummary.setResultPath(e.currentTarget.value);
+              }
+            }}
+            className="w-full rounded-sm border border-solid border-(--hl-sm) bg-(--color-bg) px-2 py-1 text-(--color-font) transition-colors focus:ring-1 focus:ring-(--hl-md) focus:outline-hidden"
+          />
+        </TextField>
+        {showWarning && (
+          <TooltipTrigger>
+            <Button
+              aria-label="JSONPath matched no messages"
+              className="flex aspect-square h-full shrink-0 items-center justify-center text-(--color-warning)"
+            >
+              <Icon icon="triangle-exclamation" />
+            </Button>
+            <Tooltip
+              offset={8}
+              className="max-w-xs rounded-md border border-solid border-(--hl-sm) bg-(--color-bg) px-3 py-2 text-sm text-(--color-font) shadow-lg select-none focus:outline-hidden"
+            >
+              This JSONPath did not match any incoming message.
+            </Tooltip>
+          </TooltipTrigger>
+        )}
+        <Dropdown
+          aria-label="Stream summary render mode dropdown"
+          triggerButton={
+            <Button className="tall shrink-0">
+              {streamSummary.renderMarkdown ? 'Markdown' : 'Plain text'}
+              <i className="fa fa-caret-down space-left" />
+            </Button>
+          }
+        >
+          <DropdownSection aria-label="Render as section" title="Render as">
+            <DropdownItem aria-label="Plain text">
+              <ItemContent
+                icon={streamSummary.renderMarkdown ? 'empty' : 'check'}
+                label="Plain text"
+                onClick={() => streamSummary.setRenderMarkdown(false)}
+              />
+            </DropdownItem>
+            <DropdownItem aria-label="Markdown">
+              <ItemContent
+                icon={streamSummary.renderMarkdown ? 'check' : 'empty'}
+                label="Markdown"
+                onClick={() => streamSummary.setRenderMarkdown(true)}
+              />
+            </DropdownItem>
+          </DropdownSection>
+        </Dropdown>
+      </div>
+      <div className="flex-1 overflow-auto p-(--padding-sm)">
+        {streamSummary.renderMarkdown ? (
+          <MarkdownPreview markdown={streamSummary.summary.summary} />
+        ) : (
+          <pre className="font-mono text-sm whitespace-pre-wrap text-(--color-font)">
+            {streamSummary.summary.summary}
+          </pre>
+        )}
+      </div>
+    </div>
+  );
+};
+
 export const RealtimeResponsePane: FC<{ requestId?: string }> = () => {
   const { activeResponse, responses, requestVersions } = useRequestLoaderData()!;
 
@@ -136,6 +238,15 @@ const RealtimeActiveResponsePane: FC<RealtimeActiveResponsePaneProps & { readySt
 
   const allEvents = useRealtimeConnectionEvents({ responseId: response._id, protocol }) as EventType[];
   const allNotifications = useRealtimeConnectionNotifications({ responseId: response._id, protocol });
+  const showStreamSummaryTab = protocol === 'curl';
+  const streamSummary = useStreamSummary({
+    requestId: response.parentId,
+    url: response.url,
+    // Only curl carries stream-summary-shaped data — never feed socketIO's/webSocket's
+    // events in here mislabeled as curl, even though showStreamSummaryTab already hides
+    // the UI for those.
+    events: showStreamSummaryTab ? (allEvents as CurlEvent[]) : [],
+  });
   const handleSelection = (event: EventType) => {
     setSelectedEvent((selected: EventType | null) => (selected?._id === event._id ? null : event));
   };
@@ -260,7 +371,12 @@ const RealtimeActiveResponsePane: FC<RealtimeActiveResponsePaneProps & { readySt
         </div>
         <ResponseHistoryDropdown activeResponse={response} requestVersions={requestVersions} responses={responses} />
       </PaneHeader>
-      <Tabs aria-label="Request group tabs" className="flex h-full w-full flex-1 flex-col">
+      <Tabs
+        key={response._id}
+        aria-label="Request group tabs"
+        className="flex h-full w-full flex-1 flex-col"
+        defaultSelectedKey={showStreamSummaryTab && streamSummary.inferredPath != null ? 'summary' : 'events'}
+      >
         <TabList
           className="flex h-(--line-height-sm) w-full shrink-0 items-center overflow-x-auto border-b border-solid border-b-(--hl-md) bg-(--color-bg)"
           aria-label="Request pane tabs"
@@ -271,6 +387,14 @@ const RealtimeActiveResponsePane: FC<RealtimeActiveResponsePaneProps & { readySt
           >
             Events
           </Tab>
+          {showStreamSummaryTab && (
+            <Tab
+              className="flex h-full shrink-0 cursor-pointer items-center justify-between gap-2 px-3 py-1 text-(--hl) outline-hidden transition-colors duration-300 select-none hover:bg-(--hl-sm) hover:text-(--color-font) focus:bg-(--hl-sm) aria-selected:bg-(--hl-xs) aria-selected:text-(--color-font) aria-selected:hover:bg-(--hl-sm) aria-selected:focus:bg-(--hl-sm)"
+              id="summary"
+            >
+              Summary
+            </Tab>
+          )}
           {models.mcpResponse.isMcpResponse(response) && (
             <Tab
               className="flex h-full shrink-0 cursor-pointer items-center justify-between gap-2 px-3 py-1 text-(--hl) outline-hidden transition-colors duration-300 select-none hover:bg-(--hl-sm) hover:text-(--color-font) focus:bg-(--hl-sm) aria-selected:bg-(--hl-xs) aria-selected:text-(--color-font) aria-selected:hover:bg-(--hl-sm) aria-selected:focus:bg-(--hl-sm)"
@@ -409,6 +533,11 @@ const RealtimeActiveResponsePane: FC<RealtimeActiveResponsePaneProps & { readySt
             )}
           </PanelGroup>
         </TabPanel>
+        {showStreamSummaryTab && (
+          <TabPanel className="flex w-full flex-1 flex-col overflow-hidden" id="summary">
+            <StreamSummaryPanel requestId={response.parentId} streamSummary={streamSummary} />
+          </TabPanel>
+        )}
         {models.mcpResponse.isMcpResponse(response) && (
           <TabPanel className="flex w-full flex-1 flex-col overflow-hidden" id="notifications">
             <McpNotificationTab allEvents={allNotifications} />
diff --git a/packages/insomnia/src/ui/components/workspace/resource-icon.tsx b/packages/insomnia/src/ui/components/workspace/resource-icon.tsx
index 4769d5803d..2aaa4dddc2 100644
--- a/packages/insomnia/src/ui/components/workspace/resource-icon.tsx
+++ b/packages/insomnia/src/ui/components/workspace/resource-icon.tsx
@@ -21,7 +21,7 @@ export function ResourceIcon({ resource }: { resource: any }) {
   if (isWorkspace) {
     icon =
       ({
-        'design': 'file',
+        'design': 'bars',
         'collection': 'bars',
         'mock-server': 'server',
         'environment': 'code',
diff --git a/packages/insomnia/src/ui/components/workspace/workspace-pane-header.tsx b/packages/insomnia/src/ui/components/workspace/workspace-pane-header.tsx
index f4fded6512..9ab5eeb15e 100644
--- a/packages/insomnia/src/ui/components/workspace/workspace-pane-header.tsx
+++ b/packages/insomnia/src/ui/components/workspace/workspace-pane-header.tsx
@@ -40,6 +40,7 @@ export default function WorkspacePaneHeader({ hasSettings }: { hasSettings: bool
   }, [breadcrumbs]);
 
   const [isEnvironmentPickerOpen, setIsEnvironmentPickerOpen] = useState(false);
+  const [isProjectEnvironmentPickerOpen, setIsProjectEnvironmentPickerOpen] = useState(false);
   const [isEnvironmentModalOpen, setEnvironmentModalOpen] = useState(false);
   const [isCookieModalOpen, setIsCookieModalOpen] = useState(false);
   const [isCertificatesModalOpen, setCertificatesModalOpen] = useState(false);
@@ -47,6 +48,7 @@ export default function WorkspacePaneHeader({ hasSettings }: { hasSettings: bool
   useDocBodyKeyboardShortcuts({
     environment_showEditor: () => setEnvironmentModalOpen(true),
     environment_showSwitchMenu: () => setIsEnvironmentPickerOpen(true),
+    environment_showSwitchProjectMenu: () => setIsProjectEnvironmentPickerOpen(true),
     showCookiesEditor: () => setIsCookieModalOpen(true),
   });
 
@@ -77,6 +79,15 @@ export default function WorkspacePaneHeader({ hasSettings }: { hasSettings: bool
                   });
                 }
               }}
+              isProjectPickerOpen={isProjectEnvironmentPickerOpen}
+              onProjectPickerOpenChange={isOpen => {
+                setIsProjectEnvironmentPickerOpen(isOpen);
+                if (isOpen) {
+                  window.main.trackAnalyticsEvent({
+                    event: AnalyticsEvent.requestEnvironmentClicked,
+                  });
+                }
+              }}
               onOpenEnvironmentSettingsModal={() => setEnvironmentModalOpen(true)}
             />
             {!isMcp && (
diff --git a/packages/insomnia/src/ui/context/app/insomnia-event-stream-context.tsx b/packages/insomnia/src/ui/context/app/insomnia-event-stream-context.tsx
index c3c52dad78..50c32f1175 100644
--- a/packages/insomnia/src/ui/context/app/insomnia-event-stream-context.tsx
+++ b/packages/insomnia/src/ui/context/app/insomnia-event-stream-context.tsx
@@ -1,4 +1,5 @@
 import { getRealTimeCollaborators, type Organization, type UserPresence } from 'insomnia-api';
+import { models } from 'insomnia-data';
 import React, { createContext, type FC, type PropsWithChildren, useContext, useEffect, useState } from 'react';
 import { useFetchers, useParams, useRevalidator } from 'react-router';
 import * as reactUse from 'react-use';
@@ -10,9 +11,9 @@ import { useProjectLoaderData } from '~/routes/organization.$organizationId.proj
 import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
 import { useInsomniaSyncDataActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.sync-data';
 import { useOrganizationSyncProjectsActionFetcher } from '~/routes/organization.$organizationId.sync-projects';
-import { useOrganizationSyncActionFetcher } from '~/routes/organization.sync';
 import uiEventBus, { CLOUD_SYNC_FILE_CHANGE } from '~/ui/event-bus';
 import { avatarImageCache } from '~/ui/hooks/image-cache';
+import { useInvalidateAccountData } from '~/ui/hooks/use-account-server-data';
 import { useInvalidateOrganizationStorageRule } from '~/ui/hooks/use-organization-storage-rule';
 
 const InsomniaEventStreamContext = createContext<{
@@ -73,7 +74,7 @@ const isSameWorkspaceWithRemote = async (workspaceId: string | undefined, remote
   if (!workspaceId || !remoteWorkspaceId) {
     return false;
   }
-  const currentBackendProject = await window.main.sync.getActiveBackendProject();
+  const currentBackendProject = await window.main.sync.getActiveBackendProject(workspaceId);
   if (
     currentBackendProject &&
     currentBackendProject?.id === remoteWorkspaceId &&
@@ -97,7 +98,7 @@ export const InsomniaEventStreamProvider: FC<PropsWithChildren> = ({ children })
   const remoteId = projectData?.activeProject?.remoteId || workspaceData?.activeProject.remoteId;
 
   const [presence, setPresence] = useState<UserPresence[]>([]);
-  const { submit: syncOrganizationsSubmit } = useOrganizationSyncActionFetcher();
+  const invalidateAccountData = useInvalidateAccountData();
   const invalidateStorageRule = useInvalidateOrganizationStorageRule();
   const { submit: syncProjectsSubmit } = useOrganizationSyncProjectsActionFetcher();
   const { submit: syncDataSubmit } = useInsomniaSyncDataActionFetcher();
@@ -111,7 +112,7 @@ export const InsomniaEventStreamProvider: FC<PropsWithChildren> = ({ children })
   useEffect(() => {
     async function updatePresence() {
       const sessionId = userSession.id;
-      if (sessionId && remoteId) {
+      if (sessionId && remoteId && !models.organization.isLocalOrganizationId(organizationId)) {
         try {
           const response = await getRealTimeCollaborators({
             sessionId,
@@ -140,7 +141,8 @@ export const InsomniaEventStreamProvider: FC<PropsWithChildren> = ({ children })
 
   useEffect(() => {
     const sessionId = userSession.id;
-    if (sessionId) {
+    // Local-only organizations have no server-side stream to subscribe to.
+    if (sessionId && !models.organization.isLocalOrganizationId(organizationId)) {
       try {
         const source = new EventSource(`insomnia-event-source://v1/teams/${sanitizeTeamId(organizationId)}/streams`);
 
@@ -183,7 +185,7 @@ export const InsomniaEventStreamProvider: FC<PropsWithChildren> = ({ children })
               if (event.avatar) {
                 window.setTimeout(() => avatarImageCache.invalidate(event.avatar), CDN_INVALIDATION_TTL);
               }
-              syncOrganizationsSubmit();
+              invalidateAccountData();
             } else if (event.type === 'StorageRuleChanged' && (event.team.startsWith('org_') || event.team.startsWith('team_'))) {
               invalidateStorageRule(event.team);
             } else if (event.type === 'TeamProjectChanged' && event.team === organizationId) {
@@ -203,11 +205,14 @@ export const InsomniaEventStreamProvider: FC<PropsWithChildren> = ({ children })
               }
             } else if (event.type === 'VaultKeyChanged') {
               const accountId = userSession.accountId;
-              const organizations = JSON.parse(
-                localStorage.getItem(`${accountId}:spaces`) || '[]',
-              ) as Organization[];
+              const organizations = JSON.parse(localStorage.getItem(`${accountId}:spaces`) || '[]') as Organization[];
               clearVaultKeySubmit({
-                organizations: organizations?.map(org => org.id) || [],
+                // The Konnect organization is local-only so it is never in the cached list, but its
+                // workspaces hold secrets like any other.
+                organizations: [
+                  ...(organizations?.map(org => org.id) || []),
+                  models.organization.getKonnectOrganizationId(accountId),
+                ],
                 sessionId: event.sessionId,
               });
             } else if (
@@ -249,7 +254,7 @@ export const InsomniaEventStreamProvider: FC<PropsWithChildren> = ({ children })
     organizationId,
     revalidate,
     syncDataSubmit,
-    syncOrganizationsSubmit,
+    invalidateAccountData,
     syncProjectsSubmit,
     invalidateStorageRule,
     userSession.accountId,
diff --git a/packages/insomnia/src/ui/css/styles.css b/packages/insomnia/src/ui/css/styles.css
index 3bf1f9dab2..dc03de2247 100644
--- a/packages/insomnia/src/ui/css/styles.css
+++ b/packages/insomnia/src/ui/css/styles.css
@@ -255,25 +255,22 @@ table.json-diff-viewer {
   margin: 0;
 }
 
-::view-transition-new(toast):only-child {
-  animation: slideIn 400ms ease-out;
+/* Toasts animate through the View Transition API, and while such a transition is running the
+   ::view-transition overlay captures every click on top of the document. Together with the
+   spec rule that elements captured by a transition skip hit-testing, that made clicks
+   anywhere in the app resolve to <html>, which read as a click outside an open modal and
+   closed it (e.g. clicking Check for updates in Settings repeatedly).
+   Both rules are required: `pointer-events: none` alone still leaves the page unclickable
+   because the captured root's contents skip hit-testing, while excluding the root alone
+   still leaves the overlay swallowing the clicks.
+   Note that the root rule opts the root out of every view transition in the app; revisit it
+   if transitions other than toasts are ever introduced. */
+::view-transition {
+  pointer-events: none;
 }
 
-::view-transition-old(toast):only-child {
-  animation: slideOut 400ms ease-in;
-}
-
-@keyframes slideIn {
-  from {
-    translate: 100% 0;
-    opacity: 0;
-  }
-}
-@keyframes slideOut {
-  to {
-    translate: 100% 0;
-    opacity: 0;
-  }
+:root {
+  view-transition-name: none;
 }
 
 .CodeMirror-merge {
diff --git a/packages/insomnia/src/ui/event-bus.ts b/packages/insomnia/src/ui/event-bus.ts
index 87e4a464f8..1a205f5d50 100644
--- a/packages/insomnia/src/ui/event-bus.ts
+++ b/packages/insomnia/src/ui/event-bus.ts
@@ -3,18 +3,23 @@ type EventHandler = (...args: any[]) => void;
 export const OAUTH2_AUTHORIZATION_STATUS_CHANGE = 'OAUTH2_AUTHORIZATION_STATUS_CHANGE';
 // This event is emitted when remote cloud sync file is changed, including project, workspace creation, deletion and update.
 export const CLOUD_SYNC_FILE_CHANGE = 'CLOUD_SYNC_FILE_CHANGE';
+// Lets the Konnect settings modal start a sync without being handed a callback by whichever
+// sidebar variant happens to be rendered (they're mutually exclusive routes).
+export const KONNECT_SYNC_TRIGGER = 'KONNECT_SYNC_TRIGGER';
 
 type UIEventType =
   | 'CLOSE_TAB'
   | 'CHANGE_ACTIVE_ENV'
   | typeof CLOUD_SYNC_FILE_CHANGE
-  | typeof OAUTH2_AUTHORIZATION_STATUS_CHANGE;
+  | typeof OAUTH2_AUTHORIZATION_STATUS_CHANGE
+  | typeof KONNECT_SYNC_TRIGGER;
 class EventBus {
   private events: Record<UIEventType, EventHandler[]> = {
     CLOSE_TAB: [],
     CHANGE_ACTIVE_ENV: [],
     [CLOUD_SYNC_FILE_CHANGE]: [],
     [OAUTH2_AUTHORIZATION_STATUS_CHANGE]: [],
+    [KONNECT_SYNC_TRIGGER]: [],
   };
 
   // Subscribe to event, returns unsubscribe function
diff --git a/packages/insomnia/src/ui/hooks/use-account-server-data.ts b/packages/insomnia/src/ui/hooks/use-account-server-data.ts
new file mode 100644
index 0000000000..45f3ce7188
--- /dev/null
+++ b/packages/insomnia/src/ui/hooks/use-account-server-data.ts
@@ -0,0 +1,90 @@
+import type { CurrentPlan, Organization, User } from 'insomnia-api';
+import { useCallback } from 'react';
+
+import {
+  fetchOrganizationData,
+  type OrganizationData,
+  readOrganizationDataFromLocalStorage,
+  writeOrganizationDataToLocalStorage,
+} from '~/common/organization';
+import { useRootLoaderData } from '~/root';
+import { useServerDataQueryClient } from '~/ui/context/app/server-data-context';
+import { useServerQuery } from '~/ui/hooks/use-query';
+import { useKonnectOrganization } from '~/ui/organization-utils';
+
+// Account-scoped server data (organizations / user / current plan).
+const accountServerDataKey = (accountId: string) => ['account-server-data', accountId] as const;
+
+const loggedOutData: OrganizationData = { organizations: [], user: undefined, currentPlan: undefined };
+
+// Stable selector references so TanStack doesn't re-run them every render.
+const selectOrganizations = (data: OrganizationData) => data.organizations;
+const selectUser = (data: OrganizationData) => data.user;
+const selectCurrentPlan = (data: OrganizationData) => data.currentPlan;
+
+/**
+ * The single source of truth (for React consumers) of the current account's organizations,
+ * user and current plan.
+ * Freshness: the server-data client's default `staleTime` refetches on mount, so the value is
+ * authoritative regardless of what localStorage held. The queryFn writes the result through to
+ * localStorage — a bridge that keeps the remaining non-React readers (`getInitialEntry`, various
+ * loaders, event-stream handlers) working while their migration is done in a later phase.
+ *
+ * Refresh is event-driven and owned by `useInvalidateAccountData` (SSE `OrganizationChanged`,
+ * trial start, etc.).
+ *
+ * Prefer the slice hooks below (`useOrganizations` / `useCurrentUser` / `useCurrentPlan`) at call
+ * sites; each subscribes to only its slice.
+ */
+function useAccountServerData<TData>(select: (data: OrganizationData) => TData): TData | undefined {
+  const { userSession } = useRootLoaderData()!;
+  const sessionId = userSession.id;
+  const accountId = userSession.accountId;
+  const isLoggedIn = !!sessionId;
+
+  const { data } = useServerQuery({
+    queryKey: accountServerDataKey(accountId),
+    queryFn: async () => {
+      const result = await fetchOrganizationData(sessionId);
+      writeOrganizationDataToLocalStorage(accountId, result);
+      return result;
+    },
+    // Seed from localStorage for an instant first paint (matching the old loader, which read
+    // localStorage synchronously). When logged out we intentionally keep `user`/`currentPlan`
+    // undefined so consumers can distinguish "no user".
+    initialData: () => (isLoggedIn ? readOrganizationDataFromLocalStorage(accountId) : loggedOutData),
+    enabled: isLoggedIn,
+    select,
+  });
+
+  return data;
+}
+
+/** The current account's organizations, with the local-only Konnect organization prepended when visible. */
+export function useOrganizations(): Organization[] {
+  const { userSession } = useRootLoaderData()!;
+  const organizations = useAccountServerData(selectOrganizations) ?? [];
+  const konnectOrganization = useKonnectOrganization(userSession.accountId);
+  return konnectOrganization ? [konnectOrganization, ...organizations] : organizations;
+}
+
+/** The signed-in user, or undefined when logged out / not yet loaded. */
+export function useCurrentUser(): User | undefined {
+  return useAccountServerData(selectUser);
+}
+
+/** The account's current plan, or undefined when logged out / not yet loaded. */
+export function useCurrentPlan(): CurrentPlan | undefined {
+  return useAccountServerData(selectCurrentPlan);
+}
+
+export function useInvalidateAccountData() {
+  const queryClient = useServerDataQueryClient();
+  const { userSession } = useRootLoaderData()!;
+  const accountId = userSession.accountId;
+
+  return useCallback(
+    () => queryClient.invalidateQueries({ queryKey: accountServerDataKey(accountId) }),
+    [queryClient, accountId],
+  );
+}
diff --git a/packages/insomnia/src/ui/hooks/use-command-search.ts b/packages/insomnia/src/ui/hooks/use-command-search.ts
index 83cc45e17a..1271f8f241 100644
--- a/packages/insomnia/src/ui/hooks/use-command-search.ts
+++ b/packages/insomnia/src/ui/hooks/use-command-search.ts
@@ -1,5 +1,5 @@
 import type { CommandSearchResult } from 'insomnia-data';
-import { services } from 'insomnia-data';
+import { models, services } from 'insomnia-data';
 import { useCallback, useEffect, useRef, useState } from 'react';
 
 interface UseCommandSearchParams {
@@ -44,9 +44,18 @@ export function useCommandSearch({
         services.helpers.abortCommandSearch(prevRequestId).catch(() => {});
       }
 
-      const allOrganizations: { id: string; name: string }[] = JSON.parse(
+      const cachedOrganizations: { id: string; name: string }[] = JSON.parse(
         localStorage.getItem(`${accountId}:spaces`) || '[]',
       );
+      // The Konnect organization is local-only so it is never in the cached list, and search scopes
+      // projects by organization id — without it Konnect projects are unreachable.
+      const allOrganizations = [
+        ...cachedOrganizations,
+        {
+          id: models.organization.getKonnectOrganizationId(accountId),
+          name: models.organization.KONNECT_ORGANIZATION_NAME,
+        },
+      ];
 
       try {
         const result = await services.helpers.commandSearch({
diff --git a/packages/insomnia/src/ui/hooks/use-organization-features.tsx b/packages/insomnia/src/ui/hooks/use-organization-features.tsx
index a1c0f8f190..99ce1f0ee6 100644
--- a/packages/insomnia/src/ui/hooks/use-organization-features.tsx
+++ b/packages/insomnia/src/ui/hooks/use-organization-features.tsx
@@ -12,7 +12,6 @@ export const fallbackFeatures = Object.freeze<FeatureList>({
   aiMockServers: { enabled: false, reason: 'Insomnia API unreachable' },
   aiCommitMessages: { enabled: false, reason: 'Insomnia API unreachable' },
   aiMcpClient: { enabled: false, reason: 'Insomnia API unreachable' },
-  konnectSync: { enabled: false, reason: 'Insomnia API unreachable' },
 });
 
 // If network unreachable assume user has paid for the current period
@@ -36,7 +35,7 @@ export function useOrganizationPermissions(organizationIdParam?: string) {
   const params = useParams() as { organizationId?: string };
   const organizationId = organizationIdParam ?? params.organizationId ?? '';
 
-  const isEnabled = !!organizationId && !models.organization.isScratchpadOrganizationId(organizationId);
+  const isEnabled = !!organizationId && !models.organization.isLocalOrganizationId(organizationId);
 
   const { data } = useServerQuery({
     queryKey: ['organization-features', organizationId],
@@ -47,7 +46,7 @@ export function useOrganizationPermissions(organizationIdParam?: string) {
     enabled: isEnabled,
   });
 
-  // Fall back to safe defaults while loading, when disabled (scratchpad), or on error.
+  // Fall back to safe defaults while loading, when disabled (scratchpad/local-only), or on error.
   return {
     features: data?.features ?? fallbackFeatures,
     billing: data?.billing ?? fallbackBilling,
diff --git a/packages/insomnia/src/ui/hooks/use-organization-storage-rule.ts b/packages/insomnia/src/ui/hooks/use-organization-storage-rule.ts
index e54b145385..a1167eb472 100644
--- a/packages/insomnia/src/ui/hooks/use-organization-storage-rule.ts
+++ b/packages/insomnia/src/ui/hooks/use-organization-storage-rule.ts
@@ -1,9 +1,8 @@
-import { getOrganizationStorageRule, type StorageRules } from 'insomnia-api';
-import { models, services } from 'insomnia-data';
+import type { StorageRules } from 'insomnia-api';
 import { useCallback } from 'react';
 import { useParams } from 'react-router';
 
-import { DEFAULT_STORAGE_RULES } from '~/common/organization-storage-rules';
+import { DEFAULT_STORAGE_RULES, fetchAndCacheOrganizationStorageRule } from '~/common/organization-storage-rules';
 import { useServerDataQueryClient } from '~/ui/context/app/server-data-context';
 import { useServerQuery } from '~/ui/hooks/use-query';
 
@@ -12,23 +11,24 @@ const organizationStorageRuleKey = (organizationId: string) => ['organization-st
 /**
  * @param organizationIdParam optional explicit organization ID; defaults to the
  * `organizationId` route param.
+ *
+ * Delegates to `fetchAndCacheOrganizationStorageRule`, which already short-circuits local-only
+ * organizations (Scratchpad, Konnect) with the correct hardcoded rules and no network call — do
+ * not reimplement that check here as an `enabled` gate, since falling back to
+ * `DEFAULT_STORAGE_RULES` on a disabled query would surface Cloud Sync / Git Sync options inside
+ * those organizations (the opposite of the local-only rules).
  */
 export function useOrganizationStorageRule(organizationIdParam?: string): StorageRules {
   const params = useParams() as { organizationId?: string };
   const organizationId = organizationIdParam ?? params.organizationId ?? '';
 
-  const isEnabled = !!organizationId && !models.organization.isScratchpadOrganizationId(organizationId);
-
   const { data } = useServerQuery({
     queryKey: organizationStorageRuleKey(organizationId),
-    queryFn: async () => {
-      const { id: sessionId } = await services.userSession.get();
-      return getOrganizationStorageRule({ organizationId, sessionId });
-    },
-    enabled: isEnabled,
+    queryFn: () => fetchAndCacheOrganizationStorageRule(organizationId, true),
+    enabled: !!organizationId,
   });
 
-  // Fall back to safe defaults while loading, when disabled (scratchpad), or on error.
+  // Fall back to safe defaults while loading or on error.
   return data ?? DEFAULT_STORAGE_RULES;
 }
 
diff --git a/packages/insomnia/src/ui/hooks/use-plan.tsx b/packages/insomnia/src/ui/hooks/use-plan.tsx
index 4d4cc5082c..f2b2033213 100644
--- a/packages/insomnia/src/ui/hooks/use-plan.tsx
+++ b/packages/insomnia/src/ui/hooks/use-plan.tsx
@@ -3,7 +3,7 @@ import { models } from 'insomnia-data';
 import { useParams } from 'react-router';
 
 import { useRootLoaderData } from '~/root';
-import { useOrganizationLoaderData } from '~/routes/organization';
+import { useCurrentPlan, useOrganizations } from '~/ui/hooks/use-account-server-data';
 
 export const usePlanData = () => {
   let isOwner = false;
@@ -14,19 +14,15 @@ export const usePlanData = () => {
   let isEnterprisePlan = false;
   const { userSession } = useRootLoaderData()!;
   const { organizationId } = useParams<{ organizationId: string }>();
-  const organizationData = useOrganizationLoaderData();
+  const organizations = useOrganizations();
+  const currentPlan = useCurrentPlan();
   // ensure user has logged in with valid organization
-  if (
-    organizationData &&
-    userSession &&
-    Array.isArray(organizationData.organizations) &&
-    organizationData.organizations.length > 0
-  ) {
-    const currentOrg = organizationData.organizations.find(organization => organization.id === organizationId);
+  if (userSession && Array.isArray(organizations) && organizations.length > 0) {
+    const currentOrg = organizations.find(organization => organization.id === organizationId);
     if (currentOrg && userSession.accountId) {
       isOwner = Boolean(currentOrg.is_owner);
     }
-    planType = organizationData.currentPlan?.type || planType;
+    planType = currentPlan?.type || planType;
     isFreePlan = planType.includes('free');
     isTeamPlan = planType.includes('team');
     isEnterprisePlan = planType.includes('enterprise');
@@ -34,7 +30,7 @@ export const usePlanData = () => {
   }
   return {
     isOwner,
-    currentPlan: organizationData?.currentPlan,
+    currentPlan,
     planDisplayName,
     isFreePlan,
     isTeamPlan,
diff --git a/packages/insomnia/src/ui/hooks/use-remote-files.ts b/packages/insomnia/src/ui/hooks/use-remote-files.ts
index b285611584..1068fdee2f 100644
--- a/packages/insomnia/src/ui/hooks/use-remote-files.ts
+++ b/packages/insomnia/src/ui/hooks/use-remote-files.ts
@@ -1,4 +1,5 @@
 import type { Project } from 'insomnia-data';
+import { models } from 'insomnia-data';
 import { useEffect, useMemo } from 'react';
 
 import { type InsomniaFile } from '~/common/project';
@@ -40,10 +41,13 @@ export function useRemoteBackendProjectsInvalidation(organizationId: string): vo
  * CLOUD_SYNC_FILE_CHANGE, which invalidates the query.
  */
 export function useRemoteBackendProjects(organizationId: string) {
+  // Local-only organizations (Scratchpad, Konnect) never have remote/cloud-backed projects.
+  const isEnabled = !!organizationId && !models.organization.isLocalOrganizationId(organizationId);
+
   const { data, error } = useServerQuery({
     queryKey: remoteBackendProjectsKey(organizationId),
     queryFn: () => getAllRemoteBackendProjectsOfOrg({ organizationId }),
-    enabled: !!organizationId,
+    enabled: isEnabled,
   });
 
   useEffect(() => {
diff --git a/packages/insomnia/src/ui/hooks/use-stream-summary.ts b/packages/insomnia/src/ui/hooks/use-stream-summary.ts
new file mode 100644
index 0000000000..b977a0c667
--- /dev/null
+++ b/packages/insomnia/src/ui/hooks/use-stream-summary.ts
@@ -0,0 +1,56 @@
+import { useMemo } from 'react';
+
+import {
+  computeStreamSummary,
+  getCandidatePayloadsFromEvents,
+  inferStreamSummaryPath,
+  type StreamMessageEvent,
+} from '~/common/stream-summary';
+import type { CurlEvent } from '~/main/network/curl';
+import {
+  type RequestLoaderData,
+  useRequestLoaderData,
+} from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId';
+
+import { useRequestMetaPatcher } from './use-request';
+
+const getCandidatePayloads = (events: CurlEvent[]): string[] => {
+  const streamEvents: StreamMessageEvent[] = events.map(event => ({
+    type: event.type,
+    direction: 'direction' in event ? event.direction : '',
+    data: 'data' in event ? event.data : '',
+  }));
+  return getCandidatePayloadsFromEvents(streamEvents);
+};
+
+export const useStreamSummary = ({
+  requestId,
+  url,
+  events,
+}: {
+  requestId: string;
+  url: string;
+  events: CurlEvent[];
+}) => {
+  const { activeRequestMeta } = useRequestLoaderData() as RequestLoaderData;
+  const patchRequestMeta = useRequestMetaPatcher();
+
+  const inferredPath = useMemo(() => inferStreamSummaryPath(url), [url]);
+  const resultPath = useMemo(() => {
+    const path = activeRequestMeta.streamSummaryPath ?? inferredPath;
+    return path?.trim() || null;
+  }, [activeRequestMeta.streamSummaryPath, inferredPath]);
+
+  const summary = useMemo(() => {
+    if (!resultPath) {
+      return { fragmentCount: 0, summary: '' };
+    }
+    return computeStreamSummary(getCandidatePayloads(events), resultPath);
+  }, [events, resultPath]);
+
+  const setResultPath = (path: string) => patchRequestMeta(requestId, { streamSummaryPath: path });
+  const renderMarkdown = activeRequestMeta.streamSummaryRenderMarkdown;
+  const setRenderMarkdown = (value: boolean) => patchRequestMeta(requestId, { streamSummaryRenderMarkdown: value });
+
+  return { inferredPath, resultPath, summary, setResultPath, renderMarkdown, setRenderMarkdown };
+};
diff --git a/packages/insomnia/src/ui/hooks/use-user-service.ts b/packages/insomnia/src/ui/hooks/use-user-service.ts
index a231999811..7102409e07 100644
--- a/packages/insomnia/src/ui/hooks/use-user-service.ts
+++ b/packages/insomnia/src/ui/hooks/use-user-service.ts
@@ -1,8 +1,9 @@
-import { useOrganizationLoaderData } from '~/routes/organization';
+import { useCurrentPlan, useCurrentUser } from '~/ui/hooks/use-account-server-data';
 import { diffInDayCeil } from '~/ui/utils';
 
 export function useUserService() {
-  const { currentPlan, user } = useOrganizationLoaderData()!;
+  const currentPlan = useCurrentPlan();
+  const user = useCurrentUser();
   const isPro = currentPlan?.type === 'individual' || currentPlan?.type === 'team';
   const isEnterpriseOwner = currentPlan?.type === 'enterprise';
   const isEnterpriseMember = currentPlan?.type === 'enterprise-member';
diff --git a/packages/insomnia/src/ui/images/onboarding/custom_linting.png b/packages/insomnia/src/ui/images/onboarding/custom_linting.png
deleted file mode 100644
index 588740c862..0000000000
Binary files a/packages/insomnia/src/ui/images/onboarding/custom_linting.png and /dev/null differ
diff --git a/packages/insomnia/src/ui/images/onboarding/first_request.png b/packages/insomnia/src/ui/images/onboarding/first_request.png
deleted file mode 100644
index 634e70cbd8..0000000000
Binary files a/packages/insomnia/src/ui/images/onboarding/first_request.png and /dev/null differ
diff --git a/packages/insomnia/src/ui/images/onboarding/konnect_integration.png b/packages/insomnia/src/ui/images/onboarding/konnect_integration.png
deleted file mode 100644
index ba6f6486ac..0000000000
Binary files a/packages/insomnia/src/ui/images/onboarding/konnect_integration.png and /dev/null differ
diff --git a/packages/insomnia/src/ui/images/onboarding/new_api_collection.png b/packages/insomnia/src/ui/images/onboarding/new_api_collection.png
new file mode 100644
index 0000000000..7db2580729
Binary files /dev/null and b/packages/insomnia/src/ui/images/onboarding/new_api_collection.png differ
diff --git a/packages/insomnia/src/ui/images/onboarding/scripts_for_unit_test.png b/packages/insomnia/src/ui/images/onboarding/scripts_for_unit_test.png
new file mode 100644
index 0000000000..6f268e3953
Binary files /dev/null and b/packages/insomnia/src/ui/images/onboarding/scripts_for_unit_test.png differ
diff --git a/packages/insomnia/src/ui/images/onboarding/sidebar_navigation.png b/packages/insomnia/src/ui/images/onboarding/sidebar_navigation.png
deleted file mode 100644
index b939fdb1f6..0000000000
Binary files a/packages/insomnia/src/ui/images/onboarding/sidebar_navigation.png and /dev/null differ
diff --git a/packages/insomnia/src/ui/organization-utils.test.ts b/packages/insomnia/src/ui/organization-utils.test.ts
new file mode 100644
index 0000000000..1b5ea8aa4f
--- /dev/null
+++ b/packages/insomnia/src/ui/organization-utils.test.ts
@@ -0,0 +1,69 @@
+/**
+ * Tests run against the in-memory NeDB initialized by setup-vitest.ts. localStorage is stubbed
+ * per-test; getUserEntitlements is mocked so calls can be counted without hitting the network.
+ */
+
+import type * as InsomniaApi from 'insomnia-api';
+import { initDatabase } from 'insomnia-data';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { mainDatabase } from '../main/database.main';
+import { refreshKonnectAccess } from './organization-utils';
+
+const getUserEntitlementsMock = vi.fn();
+
+vi.mock('insomnia-api', async importOriginal => {
+  const actual = await importOriginal<typeof InsomniaApi>();
+  return {
+    ...actual,
+    getUserEntitlements: (...args: unknown[]) => getUserEntitlementsMock(...args),
+  };
+});
+
+const ACCOUNT_ID = 'acct_1';
+
+function stubLocalStorage(initial: Record<string, string> = {}) {
+  const store = new Map(Object.entries(initial));
+  vi.stubGlobal('localStorage', {
+    getItem: (key: string) => store.get(key) ?? null,
+    setItem: (key: string, value: string) => void store.set(key, value),
+    removeItem: (key: string) => void store.delete(key),
+  });
+  return store;
+}
+
+beforeEach(async () => {
+  await initDatabase(mainDatabase, { inMemoryOnly: true }, true);
+  stubLocalStorage();
+  getUserEntitlementsMock.mockReset();
+  getUserEntitlementsMock.mockResolvedValue({ entitlements: [] });
+});
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+});
+
+// `konnectAccessResolvedFor` is module-level state that outlives any single call, so every phase
+// of the dedup behavior is exercised in one test — splitting it across `it()` blocks would leak
+// state between them (the module isn't re-imported per test).
+describe('refreshKonnectAccess', () => {
+  it('dedupes by session, not account, and force always re-fetches', async () => {
+    await refreshKonnectAccess('session-1', ACCOUNT_ID);
+    expect(getUserEntitlementsMock).toHaveBeenCalledTimes(1);
+
+    // Re-entering the same session (e.g. re-running the post-login loader on a cold start) must
+    // not issue a second request.
+    await refreshKonnectAccess('session-1', ACCOUNT_ID);
+    expect(getUserEntitlementsMock).toHaveBeenCalledTimes(1);
+
+    // Logging out and back into the *same* account mints a new session token. Signing in never
+    // reloads the renderer, so this must still trigger a real re-fetch rather than silently
+    // reusing the stale answer from the previous session.
+    await refreshKonnectAccess('session-2', ACCOUNT_ID);
+    expect(getUserEntitlementsMock).toHaveBeenCalledTimes(2);
+
+    // `force` bypasses the dedup guard even for the session already resolved.
+    await refreshKonnectAccess('session-2', ACCOUNT_ID, { force: true });
+    expect(getUserEntitlementsMock).toHaveBeenCalledTimes(3);
+  });
+});
diff --git a/packages/insomnia/src/ui/organization-utils.ts b/packages/insomnia/src/ui/organization-utils.ts
index 3c0b5f8370..01b744d516 100644
--- a/packages/insomnia/src/ui/organization-utils.ts
+++ b/packages/insomnia/src/ui/organization-utils.ts
@@ -1,8 +1,18 @@
-import { createTeamProject, isApiError, type Organization } from 'insomnia-api';
+import {
+  createTeamProject,
+  getUserEntitlements,
+  isApiError,
+  KONNECT_CONTROL_PLANES_FEATURE,
+  KONNECT_CONTROL_PLANES_FEATURE_KEY,
+  type Organization,
+} from 'insomnia-api';
 import type { Project } from 'insomnia-data';
+import { models } from 'insomnia-data';
 import { services } from 'insomnia-data';
+import { useMemo, useSyncExternalStore } from 'react';
 
 import { invariant } from '~/common/utils/invariant';
+import { syncVCSLikeForWorkspace } from '~/ui/sync-utils';
 
 // TODO: move vcs into services so we can remove this file.
 import {
@@ -15,14 +25,156 @@ import {
   shouldMigrateProjectUnderOrganization,
 } from '../sync/vcs/migrate-projects-into-organization';
 
+interface KonnectAccess {
+  /** The account holds the Konnect control-planes entitlement, so syncing is allowed. */
+  hasEntitlement: boolean;
+  /** The Konnect organization should appear in the organization list. */
+  isOrganizationVisible: boolean;
+}
+
+const konnectEntitlementStorageKey = (accountId: string) => `${accountId}:konnectSyncEnabled`;
+
+let konnectAccess: KonnectAccess = { hasEntitlement: false, isOrganizationVisible: false };
+let konnectAccessResolvedFor: string | null = null;
+const konnectAccessListeners = new Set<() => void>();
+
+const subscribeToKonnectAccess = (listener: () => void) => {
+  konnectAccessListeners.add(listener);
+  return () => {
+    konnectAccessListeners.delete(listener);
+  };
+};
+
+function setKonnectAccess(next: KonnectAccess) {
+  if (
+    next.hasEntitlement === konnectAccess.hasEntitlement &&
+    next.isOrganizationVisible === konnectAccess.isOrganizationVisible
+  ) {
+    return;
+  }
+  konnectAccess = next;
+  konnectAccessListeners.forEach(listener => listener());
+}
+
+/**
+ * Combines `hasEntitlement` with a freshly-queried local Konnect project count into
+ * `isOrganizationVisible`, and writes both into the shared access store. Shared by
+ * `refreshKonnectAccess` (after a real entitlement fetch) and `getKonnectOrganizationEscapeRoute`
+ * (reusing the last-resolved entitlement, since only the local count can have changed).
+ */
+async function reconcileKonnectAccess(hasEntitlement: boolean, konnectOrganizationId: string): Promise<KonnectAccess> {
+  const localKonnectProjectCount = await services.project.count({
+    konnectControlPlaneId: { $exists: true, $ne: null },
+    parentId: konnectOrganizationId,
+  });
+  setKonnectAccess({ hasEntitlement, isOrganizationVisible: hasEntitlement || localKonnectProjectCount > 0 });
+  return konnectAccess;
+}
+
+/**
+ * Resolves Konnect access for the account. Awaited before hydration and again after signing in so
+ * that render-time readers can stay synchronous; the two mutations that can flip it mid-session
+ * (disconnecting the PAT, resolving the migration conflict) pass `force`.
+ *
+ * Visibility is the entitlement OR local Konnect data from a previous version, which stays
+ * reachable with syncing disabled. Callers must run the startup migration first, otherwise the
+ * project lookup still sees the pre-migration parents.
+ *
+ * Deduped by `sessionId`, not `accountId`: signing in does not reload the renderer, so this
+ * module-level guard otherwise survives a logout, and a fresh login into the *same* account keeps
+ * the same accountId — which would silently skip the re-resolution. A new login always mints a new
+ * session token even for the same account, so keying on `sessionId` still dedupes the normal case
+ * (the startup call and the post-login loader's call share one session on a cold start) while
+ * still re-resolving after a genuine logout/login cycle.
+ */
+export async function refreshKonnectAccess(
+  sessionId: string,
+  accountId: string,
+  { force = false }: { force?: boolean } = {},
+) {
+  if (!force && konnectAccessResolvedFor === sessionId) {
+    return;
+  }
+  konnectAccessResolvedFor = sessionId;
+
+  if (!sessionId || !accountId) {
+    setKonnectAccess({ hasEntitlement: false, isOrganizationVisible: false });
+    return;
+  }
+
+  let hasEntitlement = localStorage.getItem(konnectEntitlementStorageKey(accountId)) === 'true';
+  try {
+    const { entitlements } = await getUserEntitlements({
+      sessionId,
+      feature: KONNECT_CONTROL_PLANES_FEATURE,
+    });
+    hasEntitlement = (entitlements ?? []).some(
+      entitlement => entitlement.featureKey === KONNECT_CONTROL_PLANES_FEATURE_KEY && entitlement.hasAccess,
+    );
+    localStorage.setItem(konnectEntitlementStorageKey(accountId), String(hasEntitlement));
+  } catch {
+    // Offline: keep the last known answer rather than hiding an organization the user owns.
+  }
+
+  await reconcileKonnectAccess(hasEntitlement, models.organization.getKonnectOrganizationId(accountId));
+}
+
+/** Whether the account may sync from Konnect. */
+export function useKonnectSyncEnabled(): boolean {
+  return useSyncExternalStore(subscribeToKonnectAccess, () => konnectAccess.hasEntitlement);
+}
+
+/**
+ * Re-checks a Konnect organization's visibility using a fresh local project count — no network
+ * call, since entitlement is read from the last-resolved value (kept current by the explicit
+ * `force` points: login, disconnect, migration) and the local count is the only half that can
+ * change from a plain NeDB delete — and updates the shared access store to match, so
+ * `useOrganizations()` subscribers (the org dropdown) see the change immediately regardless of
+ * what the caller navigates to next.
+ *
+ * Returns the URL to redirect to when the organization just became invisible (its last Konnect
+ * project was just removed, one at a time or via Disconnect, with no entitlement to fall back on),
+ * or `null` when the caller should proceed into the organization normally. Every code path that can
+ * remove the last Konnect project calls this before deciding where to land, so the check — and the
+ * store update — live in one place instead of being duplicated per delete path.
+ */
+export async function getKonnectOrganizationEscapeRoute(organizationId: string): Promise<string | null> {
+  if (!models.organization.isKonnectOrganizationId(organizationId)) {
+    return null;
+  }
+
+  const { accountId } = await services.userSession.get();
+  const { isOrganizationVisible } = await reconcileKonnectAccess(konnectAccess.hasEntitlement, organizationId);
+  if (isOrganizationVisible) {
+    return null;
+  }
+
+  const organizations = JSON.parse(localStorage.getItem(`${accountId}:spaces`) || '[]') as Organization[];
+  invariant(organizations.length, 'Failed to fetch organizations. Check your network connection and try again.');
+  return `/organization/${organizations[0].id}`;
+}
+
+/** The account's local-only Konnect organization, or null when it should not be shown. */
+export function useKonnectOrganization(accountId: string): Organization | null {
+  const isOrganizationVisible = useSyncExternalStore(
+    subscribeToKonnectAccess,
+    () => konnectAccess.isOrganizationVisible,
+  );
+
+  return useMemo(
+    () => (isOrganizationVisible && accountId ? models.organization.buildKonnectOrganization(accountId) : null),
+    [isOrganizationVisible, accountId],
+  );
+}
+
 export async function updateLocalProjectToRemote({
   project,
-  vcs,
+  getVcsForWorkspace,
   sessionId,
   organizationId,
 }: {
   project: Project;
-  vcs: SyncVCSLike;
+  getVcsForWorkspace: (workspaceId: string) => SyncVCSLike;
   sessionId: string;
   organizationId: string;
 }) {
@@ -46,6 +198,7 @@ export async function updateLocalProjectToRemote({
       // Initialize Sync on the workspace if it's not using Git sync
       try {
         if (!workspaceMeta.gitRepositoryId) {
+          const vcs = getVcsForWorkspace(workspace._id);
           invariant(vcs, 'VCS must be initialized');
 
           await initializeLocalBackendProjectAndMarkForSync({ vcs, workspace });
@@ -109,7 +262,7 @@ export async function migrateProjectsUnderOrganization(personalOrganizationId: s
           project,
           organizationId: personalOrganizationId,
           sessionId,
-          vcs: window.main.sync,
+          getVcsForWorkspace: syncVCSLikeForWorkspace,
         });
       }
     }
diff --git a/packages/insomnia/src/ui/sync-utils.ts b/packages/insomnia/src/ui/sync-utils.ts
index 343935dc2e..e4bedc9ee0 100644
--- a/packages/insomnia/src/ui/sync-utils.ts
+++ b/packages/insomnia/src/ui/sync-utils.ts
@@ -19,6 +19,7 @@ import type { BackendProject, Compare, StatusCandidate } from 'insomnia-vcs';
 
 import { database, type Operation } from '~/common/database';
 import { invariant } from '~/common/utils/invariant';
+import type { SyncVCSLike } from '~/sync/vcs/initialize-backend-project';
 
 type PushPull = 'push' | 'pull';
 type VCSAction =
@@ -47,6 +48,24 @@ export const remoteBranchesCache: Record<string, string[]> = {};
 export const remoteCompareCache: Record<string, Compare> = {};
 export const remoteBackendProjectsCache: Record<string, BackendProject[]> = {};
 
+/**
+ * `window.main.sync` methods each take a leading `workspaceId` so the main process can route to
+ * that workspace's own VCS instance. `initializeLocalBackendProjectAndMarkForSync` /
+ * `pushSnapshotOnInitialize` predate that and expect the plain `SyncVCSLike` shape (no
+ * `workspaceId`) — this binds one workspace's calls into that shape.
+ */
+export function syncVCSLikeForWorkspace(workspaceId: string): SyncVCSLike {
+  return {
+    hasBackendProject: () => window.main.sync.hasBackendProject(workspaceId),
+    push: options => window.main.sync.push(workspaceId, options),
+    stage: entries => window.main.sync.stage(workspaceId, entries),
+    status: candidates => window.main.sync.status(workspaceId, candidates),
+    switchAndCreateBackendProjectIfNotExist: (rootDocumentId, name) =>
+      window.main.sync.switchAndCreateBackendProjectIfNotExist(workspaceId, rootDocumentId, name),
+    takeSnapshot: name => window.main.sync.takeSnapshot(workspaceId, name),
+  };
+}
+
 /**
  * ProjectLintRuleset is parented to the project, whose _id is not stable across machines,
  * so its parentId is normalized to null in sync transit. Re-parent any ProjectLintRuleset
diff --git a/packages/insomnia/src/ui/utils/render-realtime-connect.test.ts b/packages/insomnia/src/ui/utils/render-realtime-connect.test.ts
index 9ba1af253c..e6aa006165 100644
--- a/packages/insomnia/src/ui/utils/render-realtime-connect.test.ts
+++ b/packages/insomnia/src/ui/utils/render-realtime-connect.test.ts
@@ -184,4 +184,58 @@ describe('renderRealtimeConnectPayload integration', () => {
 
     expect(result?.url).toBe('ws://localhost/api/chat/5678');
   });
+
+  it('does not render a response-sourced cookie value when preparing a realtime connect payload', async () => {
+    const actual = await vi.importActual<typeof TryInterpolate>('./try-interpolate');
+    tryToInterpolateRequestOrShowRenderErrorModal.mockImplementation(
+      actual.tryToInterpolateRequestOrShowRenderErrorModal,
+    );
+
+    const project = await services.project.create({
+      _id: 'proj_render_connect_cookie',
+      name: 'Render Connect Cookie Project',
+    });
+    const workspace = await services.workspace.create({
+      _id: 'wrk_render_connect_cookie',
+      name: 'Render Connect Cookie Workspace',
+      parentId: project._id,
+      scope: 'collection',
+    });
+    const environment = await services.environment.getOrCreateForParentId(workspace._id);
+
+    const templateCookieValue = "{% uuid 'v4' %}";
+    const cookieJar = await services.cookieJar.getOrCreateForParentId(workspace._id);
+    await services.cookieJar.update(cookieJar, {
+      cookies: [
+        {
+          id: 'c_render_connect',
+          key: 'tracking',
+          value: templateCookieValue,
+          domain: 'localhost',
+          path: '/',
+          secure: false,
+          httpOnly: false,
+          expires: null,
+          source: 'response',
+        },
+      ],
+    });
+
+    const request = await services.webSocketRequest.create({
+      _id: 'ws-req_render_connect_cookie',
+      name: 'WS Cookie Test',
+      parentId: workspace._id,
+      url: 'ws://localhost/api/chat',
+      metaSortKey: 0,
+    });
+
+    const result = await renderRealtimeConnectPayload({
+      request,
+      environmentId: environment._id,
+      workspaceId: workspace._id,
+    });
+    const responseCookie = result?.workspaceCookieJar.cookies.find(c => c.key === 'tracking');
+
+    expect(responseCookie?.value).toBe(templateCookieValue);
+  });
 });
diff --git a/packages/insomnia/src/ui/utils/render-realtime-connect.ts b/packages/insomnia/src/ui/utils/render-realtime-connect.ts
index 13a2d16505..c9e23879f2 100644
--- a/packages/insomnia/src/ui/utils/render-realtime-connect.ts
+++ b/packages/insomnia/src/ui/utils/render-realtime-connect.ts
@@ -37,6 +37,12 @@ export async function renderRealtimeConnectPayload({
   const authentication = getOrInheritAuthentication({ request, requestGroups });
   const body = 'body' in request ? request.body : undefined;
 
+  // Only manually-authored cookies may contain live template syntax. Server-set cookie values
+  // are excluded from rendering here too, mirroring getRenderedRequestAndContext in render.ts,
+  // so that a template placed in a cookie by a response is never re-evaluated when connecting.
+  const manualCookies = workspaceCookieJar.cookies.filter(cookie => cookie.source === 'manual');
+  const nonManualCookies = workspaceCookieJar.cookies.filter(cookie => cookie.source !== 'manual');
+
   const rendered = await tryToInterpolateRequestOrShowRenderErrorModal({
     request,
     environmentId,
@@ -47,7 +53,7 @@ export async function renderRealtimeConnectPayload({
       body,
       parameters: request.parameters.filter(p => !p.disabled),
       pathParameters: request.pathParameters,
-      workspaceCookieJar,
+      workspaceCookieJar: { ...workspaceCookieJar, cookies: manualCookies },
     },
   });
 
@@ -65,7 +71,10 @@ export async function renderRealtimeConnectPayload({
     authentication: rendered.authentication,
     body: rendered.body,
     parameters: rendered.parameters,
-    workspaceCookieJar: rendered.workspaceCookieJar,
+    workspaceCookieJar: {
+      ...rendered.workspaceCookieJar,
+      cookies: [...rendered.workspaceCookieJar.cookies, ...nonManualCookies],
+    },
     suppressUserAgent,
   };
 }
diff --git a/packages/insomnia/src/ui/utils/router.test.ts b/packages/insomnia/src/ui/utils/router.test.ts
new file mode 100644
index 0000000000..c7990b2bae
--- /dev/null
+++ b/packages/insomnia/src/ui/utils/router.test.ts
@@ -0,0 +1,95 @@
+import type * as InsomniaData from 'insomnia-data';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('insomnia-data', async importOriginal => {
+  const actual = await importOriginal<typeof InsomniaData>();
+  return {
+    ...actual,
+    services: {
+      ...actual.services,
+      userSession: { ...actual.services.userSession, get: vi.fn() },
+      project: { ...actual.services.project, list: vi.fn(), get: vi.fn() },
+    },
+  };
+});
+
+vi.mock('~/ui/organization-utils', () => ({
+  getKonnectOrganizationEscapeRoute: vi.fn(),
+}));
+
+import { models, services } from 'insomnia-data';
+
+import { HAS_SEEN_ONBOARDING_KEY } from '~/common/constants';
+import { getKonnectOrganizationEscapeRoute } from '~/ui/organization-utils';
+
+import { getInitialEntry } from './router';
+
+const ACCOUNT_ID = 'acct_1';
+const SESSION_ID = 'sess_1';
+const REAL_ORGANIZATION_ID = 'org_real_1';
+const KONNECT_ORGANIZATION_ID = models.organization.getKonnectOrganizationId(ACCOUNT_ID);
+
+function stubLocalStorage(initial: Record<string, string> = {}) {
+  const store = new Map(Object.entries(initial));
+  const storage = {
+    getItem: (key: string) => store.get(key) ?? null,
+    setItem: (key: string, value: string) => void store.set(key, value),
+    removeItem: (key: string) => void store.delete(key),
+  };
+  // `getInitialEntry` reads some keys via bare `localStorage` and others via `window.localStorage` —
+  // both need to resolve to the same store.
+  vi.stubGlobal('localStorage', storage);
+  vi.stubGlobal('window', { localStorage: storage });
+  return store;
+}
+
+describe('getInitialEntry', () => {
+  beforeEach(() => {
+    vi.mocked(services.userSession.get).mockResolvedValue({ id: SESSION_ID, accountId: ACCOUNT_ID } as any);
+    vi.mocked(services.project.list).mockResolvedValue([]);
+    vi.mocked(services.project.get).mockResolvedValue(undefined as any);
+    vi.mocked(getKonnectOrganizationEscapeRoute).mockReset();
+    stubLocalStorage({
+      [HAS_SEEN_ONBOARDING_KEY]: 'true',
+      [`${ACCOUNT_ID}:spaces`]: JSON.stringify([{ id: REAL_ORGANIZATION_ID, name: 'Real Org' }]),
+      lastVisitedOrganizationId: KONNECT_ORGANIZATION_ID,
+    });
+  });
+
+  afterEach(() => {
+    vi.unstubAllGlobals();
+  });
+
+  it('escapes to a real organization when the last-visited Konnect organization is no longer visible', async () => {
+    vi.mocked(getKonnectOrganizationEscapeRoute).mockResolvedValue(`/organization/${REAL_ORGANIZATION_ID}`);
+
+    const entry = await getInitialEntry();
+
+    expect(getKonnectOrganizationEscapeRoute).toHaveBeenCalledWith(KONNECT_ORGANIZATION_ID);
+    expect(entry).toMatchObject({ pathname: `/organization/${REAL_ORGANIZATION_ID}` });
+    // Must not have tried to resolve a route *inside* the now-invisible organization.
+    expect(services.project.get).not.toHaveBeenCalled();
+  });
+
+  it('still restores the Konnect organization when it remains visible', async () => {
+    vi.mocked(getKonnectOrganizationEscapeRoute).mockResolvedValue(null);
+
+    const entry = await getInitialEntry();
+
+    expect(getKonnectOrganizationEscapeRoute).toHaveBeenCalledWith(KONNECT_ORGANIZATION_ID);
+    expect(entry).toMatchObject({ pathname: `/organization/${KONNECT_ORGANIZATION_ID}/project` });
+  });
+
+  it('never consults the escape route for a real organization', async () => {
+    stubLocalStorage({
+      [HAS_SEEN_ONBOARDING_KEY]: 'true',
+      [`${ACCOUNT_ID}:spaces`]: JSON.stringify([{ id: REAL_ORGANIZATION_ID, name: 'Real Org' }]),
+      lastVisitedOrganizationId: REAL_ORGANIZATION_ID,
+    });
+
+    const entry = await getInitialEntry();
+
+    expect(getKonnectOrganizationEscapeRoute).not.toHaveBeenCalled();
+    expect(entry).toMatchObject({ pathname: `/organization/${REAL_ORGANIZATION_ID}/project` });
+  });
+});
diff --git a/packages/insomnia/src/ui/utils/router.ts b/packages/insomnia/src/ui/utils/router.ts
index 231e24fe0f..37c28ff807 100644
--- a/packages/insomnia/src/ui/utils/router.ts
+++ b/packages/insomnia/src/ui/utils/router.ts
@@ -4,10 +4,11 @@ import { database, models, services } from 'insomnia-data';
 import { useCallback } from 'react';
 import { href, matchPath, type PathMatch, useFetcher } from 'react-router';
 
+import { HAS_SEEN_ONBOARDING_KEY } from '~/common/constants';
 import { CURRENT_MIGRATION_VERSION } from '~/sync/git/git-migration-version';
+import { getKonnectOrganizationEscapeRoute } from '~/ui/organization-utils';
 
 export const enum AsyncTask {
-  SyncOrganization,
   MigrateProjects,
   SyncProjects,
 }
@@ -108,9 +109,9 @@ export const getInitialEntry = async () => {
       }
     }
 
-    const hasSeenOnboardingV13 = Boolean(window.localStorage.getItem('hasSeenOnboardingV13'));
+    const hasSeenOnboarding = Boolean(window.localStorage.getItem(HAS_SEEN_ONBOARDING_KEY));
 
-    if (!hasSeenOnboardingV13) {
+    if (!hasSeenOnboarding) {
       return href('/onboarding/*', {
         '*': '',
       });
@@ -120,9 +121,7 @@ export const getInitialEntry = async () => {
 
     const user = await services.userSession.get();
     if (user.id) {
-      const organizations = JSON.parse(
-        localStorage.getItem(`${user.accountId}:spaces`) || '[]',
-      ) as Organization[];
+      const organizations = JSON.parse(localStorage.getItem(`${user.accountId}:spaces`) || '[]') as Organization[];
       // If no organizations are in local storage, go fetch from org index loader
       if (organizations.length === 0) {
         return href('/organization');
@@ -133,16 +132,31 @@ export const getInitialEntry = async () => {
       // Check if the user has a last visited organization
       try {
         const lastVisitedOrganizationId = localStorage.getItem('lastVisitedOrganizationId');
-        if (lastVisitedOrganizationId && organizations.find(o => o.id === lastVisitedOrganizationId)) {
+        // The Konnect organization is local-only, so it is never in the cached organization list.
+        const isKnownOrganization =
+          lastVisitedOrganizationId ===
+            (user.accountId && models.organization.getKonnectOrganizationId(user.accountId)) ||
+          organizations.some(o => o.id === lastVisitedOrganizationId);
+        if (lastVisitedOrganizationId && isKnownOrganization) {
           organizationId = lastVisitedOrganizationId;
         }
       } catch {}
 
+      // The Konnect organization may have gone invisible since the previous session (entitlement
+      // revoked server-side, or its last local project removed elsewhere) — `refreshKonnectAccess()`
+      // already re-resolved that immediately before this call, in `entry.client.tsx`. Re-check before
+      // restoring a route into it, otherwise the app lands on a URL for an organization that no
+      // longer appears in the dropdown (this path resolves straight to a leaf route such as
+      // `.../project`, which never runs the org-index loader's own escape-route check).
+      const escapeRoute = models.organization.isKonnectOrganizationId(organizationId)
+        ? await getKonnectOrganizationEscapeRoute(organizationId)
+        : null;
+
       return {
-        pathname: await getInitialRouteForOrganization({ organizationId, navigateToWorkspace: true }),
+        pathname: escapeRoute ?? (await getInitialRouteForOrganization({ organizationId, navigateToWorkspace: true })),
         state: {
           // async task need to execute when first entry
-          asyncTaskList: [AsyncTask.SyncOrganization, AsyncTask.MigrateProjects, AsyncTask.SyncProjects],
+          asyncTaskList: [AsyncTask.MigrateProjects, AsyncTask.SyncProjects],
         },
       };
     }
diff --git a/packages/insomnia/types/react-aria-components.d.ts b/packages/insomnia/types/react-aria-components.d.ts
new file mode 100644
index 0000000000..86301cc943
--- /dev/null
+++ b/packages/insomnia/types/react-aria-components.d.ts
@@ -0,0 +1,30 @@
+// `disallowTypeAhead` is missing from `ListBoxProps` typings in every published
+// react-aria-components version (verified up to 1.21.1) even though the runtime fully
+// supports it, and `GridListProps`/`TableProps` do declare it. Augment it here until
+// upstream types it.
+//
+// Runtime evidence chain (adobe/react-spectrum, permalinks pinned to the commits our
+// lockfile builds from):
+// 1. ListBox spreads all props into the aria hook:
+//    https://github.com/adobe/react-spectrum/blob/8df187370053aa35f553cb388ad670f65e1ab371/packages/react-aria-components/src/ListBox.tsx#L169 (useListBox({...props, ...}))
+// 2. useListBox forwards props and merges the resulting handlers onto the listbox DOM element:
+//    https://github.com/adobe/react-spectrum/blob/8df187370053aa35f553cb388ad670f65e1ab371/packages/%40react-aria/listbox/src/useListBox.ts#L79 (useSelectableList({...props})), #L118-L122 (listBoxProps mergeProps(..., listProps))
+// 3. useSelectableList forwards props into useSelectableCollection:
+//    https://github.com/adobe/react-spectrum/blob/8df187370053aa35f553cb388ad670f65e1ab371/packages/%40react-aria/selection/src/useSelectableList.ts#L75-L77
+// 4. useSelectableCollection gates the typeahead handlers on `disallowTypeAhead`:
+//    https://github.com/adobe/react-spectrum/blob/8df187370053aa35f553cb388ad670f65e1ab371/packages/%40react-aria/selection/src/useSelectableCollection.ts#L71 (#L118 default), #L571-L578 (if (!disallowTypeAhead) handlers = mergeProps(typeSelectProps, handlers))
+// 5. Without it, useTypeSelect swallows the space key in the capture phase while its
+//    search buffer is non-empty (within 1s of the last printable key):
+//    https://github.com/adobe/react-spectrum/blob/8df187370053aa35f553cb388ad670f65e1ab371/packages/%40react-aria/selection/src/useTypeSelect.ts#L60-L68 (#L102 onKeyDownCapture)
+//
+// Even the latest published version at the time of writing (1.21.1, commit 4dd44e0)
+// still lacks this prop in ListBoxProps — re-check the link below when upgrading, and
+// delete this augmentation once upstream declares it:
+//    https://github.com/adobe/react-spectrum/blob/4dd44e0f400636a87a9ad4390903e78c5ae6113c/packages/react-aria-components/src/ListBox.tsx
+import 'react-aria-components';
+
+declare module 'react-aria-components' {
+  interface ListBoxProps<T> {
+    disallowTypeAhead?: boolean;
+  }
+}
diff --git a/packages/insomnia/vite.config.ts b/packages/insomnia/vite.config.ts
index 79b173db05..2895dc239e 100644
--- a/packages/insomnia/vite.config.ts
+++ b/packages/insomnia/vite.config.ts
@@ -19,6 +19,15 @@ function writePortFile(): Plugin {
           fs.writeFileSync(portFilePath, String(addr.port));
         }
       });
+      const cleanup = () => {
+        try { fs.unlinkSync(portFilePath); } catch {}
+        process.exit(0);
+      };
+      process.once('SIGINT', cleanup);
+      process.once('SIGTERM', cleanup);
+      process.once('exit', () => {
+        try { fs.unlinkSync(portFilePath); } catch {}
+      });
     },
   };
 }
diff --git a/schemas/insomnia.schema.5.1.json b/schemas/insomnia.schema.5.1.json
index 5f039ae9fe..94245e722f 100644
--- a/schemas/insomnia.schema.5.1.json
+++ b/schemas/insomnia.schema.5.1.json
@@ -141,6 +141,76 @@
             "name": {
               "type": "string"
             },
+            "data": {
+              "type": "object",
+              "propertyNames": {
+                "type": "string"
+              },
+              "additionalProperties": {}
+            },
+            "color": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "dataPropertyOrder": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "propertyNames": {
+                    "type": "string"
+                  },
+                  "additionalProperties": {}
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "kvPairData": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "value": {
+                    "type": "string"
+                  },
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "json",
+                      "str",
+                      "secret"
+                    ]
+                  },
+                  "enabled": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "id",
+                  "type"
+                ]
+              }
+            },
+            "environmentType": {
+              "type": "string",
+              "enum": [
+                "json",
+                "kv"
+              ]
+            },
             "meta": {
               "type": "object",
               "properties": {
@@ -167,19 +237,6 @@
                 "id"
               ]
             },
-            "data": {
-              "$ref": "#/$defs/__schema1"
-            },
-            "color": {
-              "anyOf": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
             "subEnvironments": {
               "type": "array",
               "items": {
@@ -188,6 +245,76 @@
                   "name": {
                     "type": "string"
                   },
+                  "data": {
+                    "type": "object",
+                    "propertyNames": {
+                      "type": "string"
+                    },
+                    "additionalProperties": {}
+                  },
+                  "color": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "dataPropertyOrder": {
+                    "anyOf": [
+                      {
+                        "type": "object",
+                        "propertyNames": {
+                          "type": "string"
+                        },
+                        "additionalProperties": {}
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "kvPairData": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "id": {
+                          "type": "string"
+                        },
+                        "name": {
+                          "type": "string"
+                        },
+                        "value": {
+                          "type": "string"
+                        },
+                        "type": {
+                          "type": "string",
+                          "enum": [
+                            "json",
+                            "str",
+                            "secret"
+                          ]
+                        },
+                        "enabled": {
+                          "type": "boolean"
+                        }
+                      },
+                      "required": [
+                        "id",
+                        "type"
+                      ]
+                    }
+                  },
+                  "environmentType": {
+                    "type": "string",
+                    "enum": [
+                      "json",
+                      "kv"
+                    ]
+                  },
                   "meta": {
                     "type": "object",
                     "properties": {
@@ -213,31 +340,9 @@
                     "required": [
                       "id"
                     ]
-                  },
-                  "data": {
-                    "$ref": "#/$defs/__schema1"
-                  },
-                  "dataPropertyOrder": {
-                    "$ref": "#/$defs/__schema1"
-                  },
-                  "color": {
-                    "anyOf": [
-                      {
-                        "type": "string"
-                      },
-                      {
-                        "type": "null"
-                      }
-                    ]
                   }
-                },
-                "required": [
-                  "name"
-                ]
+                }
               }
-            },
-            "dataPropertyOrder": {
-              "$ref": "#/$defs/__schema1"
             }
           }
         },
@@ -280,6 +385,168 @@
               }
             }
           }
+        },
+        "testSuites": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "meta": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "created": {
+                    "type": "number"
+                  },
+                  "modified": {
+                    "type": "number"
+                  },
+                  "isPrivate": {
+                    "type": "boolean"
+                  },
+                  "description": {
+                    "type": "string"
+                  },
+                  "sortKey": {
+                    "type": "number"
+                  }
+                },
+                "required": [
+                  "id"
+                ]
+              },
+              "tests": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "name": {
+                      "type": "string"
+                    },
+                    "meta": {
+                      "type": "object",
+                      "properties": {
+                        "id": {
+                          "type": "string"
+                        },
+                        "created": {
+                          "type": "number"
+                        },
+                        "modified": {
+                          "type": "number"
+                        },
+                        "isPrivate": {
+                          "type": "boolean"
+                        },
+                        "description": {
+                          "type": "string"
+                        },
+                        "sortKey": {
+                          "type": "number"
+                        }
+                      },
+                      "required": [
+                        "id"
+                      ]
+                    },
+                    "requestId": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "code": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "spec": {
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "file": {
+                  "type": "string"
+                },
+                "meta": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "string"
+                    },
+                    "created": {
+                      "type": "number"
+                    },
+                    "modified": {
+                      "type": "number"
+                    },
+                    "isPrivate": {
+                      "type": "boolean"
+                    },
+                    "description": {
+                      "type": "string"
+                    },
+                    "sortKey": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "id"
+                  ]
+                }
+              },
+              "required": [
+                "file"
+              ]
+            },
+            {
+              "type": "object",
+              "properties": {
+                "contents": {
+                  "$ref": "#/$defs/__schema1"
+                },
+                "meta": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "string"
+                    },
+                    "created": {
+                      "type": "number"
+                    },
+                    "modified": {
+                      "type": "number"
+                    },
+                    "isPrivate": {
+                      "type": "boolean"
+                    },
+                    "description": {
+                      "type": "string"
+                    },
+                    "sortKey": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "id"
+                  ]
+                }
+              }
+            }
+          ]
         }
       },
       "required": [
@@ -423,6 +690,76 @@
             "name": {
               "type": "string"
             },
+            "data": {
+              "type": "object",
+              "propertyNames": {
+                "type": "string"
+              },
+              "additionalProperties": {}
+            },
+            "color": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "dataPropertyOrder": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "propertyNames": {
+                    "type": "string"
+                  },
+                  "additionalProperties": {}
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "kvPairData": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "value": {
+                    "type": "string"
+                  },
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "json",
+                      "str",
+                      "secret"
+                    ]
+                  },
+                  "enabled": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "id",
+                  "type"
+                ]
+              }
+            },
+            "environmentType": {
+              "type": "string",
+              "enum": [
+                "json",
+                "kv"
+              ]
+            },
             "meta": {
               "type": "object",
               "properties": {
@@ -449,19 +786,6 @@
                 "id"
               ]
             },
-            "data": {
-              "$ref": "#/$defs/__schema1"
-            },
-            "color": {
-              "anyOf": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
             "subEnvironments": {
               "type": "array",
               "items": {
@@ -470,6 +794,76 @@
                   "name": {
                     "type": "string"
                   },
+                  "data": {
+                    "type": "object",
+                    "propertyNames": {
+                      "type": "string"
+                    },
+                    "additionalProperties": {}
+                  },
+                  "color": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "dataPropertyOrder": {
+                    "anyOf": [
+                      {
+                        "type": "object",
+                        "propertyNames": {
+                          "type": "string"
+                        },
+                        "additionalProperties": {}
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "kvPairData": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "id": {
+                          "type": "string"
+                        },
+                        "name": {
+                          "type": "string"
+                        },
+                        "value": {
+                          "type": "string"
+                        },
+                        "type": {
+                          "type": "string",
+                          "enum": [
+                            "json",
+                            "str",
+                            "secret"
+                          ]
+                        },
+                        "enabled": {
+                          "type": "boolean"
+                        }
+                      },
+                      "required": [
+                        "id",
+                        "type"
+                      ]
+                    }
+                  },
+                  "environmentType": {
+                    "type": "string",
+                    "enum": [
+                      "json",
+                      "kv"
+                    ]
+                  },
                   "meta": {
                     "type": "object",
                     "properties": {
@@ -495,31 +889,9 @@
                     "required": [
                       "id"
                     ]
-                  },
-                  "data": {
-                    "$ref": "#/$defs/__schema1"
-                  },
-                  "dataPropertyOrder": {
-                    "$ref": "#/$defs/__schema1"
-                  },
-                  "color": {
-                    "anyOf": [
-                      {
-                        "type": "string"
-                      },
-                      {
-                        "type": "null"
-                      }
-                    ]
                   }
-                },
-                "required": [
-                  "name"
-                ]
+                }
               }
-            },
-            "dataPropertyOrder": {
-              "$ref": "#/$defs/__schema1"
             }
           }
         },
@@ -935,6 +1307,76 @@
             "name": {
               "type": "string"
             },
+            "data": {
+              "type": "object",
+              "propertyNames": {
+                "type": "string"
+              },
+              "additionalProperties": {}
+            },
+            "color": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "dataPropertyOrder": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "propertyNames": {
+                    "type": "string"
+                  },
+                  "additionalProperties": {}
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "kvPairData": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "value": {
+                    "type": "string"
+                  },
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "json",
+                      "str",
+                      "secret"
+                    ]
+                  },
+                  "enabled": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "id",
+                  "type"
+                ]
+              }
+            },
+            "environmentType": {
+              "type": "string",
+              "enum": [
+                "json",
+                "kv"
+              ]
+            },
             "meta": {
               "type": "object",
               "properties": {
@@ -961,19 +1403,6 @@
                 "id"
               ]
             },
-            "data": {
-              "$ref": "#/$defs/__schema1"
-            },
-            "color": {
-              "anyOf": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
             "subEnvironments": {
               "type": "array",
               "items": {
@@ -982,6 +1411,76 @@
                   "name": {
                     "type": "string"
                   },
+                  "data": {
+                    "type": "object",
+                    "propertyNames": {
+                      "type": "string"
+                    },
+                    "additionalProperties": {}
+                  },
+                  "color": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "dataPropertyOrder": {
+                    "anyOf": [
+                      {
+                        "type": "object",
+                        "propertyNames": {
+                          "type": "string"
+                        },
+                        "additionalProperties": {}
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "kvPairData": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "id": {
+                          "type": "string"
+                        },
+                        "name": {
+                          "type": "string"
+                        },
+                        "value": {
+                          "type": "string"
+                        },
+                        "type": {
+                          "type": "string",
+                          "enum": [
+                            "json",
+                            "str",
+                            "secret"
+                          ]
+                        },
+                        "enabled": {
+                          "type": "boolean"
+                        }
+                      },
+                      "required": [
+                        "id",
+                        "type"
+                      ]
+                    }
+                  },
+                  "environmentType": {
+                    "type": "string",
+                    "enum": [
+                      "json",
+                      "kv"
+                    ]
+                  },
                   "meta": {
                     "type": "object",
                     "properties": {
@@ -1007,31 +1506,9 @@
                     "required": [
                       "id"
                     ]
-                  },
-                  "data": {
-                    "$ref": "#/$defs/__schema1"
-                  },
-                  "dataPropertyOrder": {
-                    "$ref": "#/$defs/__schema1"
-                  },
-                  "color": {
-                    "anyOf": [
-                      {
-                        "type": "string"
-                      },
-                      {
-                        "type": "null"
-                      }
-                    ]
                   }
-                },
-                "required": [
-                  "name"
-                ]
+                }
               }
-            },
-            "dataPropertyOrder": {
-              "$ref": "#/$defs/__schema1"
             }
           }
         }
@@ -1618,6 +2095,76 @@
             "name": {
               "type": "string"
             },
+            "data": {
+              "type": "object",
+              "propertyNames": {
+                "type": "string"
+              },
+              "additionalProperties": {}
+            },
+            "color": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "dataPropertyOrder": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "propertyNames": {
+                    "type": "string"
+                  },
+                  "additionalProperties": {}
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "kvPairData": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "value": {
+                    "type": "string"
+                  },
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "json",
+                      "str",
+                      "secret"
+                    ]
+                  },
+                  "enabled": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "id",
+                  "type"
+                ]
+              }
+            },
+            "environmentType": {
+              "type": "string",
+              "enum": [
+                "json",
+                "kv"
+              ]
+            },
             "meta": {
               "type": "object",
               "properties": {
@@ -1644,19 +2191,6 @@
                 "id"
               ]
             },
-            "data": {
-              "$ref": "#/$defs/__schema1"
-            },
-            "color": {
-              "anyOf": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
             "subEnvironments": {
               "type": "array",
               "items": {
@@ -1665,6 +2199,76 @@
                   "name": {
                     "type": "string"
                   },
+                  "data": {
+                    "type": "object",
+                    "propertyNames": {
+                      "type": "string"
+                    },
+                    "additionalProperties": {}
+                  },
+                  "color": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "dataPropertyOrder": {
+                    "anyOf": [
+                      {
+                        "type": "object",
+                        "propertyNames": {
+                          "type": "string"
+                        },
+                        "additionalProperties": {}
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "kvPairData": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "id": {
+                          "type": "string"
+                        },
+                        "name": {
+                          "type": "string"
+                        },
+                        "value": {
+                          "type": "string"
+                        },
+                        "type": {
+                          "type": "string",
+                          "enum": [
+                            "json",
+                            "str",
+                            "secret"
+                          ]
+                        },
+                        "enabled": {
+                          "type": "boolean"
+                        }
+                      },
+                      "required": [
+                        "id",
+                        "type"
+                      ]
+                    }
+                  },
+                  "environmentType": {
+                    "type": "string",
+                    "enum": [
+                      "json",
+                      "kv"
+                    ]
+                  },
                   "meta": {
                     "type": "object",
                     "properties": {
@@ -1690,31 +2294,9 @@
                     "required": [
                       "id"
                     ]
-                  },
-                  "data": {
-                    "$ref": "#/$defs/__schema1"
-                  },
-                  "dataPropertyOrder": {
-                    "$ref": "#/$defs/__schema1"
-                  },
-                  "color": {
-                    "anyOf": [
-                      {
-                        "type": "string"
-                      },
-                      {
-                        "type": "null"
-                      }
-                    ]
                   }
-                },
-                "required": [
-                  "name"
-                ]
+                }
               }
-            },
-            "dataPropertyOrder": {
-              "$ref": "#/$defs/__schema1"
             }
           }
         }
diff --git a/scripts/circular-references/check-cycle-references.mjs b/scripts/circular-references/check-cycle-references.mjs
new file mode 100755
index 0000000000..8527ce4db9
--- /dev/null
+++ b/scripts/circular-references/check-cycle-references.mjs
@@ -0,0 +1,170 @@
+#!/usr/bin/env node
+/* global process, console */
+// Runs dependency-cruiser per workspace package to find circular imports, and fails only on
+// cycles that are not already recorded in the baseline file. Run with --update-baseline to
+// regenerate the baseline from the current state (e.g. after fixing a cycle).
+//
+// Exits 0 when the tree matches the baseline, 1 when a new cycle appeared, and 2 when the
+// baseline is merely stale. CI distinguishes the last two when reporting.
+import { execFileSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', '..');
+// Resolve dependency-cruiser's own entry point rather than the `.bin` shim, and run it with the
+// current Node binary. On Windows the shim is split into an extensionless shell script (which
+// `execFileSync` cannot launch) and a `.cmd` (which Node >=18 refuses to spawn without a shell,
+// see CVE-2024-27980), so going through `.bin` makes this script POSIX-only for no benefit.
+const depcruiseBin = path.join(repoRoot, 'node_modules', 'dependency-cruiser', 'bin', 'dependency-cruise.mjs');
+const configPath = path.join(path.dirname(fileURLToPath(import.meta.url)), 'dependency-cruiser.json');
+const baselinePath = path.join(path.dirname(fileURLToPath(import.meta.url)), 'known-violations.json');
+
+/** A cycle exists that the baseline does not record — a regression. */
+const EXIT_NEW_CYCLES = 1;
+/** The baseline records cycles that no longer exist — it just needs regenerating. */
+const EXIT_BASELINE_DRIFT = 2;
+
+// Same scope as `npm run lint`/`type-check`/`test` (--workspaces --if-present): the packages
+// actually declared as npm workspaces, not every directory under packages/ (e.g.
+// insomnia-component-docs is intentionally excluded and its deps aren't installed at the root).
+const rootPackageJson = JSON.parse(fs.readFileSync(path.join(repoRoot, 'package.json'), 'utf8'));
+const packageDirs = rootPackageJson.workspaces
+  .map(workspace => ({ name: path.basename(workspace), dir: path.join(repoRoot, workspace) }))
+  .sort((a, b) => a.name.localeCompare(b.name));
+const packageNames = packageDirs.map(({ name }) => name);
+
+function packageForAbsPath(absPath) {
+  const found = packageDirs.find(({ dir }) => absPath === dir || absPath.startsWith(dir + path.sep));
+  return found ? found.name : null;
+}
+
+// Rotates a cycle's node list to start at its lexicographically smallest entry, so the same
+// logical cycle reported starting from different nodes (which dependency-cruiser does) collapses
+// to one canonical key.
+function canonicalize(repoRelNodes) {
+  let minIndex = 0;
+  for (let i = 1; i < repoRelNodes.length; i++) {
+    if (repoRelNodes[i] < repoRelNodes[minIndex]) minIndex = i;
+  }
+  return [...repoRelNodes.slice(minIndex), ...repoRelNodes.slice(0, minIndex)].join(' -> ');
+}
+
+function cruisePackage({ name, dir }) {
+  const tsconfigPath = path.join(dir, 'tsconfig.json');
+  const args = ['--config', configPath];
+  if (fs.existsSync(tsconfigPath)) args.push('--ts-config', 'tsconfig.json');
+  // Exclude node_modules and any local build/dist output (untracked, non-reproducible artifacts
+  // from a prior local build) at any depth, e.g. packages/insomnia/build/.
+  args.push('-x', 'node_modules|(^|/)(build|dist)(/|$)', '--output-type', 'json', '.');
+
+  let stdout;
+  try {
+    stdout = execFileSync(process.execPath, [depcruiseBin, ...args], {
+      cwd: dir,
+      encoding: 'utf8',
+      maxBuffer: 1024 * 1024 * 100,
+    });
+  } catch (error) {
+    if (error?.status !== 1 || !error.stdout) throw error;
+    // dependency-cruiser exits with status 1 when forbidden violations are found. Parse its JSON
+    // output so the baseline comparison can decide whether those cycles are new.
+    stdout = error.stdout;
+  }
+  const result = JSON.parse(stdout);
+
+  // key: canonical signature -> Set of packages it touches
+  const cycles = new Map();
+  for (const violation of result.summary.violations) {
+    if (violation.type !== 'cycle') continue;
+    // A cycle needs >=2 distinct modules; length-1 "cycles" are resolver artifacts (e.g. a bare
+    // specifier like `esbuild` misresolved to a same-named local file `esbuild.ts`), not real
+    // circular dependencies.
+    if (violation.cycle.length <= 1) continue;
+    const repoRelNodes = violation.cycle.map(node => {
+      const abs = path.resolve(dir, node.name);
+      return path.relative(repoRoot, abs).split(path.sep).join('/');
+    });
+    const key = canonicalize(repoRelNodes);
+    if (cycles.has(key)) continue;
+    const attributed = new Set(repoRelNodes.map(p => packageForAbsPath(path.resolve(repoRoot, p))).filter(Boolean));
+    cycles.set(key, attributed);
+  }
+  return cycles;
+}
+
+function cruiseAll() {
+  // packageName -> Set<canonical key>
+  const byPackage = new Map(packageNames.map(name => [name, new Set()]));
+  for (const pkg of packageDirs) {
+    const cycles = cruisePackage(pkg);
+    for (const [key, attributed] of cycles) {
+      for (const pkgName of attributed) {
+        byPackage.get(pkgName).add(key);
+      }
+    }
+  }
+  return byPackage;
+}
+
+function readBaseline() {
+  if (!fs.existsSync(baselinePath)) return new Map();
+  const raw = JSON.parse(fs.readFileSync(baselinePath, 'utf8'));
+  return new Map(Object.entries(raw).map(([name, keys]) => [name, new Set(keys)]));
+}
+
+function writeBaseline(byPackage) {
+  const raw = {};
+  for (const name of packageNames) {
+    raw[name] = [...byPackage.get(name)].sort();
+  }
+  fs.writeFileSync(baselinePath, JSON.stringify(raw, null, 2) + '\n');
+}
+
+function main() {
+  const updateBaseline = process.argv.includes('--update-baseline');
+  const current = cruiseAll();
+
+  if (updateBaseline) {
+    writeBaseline(current);
+    const total = [...current.values()].reduce((sum, set) => sum + set.size, 0);
+    console.log(
+      `Baseline updated: ${baselinePath} (${total} cycle attributions across ${packageNames.length} packages)`,
+    );
+    return;
+  }
+
+  const baseline = readBaseline();
+  let hasNew = false;
+  let hasDrift = false;
+  for (const name of packageNames) {
+    const currentKeys = current.get(name);
+    const baselineKeys = baseline.get(name) || new Set();
+    const newKeys = [...currentKeys].filter(key => !baselineKeys.has(key));
+    const removedKeys = [...baselineKeys].filter(key => !currentKeys.has(key));
+    console.log(
+      `${name}: ${currentKeys.size} cycle(s)${newKeys.length ? `, ${newKeys.length} NEW` : ''}${removedKeys.length ? `, ${removedKeys.length} REMOVED` : ''}`,
+    );
+    if (newKeys.length) {
+      hasNew = true;
+      for (const key of newKeys) console.log(`  NEW: ${key}`);
+    }
+    if (removedKeys.length) {
+      hasDrift = true;
+      for (const key of removedKeys) console.log(`  REMOVED FROM BASELINE: ${key}`);
+    }
+  }
+
+  if (hasNew || hasDrift) {
+    if (hasNew) console.log('\nNew circular dependencies detected that are not in the baseline.');
+    if (hasDrift) console.log('\nBaseline contains circular dependencies no longer present in the current tree.');
+    console.log(`Run "npm run check-cycle-references:baseline" and commit the updated ${path.basename(baselinePath)}.`);
+    // Both cases need the baseline regenerated, but they mean opposite things — a new cycle is a
+    // regression, while drift alone means cycles were fixed and the baseline was left behind.
+    // Exit 1 vs 2 so CI can say which happened instead of reporting every failure as "new".
+    process.exit(hasNew ? EXIT_NEW_CYCLES : EXIT_BASELINE_DRIFT);
+  }
+  console.log('\nNo new circular dependencies.');
+}
+
+main();
diff --git a/scripts/circular-references/dependency-cruiser.json b/scripts/circular-references/dependency-cruiser.json
new file mode 100644
index 0000000000..2f1c572ade
--- /dev/null
+++ b/scripts/circular-references/dependency-cruiser.json
@@ -0,0 +1,4 @@
+{
+  "forbidden": [{ "name": "no-circular", "severity": "warn", "from": {}, "to": { "circular": true } }],
+  "options": { "tsPreCompilationDeps": true }
+}
diff --git a/scripts/circular-references/known-violations.json b/scripts/circular-references/known-violations.json
new file mode 100644
index 0000000000..4c95f7c1f4
--- /dev/null
+++ b/scripts/circular-references/known-violations.json
@@ -0,0 +1,116 @@
+{
+  "insomnia": [
+    "packages/insomnia-scripting-environment/src/objects/collection.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts -> packages/insomnia-scripting-environment/src/objects/index.ts",
+    "packages/insomnia-scripting-environment/src/objects/collection.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts -> packages/insomnia/src/common/render.ts -> packages/insomnia/src/common/templating/mask-or-decrypt-vault-data.ts -> packages/insomnia/src/common/utils/vault.ts -> packages/insomnia/src/runtimes/index.ts -> packages/insomnia/src/runtimes/types.ts -> packages/insomnia-scripting-environment/src/objects/index.ts",
+    "packages/insomnia-scripting-environment/src/objects/collection.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts -> packages/insomnia/src/common/render.ts -> packages/insomnia/src/runtimes/index.ts -> packages/insomnia/src/runtimes/types.ts -> packages/insomnia-scripting-environment/src/objects/index.ts",
+    "packages/insomnia-scripting-environment/src/objects/collection.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts -> packages/insomnia/src/common/templating/mask-or-decrypt-vault-data.ts -> packages/insomnia/src/common/utils/vault.ts -> packages/insomnia/src/runtimes/index.ts -> packages/insomnia/src/runtimes/types.ts -> packages/insomnia-scripting-environment/src/objects/index.ts",
+    "packages/insomnia-scripting-environment/src/objects/collection.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts -> packages/insomnia/src/common/templating/mask-or-decrypt-vault-data.ts -> packages/insomnia/src/runtimes/index.ts -> packages/insomnia/src/runtimes/types.ts -> packages/insomnia-scripting-environment/src/objects/index.ts",
+    "packages/insomnia-scripting-environment/src/objects/collection.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts -> packages/insomnia/src/network/concurrency.renderer.ts -> packages/insomnia-scripting-environment/src/objects/index.ts",
+    "packages/insomnia-scripting-environment/src/objects/collection.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts -> packages/insomnia/src/runtimes/index.ts -> packages/insomnia/src/runtimes/types.ts -> packages/insomnia-scripting-environment/src/objects/index.ts",
+    "packages/insomnia-scripting-environment/src/objects/index.ts -> packages/insomnia-scripting-environment/src/objects/insomnia.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts",
+    "packages/insomnia-scripting-environment/src/objects/index.ts -> packages/insomnia-scripting-environment/src/objects/insomnia.ts -> packages/insomnia-scripting-environment/src/objects/send-request.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts",
+    "packages/insomnia-scripting-environment/src/objects/index.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts",
+    "packages/insomnia/src/common/import.ts -> packages/insomnia/src/common/insomnia-v5.ts",
+    "packages/insomnia/src/common/render.ts -> packages/insomnia/src/network/network.ts",
+    "packages/insomnia/src/main/git-service.ts -> packages/insomnia/src/sync/git/repo-file-watcher.ts",
+    "packages/insomnia/src/main/plugin-window.ts -> packages/insomnia/src/main/prompt-bridge.ts -> packages/insomnia/src/main/window-utils.ts",
+    "packages/insomnia/src/main/plugin-window.ts -> packages/insomnia/src/main/window-utils.ts",
+    "packages/insomnia/src/main/templating-worker-database.ts -> packages/insomnia/src/plugins/index.ts",
+    "packages/insomnia/src/main/templating-worker-database.ts -> packages/insomnia/src/templating/index.ts -> packages/insomnia/src/plugins/index.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/boolean-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/credentials.tsx -> packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/credentials.tsx -> packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx -> packages/insomnia/src/ui/components/settings/number-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/credentials.tsx -> packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx -> packages/insomnia/src/ui/hooks/use-plan.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/enum-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/general.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/general.tsx -> packages/insomnia/src/ui/components/settings/boolean-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/general.tsx -> packages/insomnia/src/ui/components/settings/enum-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/general.tsx -> packages/insomnia/src/ui/components/settings/number-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/general.tsx -> packages/insomnia/src/ui/components/settings/text-array-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/general.tsx -> packages/insomnia/src/ui/components/settings/text-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/general.tsx -> packages/insomnia/src/ui/components/settings/vault-key-panel.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/general.tsx -> packages/insomnia/src/ui/components/settings/vault-key-panel.tsx -> packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/general.tsx -> packages/insomnia/src/ui/components/settings/vault-key-panel.tsx -> packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx -> packages/insomnia/src/ui/hooks/use-account-server-data.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/general.tsx -> packages/insomnia/src/ui/components/settings/vault-key-panel.tsx -> packages/insomnia/src/ui/components/settings/boolean-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/import-export.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/import-export.tsx -> packages/insomnia/src/ui/components/modals/import-modal/import-projects-modal.tsx -> packages/insomnia/src/ui/hooks/use-account-server-data.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/import-export.tsx -> packages/insomnia/src/ui/hooks/use-account-server-data.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/import-export.tsx -> packages/insomnia/src/ui/hooks/use-plan.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/import-export.tsx -> packages/insomnia/src/ui/hooks/use-plan.tsx -> packages/insomnia/src/ui/hooks/use-account-server-data.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/masked-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/plugins.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/scripting-settings.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/shortcuts.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/text-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/theme-panel.tsx -> packages/insomnia/src/ui/hooks/theme.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/containers/app-hooks.tsx -> packages/insomnia/src/ui/hooks/use-cio.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/containers/app-hooks.tsx -> packages/insomnia/src/ui/hooks/use-global-keyboard-shortcuts.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/containers/app-hooks.tsx -> packages/insomnia/src/ui/hooks/use-global-keyboard-shortcuts.ts -> packages/insomnia/src/ui/components/keydown-binder.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/containers/app-hooks.tsx -> packages/insomnia/src/ui/hooks/use-global-keyboard-shortcuts.ts -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/boolean-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/containers/app-hooks.tsx -> packages/insomnia/src/ui/hooks/use-settings-side-effects.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/containers/app-hooks.tsx -> packages/insomnia/src/ui/hooks/use-theme-change.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/code-prompt-modal.tsx -> packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx -> packages/insomnia/src/ui/components/.client/codemirror/base-imports.ts -> packages/insomnia/src/ui/components/.client/codemirror/extensions/nunjucks-tags.ts -> packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx -> packages/insomnia/src/ui/components/templating/tag-editor.tsx -> packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx -> packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx -> packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/code-prompt-modal.tsx -> packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx -> packages/insomnia/src/ui/components/keydown-binder.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/code-prompt-modal.tsx -> packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx -> packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx -> packages/insomnia/src/ui/components/templating/tag-editor.tsx -> packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx -> packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx -> packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/code-prompt-modal.tsx -> packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx -> packages/insomnia/src/ui/components/settings/shortcuts.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/code-prompt-modal.tsx -> packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx -> packages/insomnia/src/ui/hooks/use-editor-refresh.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/code-prompt-modal.tsx -> packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx -> packages/insomnia/src/ui/hooks/use-plan.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/code-prompt-modal.tsx -> packages/insomnia/src/ui/components/markdown-editor.tsx -> packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/code-prompt-modal.tsx -> packages/insomnia/src/ui/components/markdown-editor.tsx -> packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx -> packages/insomnia/src/ui/components/.client/codemirror/base-imports.ts -> packages/insomnia/src/ui/components/.client/codemirror/extensions/nunjucks-tags.ts -> packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx -> packages/insomnia/src/ui/components/templating/tag-editor.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/boolean-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/code-prompt-modal.tsx -> packages/insomnia/src/ui/components/markdown-editor.tsx -> packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx -> packages/insomnia/src/ui/components/.client/codemirror/base-imports.ts -> packages/insomnia/src/ui/components/.client/codemirror/extensions/nunjucks-tags.ts -> packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx -> packages/insomnia/src/ui/components/templating/tag-editor.tsx -> packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx -> packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx -> packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/code-prompt-modal.tsx -> packages/insomnia/src/ui/components/markdown-editor.tsx -> packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx -> packages/insomnia/src/ui/components/keydown-binder.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/generate-code-modal.tsx -> packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/generate-code-modal.tsx -> packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx -> packages/insomnia/src/ui/components/.client/codemirror/base-imports.ts -> packages/insomnia/src/ui/components/.client/codemirror/extensions/nunjucks-tags.ts -> packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx -> packages/insomnia/src/ui/components/templating/tag-editor.tsx -> packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx -> packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx -> packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/git-project-staging-modal.tsx -> packages/insomnia/src/ui/components/diff-view-editor.tsx -> packages/insomnia/src/ui/hooks/theme.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/git-project-staging-modal.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/boolean-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx -> packages/insomnia/src/ui/components/templating/tag-editor.tsx -> packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx -> packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx -> packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/response-debug-modal.tsx -> packages/insomnia/src/ui/components/viewers/response-timeline-viewer.tsx -> packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx -> packages/insomnia/src/ui/components/.client/codemirror/base-imports.ts -> packages/insomnia/src/ui/components/.client/codemirror/extensions/nunjucks-tags.ts -> packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx -> packages/insomnia/src/ui/components/templating/tag-editor.tsx -> packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx -> packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx -> packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/settings-modal.tsx -> packages/insomnia/src/ui/components/settings/boolean-setting.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/sync-merge-modal.tsx -> packages/insomnia/src/ui/components/.client/codemirror/merge-editor.tsx -> packages/insomnia/src/ui/components/.client/codemirror/base-imports.ts -> packages/insomnia/src/ui/components/.client/codemirror/extensions/nunjucks-tags.ts -> packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx -> packages/insomnia/src/ui/components/templating/tag-editor.tsx -> packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx -> packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx -> packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/sync-merge-modal.tsx -> packages/insomnia/src/ui/components/.client/codemirror/merge-editor.tsx -> packages/insomnia/src/ui/hooks/theme.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/sync-merge-modal.tsx -> packages/insomnia/src/ui/components/diff-view-editor.tsx -> packages/insomnia/src/ui/hooks/theme.ts",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/upgrade-plan-modal.tsx",
+    "packages/insomnia/src/root.tsx -> packages/insomnia/src/ui/modals.tsx -> packages/insomnia/src/ui/components/modals/upgrade-plan-modal.tsx -> packages/insomnia/src/ui/hooks/use-plan.tsx",
+    "packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update.tsx -> packages/insomnia/src/ui/components/dropdowns/content-type-dropdown.tsx -> packages/insomnia/src/ui/hooks/use-request.ts",
+    "packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx -> packages/insomnia/src/ui/context/app/runner-context.tsx",
+    "packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx -> packages/insomnia/src/ui/hooks/use-runner-request-list.tsx",
+    "packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx -> packages/insomnia/src/ui/hooks/use-runner-request-list.tsx -> packages/insomnia/src/ui/context/app/runner-context.tsx",
+    "packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tsx -> packages/insomnia/src/ui/components/panes/grpc-request-pane.tsx",
+    "packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tsx -> packages/insomnia/src/ui/components/panes/grpc-response-pane.tsx",
+    "packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx -> packages/insomnia/src/ui/components/editors/mock-response-headers-editor.tsx",
+    "packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx -> packages/insomnia/src/ui/components/mocks/mock-response-pane.tsx",
+    "packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx -> packages/insomnia/src/ui/components/mocks/mock-url-bar.tsx",
+    "packages/insomnia/src/sync/git/providers/github.ts -> packages/insomnia/src/sync/git/utils.ts -> packages/insomnia/src/sync/git/providers/index.ts",
+    "packages/insomnia/src/sync/git/providers/gitlab.ts -> packages/insomnia/src/sync/git/utils.ts -> packages/insomnia/src/sync/git/providers/index.ts",
+    "packages/insomnia/src/ui/components/modals/export-requests-modal.tsx -> packages/insomnia/src/ui/components/settings/import-export.tsx",
+    "packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx -> packages/insomnia/src/ui/components/settings/vault-key-panel.tsx",
+    "packages/insomnia/src/ui/components/tabs/request-delete-fallback.ts -> packages/insomnia/src/ui/components/tabs/tab.tsx -> packages/insomnia/src/ui/components/tabs/tab-list.tsx",
+    "packages/insomnia/src/ui/components/tabs/tab-list.tsx -> packages/insomnia/src/ui/components/tabs/tab.tsx",
+    "packages/insomnia/src/ui/components/tabs/tab-list.tsx -> packages/insomnia/src/ui/context/app/insomnia-tab-context.tsx",
+    "packages/insomnia/src/ui/components/tabs/tab-list.tsx -> packages/insomnia/src/ui/hooks/use-insomnia-tab.ts -> packages/insomnia/src/ui/components/tabs/tab.tsx",
+    "packages/insomnia/src/ui/components/tabs/tab-list.tsx -> packages/insomnia/src/ui/hooks/use-insomnia-tab.ts -> packages/insomnia/src/ui/context/app/insomnia-tab-context.tsx",
+    "packages/insomnia/src/ui/components/tabs/tab.tsx -> packages/insomnia/src/ui/context/app/insomnia-tab-context.tsx",
+    "packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx -> packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx",
+    "packages/insomnia/src/ui/components/viewers/response-multipart-viewer.tsx -> packages/insomnia/src/ui/components/viewers/response-viewer.tsx"
+  ],
+  "insomnia-analytics": [],
+  "insomnia-api": [],
+  "insomnia-data": [],
+  "insomnia-inso": [],
+  "insomnia-scripting-environment": [
+    "packages/insomnia-scripting-environment/src/objects/collection.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts -> packages/insomnia-scripting-environment/src/objects/index.ts",
+    "packages/insomnia-scripting-environment/src/objects/collection.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts -> packages/insomnia/src/common/render.ts -> packages/insomnia/src/common/templating/mask-or-decrypt-vault-data.ts -> packages/insomnia/src/common/utils/vault.ts -> packages/insomnia/src/runtimes/index.ts -> packages/insomnia/src/runtimes/types.ts -> packages/insomnia-scripting-environment/src/objects/index.ts",
+    "packages/insomnia-scripting-environment/src/objects/collection.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts -> packages/insomnia/src/common/render.ts -> packages/insomnia/src/runtimes/index.ts -> packages/insomnia/src/runtimes/types.ts -> packages/insomnia-scripting-environment/src/objects/index.ts",
+    "packages/insomnia-scripting-environment/src/objects/collection.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts -> packages/insomnia/src/common/templating/mask-or-decrypt-vault-data.ts -> packages/insomnia/src/common/utils/vault.ts -> packages/insomnia/src/runtimes/index.ts -> packages/insomnia/src/runtimes/types.ts -> packages/insomnia-scripting-environment/src/objects/index.ts",
+    "packages/insomnia-scripting-environment/src/objects/collection.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts -> packages/insomnia/src/common/templating/mask-or-decrypt-vault-data.ts -> packages/insomnia/src/runtimes/index.ts -> packages/insomnia/src/runtimes/types.ts -> packages/insomnia-scripting-environment/src/objects/index.ts",
+    "packages/insomnia-scripting-environment/src/objects/collection.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts -> packages/insomnia/src/network/concurrency.renderer.ts -> packages/insomnia-scripting-environment/src/objects/index.ts",
+    "packages/insomnia-scripting-environment/src/objects/collection.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts -> packages/insomnia/src/runtimes/index.ts -> packages/insomnia/src/runtimes/types.ts -> packages/insomnia-scripting-environment/src/objects/index.ts",
+    "packages/insomnia-scripting-environment/src/objects/index.ts -> packages/insomnia-scripting-environment/src/objects/insomnia.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts",
+    "packages/insomnia-scripting-environment/src/objects/index.ts -> packages/insomnia-scripting-environment/src/objects/insomnia.ts -> packages/insomnia-scripting-environment/src/objects/send-request.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts",
+    "packages/insomnia-scripting-environment/src/objects/index.ts -> packages/insomnia-scripting-environment/src/objects/response.ts -> packages/insomnia/src/network/network.ts"
+  ],
+  "insomnia-smoke-test": [],
+  "insomnia-testing": [],
+  "insomnia-vcs": []
+}