From 543d01b6b0377df09fefb13ef553fc4f0a7cc6ce Mon Sep 17 00:00:00 2001
From: Ryan Willis <ryan.willis@konghq.com>
Date: Thu, 14 May 2026 08:52:11 -0700
Subject: [PATCH 1/7] use blob in iframe instead of webview (#9919)

---
 packages/insomnia/src/root.tsx                |  5 ++++
 .../viewers/response-pdf-viewer.tsx           | 26 ++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/packages/insomnia/src/root.tsx b/packages/insomnia/src/root.tsx
index ea09034463..9480e41b24 100644
--- a/packages/insomnia/src/root.tsx
+++ b/packages/insomnia/src/root.tsx
@@ -203,6 +203,11 @@ export const Layout = ({ children }: { children: React.ReactNode }) => {
             *
             insomnia://*
       ;
+      frame-src
+            blob:
+            *
+            insomnia://*
+      ;
       script-src
             'self'
             'unsafe-eval'
diff --git a/packages/insomnia/src/ui/components/viewers/response-pdf-viewer.tsx b/packages/insomnia/src/ui/components/viewers/response-pdf-viewer.tsx
index 086a411f7a..8e8321c9d0 100644
--- a/packages/insomnia/src/ui/components/viewers/response-pdf-viewer.tsx
+++ b/packages/insomnia/src/ui/components/viewers/response-pdf-viewer.tsx
@@ -1,9 +1,29 @@
+import { useEffect, useState } from 'react';
+
 interface Props {
   body: Buffer;
 }
 
-export const ResponsePDFViewer = (props: Props) => {
-  const url = `data:application/pdf;base64,${props.body.toString('base64')}`;
+export const ResponsePDFViewer = ({ body }: Props) => {
+  const [url, setUrl] = useState<string>('');
 
-  return <webview data-testid="ResponsePDFView" src={url} />;
+  useEffect(() => {
+    const blob = new Blob([body], { type: 'application/pdf' });
+    const objectUrl = URL.createObjectURL(blob);
+    setUrl(objectUrl);
+    return () => URL.revokeObjectURL(objectUrl);
+  }, [body]);
+
+  if (!url) {
+    return null;
+  }
+
+  return (
+    <iframe
+      data-testid="ResponsePDFView"
+      src={url}
+      title="PDF response preview"
+      style={{ width: '100%', height: '100%', border: 0, backgroundColor: '#fff' }}
+    />
+  );
 };

From e21d27e1f976fcf333dd6e33590c69adad3ad6eb Mon Sep 17 00:00:00 2001
From: Pavlos Koutoglou <pkoutoglou@gmail.com>
Date: Thu, 14 May 2026 19:02:50 +0300
Subject: [PATCH 2/7] feat: enrich Request Executed analytics event with
 script, param, and certificate properties (#9914)

---
 ...kspaceId.debug.request.$requestId.send.tsx | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx
index 75d0827e5d..447e19478f 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx
@@ -6,12 +6,14 @@ import { v4 as uuidv4 } from 'uuid';
 import { getContentDispositionHeader } from '~/common/misc';
 import type {
   Environment,
+  Request,
+  RequestGroup,
   RequestMeta,
   ResponseInfo,
   RunnerResultPerRequestPerIteration,
   UserUploadEnvironment,
 } from '~/insomnia-data';
-import { models, services } from '~/insomnia-data';
+import { database as db, models, services } from '~/insomnia-data';
 import type { ResponsePatch } from '~/main/network/libcurl-promise';
 import type { TimingStep } from '~/main/network/request-timing';
 import {
@@ -334,7 +336,7 @@ export const sendActionImplementation = async (options: {
 };
 
 export async function clientAction({ request, params }: Route.ClientActionArgs) {
-  const { requestId } = params;
+  const { requestId, workspaceId } = params;
   const { shouldPromptForPathAfterResponse, ignoreUndefinedEnvVariable } = (await request.json()) as SendActionParams;
 
   try {
@@ -353,6 +355,20 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
         const activeRequest = await services.request.getById(requestId);
 
         if (activeRequest) {
+          const [requestAndAncestors, clientCertificates] = await Promise.all([
+            db.withAncestors<Request | RequestGroup>(
+              activeRequest as Request,
+              [models.request.type, models.requestGroup.type],
+            ),
+            services.clientCertificate.findByParentId(workspaceId),
+          ]);
+          const docsWithScripts = requestAndAncestors.filter(
+            (doc): doc is Request | RequestGroup =>
+              models.request.isRequest(doc) || models.requestGroup.isRequestGroup(doc),
+          );
+          const allPreScripts = docsWithScripts.map(doc => doc.preRequestScript).filter((s): s is string => !!s);
+          const allPostScripts = docsWithScripts.map(doc => doc.afterResponseScript).filter((s): s is string => !!s);
+
           window.main.trackSegmentEvent({
             event: SegmentEvent.requestExecuted,
             properties: {
@@ -365,6 +381,14 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
               count_headers: response.headers.length,
               count_cookies: response.headers.find(h => h.name === 'set-cookie')?.value.split(',').length || 0,
               count_tests: response.requestTestResults?.length || 0,
+              has_prescript: allPreScripts.length > 0,
+              has_postscript: allPostScripts.length > 0,
+              count_prescript_lines: allPreScripts.reduce((sum, s) => sum + s.split('\n').length, 0),
+              count_postscript_lines: allPostScripts.reduce((sum, s) => sum + s.split('\n').length, 0),
+              count_query_parameters: activeRequest.parameters?.length ?? 0,
+              count_path_parameters: activeRequest.pathParameters?.length ?? 0,
+              has_docs: !!activeRequest.description,
+              count_certificates: clientCertificates.length,
             },
           });
 

From 461a57e4288baa9327a88ef52ab1060865bb535c Mon Sep 17 00:00:00 2001
From: Ryan Willis <ryan.willis@konghq.com>
Date: Thu, 14 May 2026 10:34:40 -0700
Subject: [PATCH 3/7] chore(analytics): consolidate analytics into shared
 insomnia-analytics package (#9915)

---
 package-lock.json                             |  14 +-
 package.json                                  |   1 +
 packages/insomnia-analytics/package.json      |  36 ++++
 .../insomnia-analytics/src/analytics.test.ts  |  73 +++++++
 packages/insomnia-analytics/src/analytics.ts  | 103 ++++++++++
 .../insomnia-analytics/src/events.test.ts     |  16 ++
 packages/insomnia-analytics/src/events.ts     | 142 +++++++++++++
 packages/insomnia-analytics/src/index.ts      |   2 +
 packages/insomnia-analytics/tsconfig.json     |  25 +++
 packages/insomnia-analytics/vitest.config.ts  |   7 +
 packages/insomnia-inso/package.json           |   1 -
 packages/insomnia-inso/src/analytics.ts       |  76 ++-----
 packages/insomnia/package.json                |   1 -
 .../src/__tests__/install-plugin.test.ts      |   4 +-
 packages/insomnia/src/entry.main.ts           |   4 +-
 packages/insomnia/src/entry.preload.ts        |   2 +-
 .../src/konnect/__tests__/sync.test.ts        |   6 +-
 packages/insomnia/src/main/analytics.ts       | 191 ++++++------------
 packages/insomnia/src/main/git-service.ts     |  84 ++++----
 packages/insomnia/src/main/install-plugin.ts  |   4 +-
 packages/insomnia/src/main/ipc/electron.ts    |   2 +-
 packages/insomnia/src/main/ipc/main.ts        |  10 +-
 .../insomnia/src/main/llm-config-service.ts   |   4 +-
 .../insomnia/src/main/mcp/client-requests.ts  |   8 +-
 packages/insomnia/src/main/network/mcp.ts     |   6 +-
 packages/insomnia/src/root.tsx                |   8 +-
 .../routes/ai.generate-commit-messages.tsx    |   6 +-
 .../insomnia/src/routes/auth.authorize.tsx    |   6 +-
 packages/insomnia/src/routes/auth.login.tsx   |   6 +-
 packages/insomnia/src/routes/import.scan.tsx  |   4 +-
 ...ganizationId.project.$projectId._index.tsx |   8 +-
 ...ganizationId.project.$projectId.update.tsx |  18 +-
 ...kspaceId.debug.request.$requestId.send.tsx |  10 +-
 ...paceId.debug.request.$requestId.update.tsx |   6 +-
 ...pace.$workspaceId.debug.request.delete.tsx |   6 +-
 ...rkspace.$workspaceId.debug.request.new.tsx |   6 +-
 ...Id.workspace.$workspaceId.debug.runner.tsx |   6 +-
 ...projectId.workspace.$workspaceId.debug.tsx |  26 +--
 ...kspace.$workspaceId.environment.create.tsx |   6 +-
 ...kspace.$workspaceId.insomnia-sync.pull.tsx |  16 +-
 ...kspace.$workspaceId.insomnia-sync.push.tsx |  16 +-
 ...ock-server.generate-request-collection.tsx |   6 +-
 ...-server.mock-route.$mockRouteId.delete.tsx |   6 +-
 ...Id.mock-server.mock-route.$mockRouteId.tsx |   6 +-
 ...-server.mock-route.$mockRouteId.update.tsx |   6 +-
 ...workspaceId.mock-server.mock-route.new.tsx |  10 +-
 ...aceId.spec.generate-request-collection.tsx |   6 +-
 ...$projectId.workspace.$workspaceId.spec.tsx |  14 +-
 ...Id.test.test-suite.$testSuiteId.delete.tsx |   4 +-
 ....test-suite.$testSuiteId.run-all-tests.tsx |   6 +-
 ...suite.$testSuiteId.test.$testId.delete.tsx |   4 +-
 ...st-suite.$testSuiteId.test.$testId.run.tsx |   6 +-
 ....test.test-suite.$testSuiteId.test.new.tsx |   4 +-
 ...space.$workspaceId.test.test-suite.new.tsx |   4 +-
 ...Id.project.$projectId.workspace.delete.tsx |   6 +-
 ...ionId.project.$projectId.workspace.new.tsx |  22 +-
 ...Id.project.$projectId.workspace.update.tsx |   6 +-
 ...ganization.$organizationId.project.new.tsx |   6 +-
 packages/insomnia/src/routes/organization.tsx |  18 +-
 .../insomnia/src/routes/settings.update.tsx   |   4 +-
 packages/insomnia/src/ui/analytics.ts         | 156 +-------------
 .../.client/codemirror/code-editor.tsx        |   4 +-
 .../src/ui/components/command-palette.tsx     |  10 +-
 .../dropdowns/content-type-dropdown.tsx       |   6 +-
 .../dropdowns/git-project-sync-dropdown.tsx   |   6 +-
 .../dropdowns/request-actions-dropdown.tsx    |  20 +-
 .../dropdowns/workspace-card-dropdown.tsx     |  10 +-
 .../dropdowns/workspace-dropdown.tsx          |  18 +-
 .../ui/components/editors/body/raw-editor.tsx |   4 +-
 .../src/ui/components/github-stars-button.tsx |  10 +-
 .../ui/components/header-invite-button.tsx    |   6 +-
 .../src/ui/components/mcp/mcp-pane.tsx        |   6 +-
 .../ui/components/mcp/mcp-request-pane.tsx    |   6 +-
 .../src/ui/components/mcp/mcp-roots-panel.tsx |   4 +-
 .../modals/export-requests-modal.tsx          |   6 +-
 .../components/modals/generate-code-modal.tsx |   6 +-
 .../modals/git-project-staging-modal.tsx      |  10 +-
 .../modals/import-modal/import-modal.tsx      |   6 +-
 .../modals/invite-modal/invite-form.tsx       |   6 +-
 .../modals/invite-modal/invite-modal.tsx      |   8 +-
 .../components/modals/new-workspace-modal.tsx |   6 +-
 .../ui/components/modals/settings-modal.tsx   |  10 +-
 .../ui/components/modals/sync-merge-modal.tsx |  14 +-
 .../src/ui/components/panes/request-pane.tsx  |  20 +-
 .../src/ui/components/panes/response-pane.tsx |   8 +-
 .../components/project/project-empty-view.tsx |  14 +-
 .../project/project-list-sidebar.tsx          |   4 +-
 .../ui/components/rendered-query-string.tsx   |   6 +-
 .../src/ui/components/request-url-bar.tsx     |  18 +-
 .../ui/components/settings/import-export.tsx  |  26 +--
 .../components/settings/konnect-settings.tsx  |   4 +-
 .../viewers/response-cookies-viewer.tsx       |   4 +-
 .../ui/components/viewers/response-viewer.tsx |  10 +-
 .../websockets/realtime-response-pane.tsx     |   4 +-
 packages/insomnia/src/ui/hooks/theme.ts       |   6 +-
 .../insomnia/src/ui/hooks/use-konnect-sync.ts |   6 +-
 packages/insomnia/src/ui/sync-utils.ts        |   2 +-
 97 files changed, 881 insertions(+), 709 deletions(-)
 create mode 100644 packages/insomnia-analytics/package.json
 create mode 100644 packages/insomnia-analytics/src/analytics.test.ts
 create mode 100644 packages/insomnia-analytics/src/analytics.ts
 create mode 100644 packages/insomnia-analytics/src/events.test.ts
 create mode 100644 packages/insomnia-analytics/src/events.ts
 create mode 100644 packages/insomnia-analytics/src/index.ts
 create mode 100644 packages/insomnia-analytics/tsconfig.json
 create mode 100644 packages/insomnia-analytics/vitest.config.ts

diff --git a/package-lock.json b/package-lock.json
index f0227bae21..f3e2c1a152 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
       "workspaces": [
         "packages/insomnia-testing",
         "packages/insomnia",
+        "packages/insomnia-analytics",
         "packages/insomnia-api",
         "packages/insomnia-inso",
         "packages/insomnia-smoke-test",
@@ -18409,6 +18410,10 @@
       "resolved": "packages/insomnia",
       "link": true
     },
+    "node_modules/insomnia-analytics": {
+      "resolved": "packages/insomnia-analytics",
+      "link": true
+    },
     "node_modules/insomnia-api": {
       "resolved": "packages/insomnia-api",
       "link": true
@@ -29183,7 +29188,6 @@
         "@rjsf/utils": "6.0.0-beta.15",
         "@rjsf/validator-ajv8": "6.0.0-beta.15",
         "@seald-io/nedb": "^4.1.1",
-        "@segment/analytics-node": "2.2.1",
         "@sentry/electron": "^6.5.0",
         "@stoplight/spectral-core": "^1.22.0",
         "@stoplight/spectral-formats": "^1.8.2",
@@ -29336,6 +29340,13 @@
         "@kong/insomnia-plugin-external-vault": "0.1.4-dev.20251224090833"
       }
     },
+    "packages/insomnia-analytics": {
+      "version": "12.5.1-alpha.0",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@segment/analytics-node": "2.2.1"
+      }
+    },
     "packages/insomnia-api": {
       "version": "12.5.1-alpha.0",
       "license": "Apache-2.0",
@@ -29348,7 +29359,6 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@seald-io/nedb": "^4.1.1",
-        "@segment/analytics-node": "^2.2.1",
         "@stoplight/spectral-core": "^1.22.0",
         "@stoplight/spectral-formats": "^1.8.2",
         "@stoplight/spectral-ruleset-bundler": "1.7.0",
diff --git a/package.json b/package.json
index 06d77047f0..24861f27ee 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "workspaces": [
     "packages/insomnia-testing",
     "packages/insomnia",
+    "packages/insomnia-analytics",
     "packages/insomnia-api",
     "packages/insomnia-inso",
     "packages/insomnia-smoke-test",
diff --git a/packages/insomnia-analytics/package.json b/packages/insomnia-analytics/package.json
new file mode 100644
index 0000000000..a4c328f7be
--- /dev/null
+++ b/packages/insomnia-analytics/package.json
@@ -0,0 +1,36 @@
+{
+  "private": true,
+  "name": "insomnia-analytics",
+  "license": "Apache-2.0",
+  "version": "12.5.1-alpha.0",
+  "author": "Kong <office@konghq.com>",
+  "description": "Shared analytics client for the Insomnia desktop app and CLI",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Kong/insomnia.git",
+    "directory": "packages/insomnia-analytics"
+  },
+  "bugs": {
+    "url": "https://github.com/kong/insomnia/issues"
+  },
+  "homepage": "https://github.com/Kong/insomnia#readme",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "import": "./src/index.ts",
+      "types": "./src/index.ts"
+    },
+    "./events": {
+      "import": "./src/events.ts",
+      "types": "./src/events.ts"
+    }
+  },
+  "scripts": {
+    "lint": "eslint . --ext .ts --cache",
+    "type-check": "tsc --noEmit --project tsconfig.json",
+    "test": "vitest run"
+  },
+  "dependencies": {
+    "@segment/analytics-node": "2.2.1"
+  }
+}
diff --git a/packages/insomnia-analytics/src/analytics.test.ts b/packages/insomnia-analytics/src/analytics.test.ts
new file mode 100644
index 0000000000..0bf2e2dd3f
--- /dev/null
+++ b/packages/insomnia-analytics/src/analytics.test.ts
@@ -0,0 +1,73 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const mockTrack = vi.fn();
+const mockPage = vi.fn();
+const mockCloseAndFlush = vi.fn().mockResolvedValue(void 0);
+
+vi.mock('@segment/analytics-node', () => ({
+  Analytics: vi.fn(() => ({
+    track: mockTrack,
+    page: mockPage,
+    closeAndFlush: mockCloseAndFlush,
+  })),
+}));
+
+describe('InsomniaAnalytics', () => {
+  beforeEach(() => {
+    vi.resetModules();
+    mockTrack.mockReset();
+    mockPage.mockReset();
+    mockCloseAndFlush.mockReset().mockResolvedValue(void 0);
+  });
+
+  it('forwards track calls with platform-tagged properties and an app+os context', async () => {
+    const { InsomniaAnalytics } = await import('./analytics');
+    const analytics = new InsomniaAnalytics({
+      writeKey: 'test',
+      app: { appName: 'inso', appVersion: '1.2.3', osVersion: '14.0', platform: 'cli' },
+    });
+
+    analytics.track({ event: 'inso_run_test', properties: { suite: 'echo' }, anonymousId: 'anon-1' });
+
+    expect(mockTrack).toHaveBeenCalledTimes(1);
+    const [payload] = mockTrack.mock.calls[0];
+    expect(payload).toMatchObject({
+      event: 'inso_run_test',
+      anonymousId: 'anon-1',
+      userId: '',
+      properties: { suite: 'echo', platform: 'cli' },
+      context: { app: { name: 'inso', version: '1.2.3' }, os: { version: '14.0' } },
+    });
+  });
+
+  it('resolves osVersion lazily when provided as a function', async () => {
+    const { InsomniaAnalytics } = await import('./analytics');
+    let v = '1.0';
+    const analytics = new InsomniaAnalytics({
+      writeKey: 'test',
+      app: { appName: 'app', appVersion: '0.1', osVersion: () => v, platform: 'app' },
+    });
+
+    v = '2.0';
+    analytics.track({ event: 'App Started', anonymousId: 'a', userId: 'u' });
+
+    const [payload] = mockTrack.mock.calls[0];
+    expect(payload.context.os.version).toBe('2.0');
+  });
+
+  it('routes analytics errors through the onError handler', async () => {
+    const onError = vi.fn();
+    const { InsomniaAnalytics } = await import('./analytics');
+    const analytics = new InsomniaAnalytics({
+      writeKey: 'test',
+      app: { appName: 'app', appVersion: '0.1', osVersion: '1.0', platform: 'app' },
+      onError,
+    });
+
+    analytics.track({ event: 'App Started', anonymousId: 'a' });
+    const [, callback] = mockTrack.mock.calls[0];
+    callback(new Error('segment failure'));
+
+    expect(onError).toHaveBeenCalledWith(expect.any(Error));
+  });
+});
diff --git a/packages/insomnia-analytics/src/analytics.ts b/packages/insomnia-analytics/src/analytics.ts
new file mode 100644
index 0000000000..774ce1adee
--- /dev/null
+++ b/packages/insomnia-analytics/src/analytics.ts
@@ -0,0 +1,103 @@
+import { Analytics, type AnalyticsSettings } from '@segment/analytics-node';
+
+export interface AppContext {
+  appName: string;
+  appVersion: string;
+  osVersion: string | (() => string);
+  platform: 'app' | 'cli';
+}
+
+export interface TrackOptions {
+  event: string;
+  properties?: Record<string, unknown>;
+  anonymousId: string;
+  userId?: string;
+}
+
+export interface PageOptions {
+  name: string;
+  anonymousId: string;
+  userId?: string;
+}
+
+export interface InsomniaAnalyticsOptions {
+  writeKey: string;
+  app: AppContext;
+  settings?: Omit<AnalyticsSettings, 'writeKey'>;
+  onError?: (error: unknown) => void;
+}
+
+export function getNormalizedOsName(platform: NodeJS.Platform | string): string {
+  switch (platform) {
+    case 'darwin': {
+      return 'mac';
+    }
+    case 'win32': {
+      return 'windows';
+    }
+    default: {
+      return platform;
+    }
+  }
+}
+
+export class InsomniaAnalytics {
+  private readonly client: Analytics;
+  private readonly app: AppContext;
+  private readonly onError: (error: unknown) => void;
+
+  constructor({ writeKey, app, settings, onError }: InsomniaAnalyticsOptions) {
+    this.client = new Analytics({ writeKey, ...settings });
+    this.app = app;
+    this.onError = onError ?? (() => {});
+  }
+
+  track({ event, properties, anonymousId, userId }: TrackOptions): void {
+    this.client.track(
+      {
+        event,
+        anonymousId,
+        userId: userId ?? '',
+        properties: { ...properties, platform: this.app.platform },
+        context: this.buildContext(),
+      },
+      error => {
+        if (error) {
+          this.onError(error);
+        }
+      },
+    );
+  }
+
+  page({ name, anonymousId, userId }: PageOptions): void {
+    this.client.page(
+      {
+        name,
+        anonymousId,
+        userId: userId ?? '',
+        context: this.buildContext(),
+      },
+      error => {
+        if (error) {
+          this.onError(error);
+        }
+      },
+    );
+  }
+
+  async closeAndFlush(timeoutMs = 5000): Promise<void> {
+    try {
+      await this.client.closeAndFlush({ timeout: timeoutMs });
+    } catch (error) {
+      this.onError(error);
+    }
+  }
+
+  private buildContext() {
+    const osVersion = typeof this.app.osVersion === 'function' ? this.app.osVersion() : this.app.osVersion;
+    return {
+      app: { name: this.app.appName, version: this.app.appVersion },
+      os: { name: getNormalizedOsName(process.platform), version: osVersion },
+    };
+  }
+}
diff --git a/packages/insomnia-analytics/src/events.test.ts b/packages/insomnia-analytics/src/events.test.ts
new file mode 100644
index 0000000000..2072bdf6e1
--- /dev/null
+++ b/packages/insomnia-analytics/src/events.test.ts
@@ -0,0 +1,16 @@
+import { describe, expect, it } from 'vitest';
+
+import { AnalyticsEvent, InsoEvent } from './events';
+
+describe('events', () => {
+  it('AnalyticsEvent has expected entries', () => {
+    expect(AnalyticsEvent.appStarted).toBe('App Started');
+    expect(AnalyticsEvent.unitTestRun).toBe('Ran Individual Unit Test');
+    expect(AnalyticsEvent.installPlugin).toBe('Plugin Installed');
+  });
+
+  it('InsoEvent prefixes with inso_', () => {
+    expect(InsoEvent.runTest).toBe('inso_run_test');
+    expect(InsoEvent.script).toBe('inso_script');
+  });
+});
diff --git a/packages/insomnia-analytics/src/events.ts b/packages/insomnia-analytics/src/events.ts
new file mode 100644
index 0000000000..50dd647742
--- /dev/null
+++ b/packages/insomnia-analytics/src/events.ts
@@ -0,0 +1,142 @@
+export enum AnalyticsEvent {
+  appStarted = 'App Started',
+  analyticsDisabled = 'Analytics Disabled',
+  collectionCreate = 'Collection Created',
+  dataExport = 'Data Exported',
+  exportCompleted = 'Export Completed',
+  dataImport = 'Data Imported',
+  importStarted = 'Import Started',
+  importScanned = 'Import Scanned',
+  importCompleted = 'Import Completed',
+  importLoginRequired = 'Import Login Required',
+  importResumedAfterLogin = 'Import Resumed After Login',
+  importedRequestFirstSend = 'Imported Request First Send',
+  documentCreate = 'Document Created',
+  mockCreateModalOpened = 'Mock Server Create Modal Opened',
+  mockCreate = 'Mock Created',
+  mockEdit = 'Mock Server Edited',
+  mockDelete = 'Mock Server Deleted',
+  mockRouteCreate = 'Mock Route Created',
+  mockRouteEdit = 'Mock Route Edited',
+  mockRouteDelete = 'Mock Route Deleted',
+  generateCollection = 'Generated Collection',
+  generateCollectionFromMock = 'Generate Collection From Mock',
+  environmentCreate = 'Environment Created',
+  loginSuccess = 'Login Success',
+  inviteTrigger = 'Invite Triggered From App',
+  exportAllCollections = 'Exported All Collections',
+  kongConnected = 'Kong Connected',
+  kongSync = 'Kong Synced',
+  requestBodyTypeSelect = 'Request Body Type Selected',
+  requestCreated = 'Request Created',
+  requestExecuted = 'Request Executed',
+  requestEdit = 'Request Edited',
+  requestDeleted = 'Request Deleted',
+  requestRenamed = 'Request Renamed',
+  requestUrlCopied = 'Request URL Copied',
+  collectionRunExecute = 'Collection Run Executed',
+  projectLocalCreate = 'Local Project Created',
+  projectLocalDelete = 'Local Project Deleted',
+  selectScratchpad = 'Scratchpad Selected at Login',
+  syncConflictResolutionStart = 'Sync Conflict Resolution Started',
+  syncConflictResolutionCompleteMine = 'Sync Conflict Resolution Completed Mine',
+  syncConflictResolutionCompleteTheirs = 'Sync Conflict Resolution Completed Theirs',
+  testSuiteCreate = 'Test Suite Created',
+  testSuiteDelete = 'Test Suite Deleted',
+  unitTestCreate = 'Unit Test Created',
+  unitTestDelete = 'Unit Test Deleted',
+  unitTestRun = 'Ran Individual Unit Test',
+  unitTestRunAll = 'Ran All Unit Tests',
+  vcsSyncStart = 'VCS Sync Started',
+  vcsSyncComplete = 'VCS Sync Completed',
+  vcsAction = 'VCS Action Executed',
+  gitAuthenticationCompleted = 'Git Authentication Completed',
+  gitAuthenticationUpdated = 'Git Authentication Updated',
+  buttonClick = 'Button Clicked',
+  inviteMember = 'Invite Sent',
+  inviteResent = 'Invite Resent',
+  inviteRevoked = 'Invite Revoked',
+  projectCreated = 'Project Created',
+  projectUpdated = 'Project Updated',
+  exportStarted = 'Export Started',
+  exportRequestsChosen = 'Export Requests Chosen',
+  recommendCommitsGenerated = 'Recommend Commits Generated',
+  recommendCommitsSaved = 'Recommend Commits Saved',
+  recommendCommitsCancelled = 'Recommend Commits Cancelled',
+  recommendCommitsClicked = 'Recommend Commits Clicked',
+  mcpClientWorkspaceCreate = 'MCP Client Workspace Created',
+  mcpClientAdded = 'MCP Client Added',
+  mcpClientConnected = 'MCP Client Connected',
+  mcpClientDisconnected = 'MCP Client Disconnected',
+  mcpToolCalled = 'MCP Tool Called',
+  mcpResourceRead = 'MCP Resource Read',
+  mcpPromptCalled = 'MCP Prompt Called',
+  inviteNotPermitted = 'Invite Not Permitted',
+  responseToMockClicked = 'Response To Mock Clicked',
+  gitSyncButtonClicked = 'Git Sync Button Clicked',
+  preferencesViewed = 'Preferences Viewed',
+  copyAsCurl = 'Copied As cURL',
+  themeChanged = 'Theme Changed',
+  generateCodeClicked = 'Generate Code Clicked',
+  generateCodeLanguageChanged = 'Generate Code Language Changed',
+  filterCreatedHomePage = 'Filter Created From Home Page',
+  filterCreatedProjects = 'Filter Created Projects',
+  filterCreatedRequests = 'Filter Created Requests',
+  filterCreatedResponseBody = 'Filter Created Response Body',
+  aiFeatureEnabled = 'AI Feature Enabled',
+  aiFeatureDisabled = 'AI Feature Disabled',
+  installPlugin = 'Plugin Installed',
+
+  homepageFiltered = 'homepage-filtered',
+  quickSearchOpenedByKeyboard = 'quick-search-opened-by-keyboard',
+  quickSearchOpenedByMouse = 'quick-search-opened-by-mouse',
+  statusbarLeftbarToggled = 'statusbar-leftbar-toggled',
+  statusbarTopbarToggled = 'statusbar-topbar-toggled',
+  statusbarOrphanedProjectsClicked = 'statusbar-orphaned-projects-clicked',
+  designerGenerateMockClicked = 'designer-generate-mock-clicked',
+  designerPreviewToggled = 'designer-preview-toggled',
+  requestEnvironmentClicked = 'request-environment-clicked',
+  requestAddCookiesClicked = 'request-add-cookies-clicked',
+  requestAddCertificatesClicked = 'request-add-certificates-clicked',
+  requestListSortClicked = 'request-list-sort-clicked',
+  requestListExpandCollapseClicked = 'request-list-expand-collapse-clicked',
+  requestParamsDescriptionToggled = 'request-params-description-toggled',
+  requestParamsImportFromURLClicked = 'request-params-import-from-URL-clicked',
+  requestParamsBulkEditToggled = 'request-params-bulk-edit-toggled',
+  responsePreviewJSONPathEntered = 'response-preview-jsonpath-entered',
+  requestBodyBeautifyClicked = 'request-body-beautify-clicked',
+  requestHeadersDescriptionToggled = 'request-headers-description-toggled',
+  requestHeadersBulkEditToggled = 'request-headers-bulk-edit-toggled',
+  requestScriptsPreScriptSnippetAdded = 'request-scripts-prescript-snippet-added',
+  requestScriptsPostScriptSnippetAdded = 'request-scripts-postscript-snippet-added',
+  responseHeadersCopyAllClicked = 'response-headers-copy-all-clicked',
+  responseCookiesManageCookiesClicked = 'response-cookies-manage-cookies-clicked',
+  requestOpenInNewTabClicked = 'request-open-in-new-tab-clicked',
+  requestListMenuPinClicked = 'request-list-menu-pin-clicked',
+  requestListMenuDuplicateClicked = 'request-list-menu-duplicate-clicked',
+  requestListMenuRenameClicked = 'request-list-menu-rename-clicked',
+  requestListMenuSettingsClicked = 'request-list-menu-settings-clicked',
+  requestSendMenuGenerateCodeClicked = 'request-send-menu-generate-code-clicked',
+  requestSendMenuSendAfterDelayClicked = 'request-send-menu-send-after-delay-clicked',
+  requestSendMenuRepeatAfterIntervalClicked = 'request-send-menu-repeat-after-interval-clicked',
+  requestSendMenuDownloadAfterSendClicked = 'request-send-menu-download-after-send-clicked',
+  requestSendMenuSendAndDownloadClicked = 'request-send-menu-send-and-download-clicked',
+  mcpListExpandCollapseClicked = 'mcp-list-expand-collapse-clicked',
+  mcpListFiltered = 'mcp-list-filtered',
+  mcpRequestParamsBeautifyClicked = 'mcp-request-params-beautify-clicked',
+  mcpRequestHeadersDescriptionToggled = 'mcp-request-headers-description-toggled',
+  mcpRequestRootsNotifyClicked = 'mcp-request-roots-notify-clicked',
+  mcpResponseHeadersCopyAllClicked = 'mcp-response-headers-copy-all-clicked',
+  kongKonnectPatValidated = 'kong-konnect-pat-validated',
+  kongKonnectSyncCompleted = 'kong-konnect-sync-completed',
+  emptyStateSendRequestClicked = 'empty-state-send-request-clicked',
+  emptyStateCreateDocumentClicked = 'empty-state-create-document-clicked',
+}
+
+export enum InsoEvent {
+  runTest = 'inso_run_test',
+  runCollection = 'inso_run_collection',
+  lintSpec = 'inso_lint_spec',
+  exportSpec = 'inso_export_spec',
+  script = 'inso_script',
+}
diff --git a/packages/insomnia-analytics/src/index.ts b/packages/insomnia-analytics/src/index.ts
new file mode 100644
index 0000000000..c369a9583b
--- /dev/null
+++ b/packages/insomnia-analytics/src/index.ts
@@ -0,0 +1,2 @@
+export * from './events';
+export * from './analytics';
diff --git a/packages/insomnia-analytics/tsconfig.json b/packages/insomnia-analytics/tsconfig.json
new file mode 100644
index 0000000000..1cf9c3d3a3
--- /dev/null
+++ b/packages/insomnia-analytics/tsconfig.json
@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "target": "es2020",
+    "allowJs": false,
+    "resolveJsonModule": true,
+    "moduleResolution": "bundler",
+    "isolatedModules": true,
+    "module": "ESNext",
+    "sourceMap": true,
+    "baseUrl": ".",
+    "rootDirs": ["."],
+    "lib": ["ES2023", "DOM"],
+    "types": [],
+    "strict": true,
+    "noImplicitReturns": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "useUnknownInCatchVariables": false,
+    "verbatimModuleSyntax": true,
+    "forceConsistentCasingInFileNames": true
+  }
+}
diff --git a/packages/insomnia-analytics/vitest.config.ts b/packages/insomnia-analytics/vitest.config.ts
new file mode 100644
index 0000000000..4ac6027d57
--- /dev/null
+++ b/packages/insomnia-analytics/vitest.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    environment: 'node',
+  },
+});
diff --git a/packages/insomnia-inso/package.json b/packages/insomnia-inso/package.json
index 7d75429a7e..ba587680b0 100644
--- a/packages/insomnia-inso/package.json
+++ b/packages/insomnia-inso/package.json
@@ -51,7 +51,6 @@
     "shellwords": "^1.0.1"
   },
   "dependencies": {
-    "@segment/analytics-node": "^2.2.1",
     "@seald-io/nedb": "^4.1.1",
     "@stoplight/spectral-core": "^1.22.0",
     "@stoplight/spectral-formats": "^1.8.2",
diff --git a/packages/insomnia-inso/src/analytics.ts b/packages/insomnia-inso/src/analytics.ts
index ba4c0bf657..2f116f99cd 100644
--- a/packages/insomnia-inso/src/analytics.ts
+++ b/packages/insomnia-inso/src/analytics.ts
@@ -1,7 +1,7 @@
 import os from 'node:os';
 
-import { Analytics } from '@segment/analytics-node';
 import { getSegmentWriteKey } from 'insomnia/src/common/constants';
+import { InsoEvent, InsomniaAnalytics } from 'insomnia-analytics';
 import { v4 as uuidv4 } from 'uuid';
 
 import type { Settings } from '~/insomnia-data';
@@ -10,15 +10,18 @@ import packageJson from '../package.json';
 import neDbAdapter from './db/adapters/ne-db-adapter';
 import { getAppDataDir, getDefaultProductName } from './util';
 
-export enum InsoEvent {
-  runTest = 'inso_run_test',
-  runCollection = 'inso_run_collection',
-  lintSpec = 'inso_lint_spec',
-  exportSpec = 'inso_export_spec',
-  script = 'inso_script',
-}
+export { InsoEvent };
+
+const analytics = new InsomniaAnalytics({
+  writeKey: getSegmentWriteKey(),
+  app: {
+    appName: 'inso',
+    appVersion: process.env.VERSION || packageJson.version,
+    osVersion: () => os.release(),
+    platform: 'cli',
+  },
+});
 
-const analyticsClient = new Analytics({ writeKey: getSegmentWriteKey() });
 let deviceId: string | null = null;
 let localSettings: Settings | null = null;
 
@@ -54,25 +57,16 @@ const getDeviceId = async (): Promise<string> => {
   return deviceId;
 };
 
-const getOsName = (): string => {
-  switch (process.platform) {
-    case 'darwin': {
-      return 'mac';
-    }
-    case 'win32': {
-      return 'windows';
-    }
-    default: {
-      return process.platform;
-    }
-  }
-};
-
 export const trackInsoEvent = async (event: InsoEvent, properties?: Record<string, unknown>): Promise<void> => {
   if (process.env.NODE_ENV === 'test') {
     return;
   }
 
+  // new for v13 - provide a way to disable analytics
+  if (process.env.INSO_TELEMETRY_DISABLED) {
+    return;
+  }
+
   const settings = await getLocalSettings();
   if (settings && !settings.enableAnalytics) {
     return;
@@ -80,40 +74,10 @@ export const trackInsoEvent = async (event: InsoEvent, properties?: Record<strin
 
   try {
     const anonymousId = await getDeviceId();
-    const version = process.env.VERSION || packageJson.version;
-
-    analyticsClient.track(
-      {
-        event,
-        anonymousId,
-        properties: {
-          ...properties,
-          platform: 'cli',
-        },
-        context: {
-          app: {
-            name: 'inso',
-            version,
-          },
-          os: {
-            name: getOsName(),
-            version: os.release(),
-          },
-        },
-      },
-      () => {
-        // Silently fail
-      },
-    );
-  } catch {
-    // Silently fail
-  }
+    analytics.track({ event, anonymousId, properties });
+  } catch {}
 };
 
 export const flushAnalytics = async (): Promise<void> => {
-  try {
-    await analyticsClient.closeAndFlush({ timeout: 5000 });
-  } catch {
-    // Silently fail
-  }
+  await analytics.closeAndFlush(5000);
 };
diff --git a/packages/insomnia/package.json b/packages/insomnia/package.json
index 8b4f30ee99..9995d1830e 100644
--- a/packages/insomnia/package.json
+++ b/packages/insomnia/package.json
@@ -64,7 +64,6 @@
     "@rjsf/utils": "6.0.0-beta.15",
     "@rjsf/validator-ajv8": "6.0.0-beta.15",
     "@seald-io/nedb": "^4.1.1",
-    "@segment/analytics-node": "2.2.1",
     "@sentry/electron": "^6.5.0",
     "@stoplight/spectral-core": "^1.22.0",
     "@stoplight/spectral-formats": "^1.8.2",
diff --git a/packages/insomnia/src/__tests__/install-plugin.test.ts b/packages/insomnia/src/__tests__/install-plugin.test.ts
index 91e8a62391..f90edea2d6 100644
--- a/packages/insomnia/src/__tests__/install-plugin.test.ts
+++ b/packages/insomnia/src/__tests__/install-plugin.test.ts
@@ -66,8 +66,8 @@ vi.mock('../main/install-plugin', async () => {
 });
 
 vi.mock('../main/analytics', () => ({
-  trackSegmentEvent: vi.fn(),
-  SegmentEvent: {
+  trackAnalyticsEvent: vi.fn(),
+  AnalyticsEvent: {
     installPlugin: 'Plugin Installed',
   },
 }));
diff --git a/packages/insomnia/src/entry.main.ts b/packages/insomnia/src/entry.main.ts
index abcf0f8c70..abe693822c 100644
--- a/packages/insomnia/src/entry.main.ts
+++ b/packages/insomnia/src/entry.main.ts
@@ -21,7 +21,7 @@ import { registerLLMConfigServiceAPI } from '~/main/llm-config-service';
 import { userDataFolder } from '../config/config.json';
 import { getAppVersion, getProductName, isDevelopment } from './common/constants';
 import { isMac } from './common/platform';
-import { SegmentEvent, trackSegmentEvent } from './main/analytics';
+import { AnalyticsEvent, trackAnalyticsEvent } from './main/analytics';
 import { registerInsomniaProtocols } from './main/api.protocol';
 import { backupIfNewerVersionAvailable } from './main/backup';
 import { registerSyncHandlers } from './main/cloud-sync/ipc';
@@ -365,7 +365,7 @@ async function _trackStats() {
 
   const settings = await services.settings.get();
 
-  trackSegmentEvent(SegmentEvent.appStarted, {
+  trackAnalyticsEvent(AnalyticsEvent.appStarted, {
     localProjects,
     remoteProjects,
     createdRequests: stats.createdRequests,
diff --git a/packages/insomnia/src/entry.preload.ts b/packages/insomnia/src/entry.preload.ts
index ed7b80188a..6ad8416d4e 100644
--- a/packages/insomnia/src/entry.preload.ts
+++ b/packages/insomnia/src/entry.preload.ts
@@ -289,7 +289,7 @@ const main: Window['main'] = {
   secretStorage,
   electronStorage,
   sync,
-  trackSegmentEvent: options => ipcRenderer.send('trackSegmentEvent', options),
+  trackAnalyticsEvent: options => ipcRenderer.send('trackAnalyticsEvent', options),
   trackPageView: options => ipcRenderer.send('trackPageView', options),
   setCurrentOrganizationId: organizationId => ipcRenderer.send('analytics.setOrganizationId', organizationId),
   showNunjucksContextMenu: options => ipcRenderer.send('show-nunjucks-context-menu', options),
diff --git a/packages/insomnia/src/konnect/__tests__/sync.test.ts b/packages/insomnia/src/konnect/__tests__/sync.test.ts
index 376f66a490..9bdbc2695d 100644
--- a/packages/insomnia/src/konnect/__tests__/sync.test.ts
+++ b/packages/insomnia/src/konnect/__tests__/sync.test.ts
@@ -1,7 +1,7 @@
 /**
  * Tests run against the in-memory NeDB initialized by setup-vitest.ts.
  * fetch is mocked per-test to return shaped Konnect API responses.
- * window.main is stubbed globally so trackSegmentEvent calls don't throw.
+ * window.main is stubbed globally so trackAnalyticsEvent calls don't throw.
  */
 
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
@@ -101,13 +101,13 @@ const konnectRequests = (docs: any[]) => docs.filter((r: any) => r.konnectRouteK
 const konnectWorkspaces = (docs: any[]) => docs.filter((w: any) => w.konnectServiceId != null);
 const konnectProjects = (docs: any[]) => docs.filter((p: any) => p.konnectControlPlaneId != null);
 
-const trackSegmentEvent = vi.fn();
+const trackAnalyticsEvent = vi.fn();
 
 beforeEach(async () => {
   // Re-init with fresh in-memory NeDB buckets — clean slate for every test.
   await initDatabase(mainDatabase, { inMemoryOnly: true }, true);
   resetV4Counter();
-  vi.stubGlobal('window', { main: { trackSegmentEvent } });
+  vi.stubGlobal('window', { main: { trackAnalyticsEvent } });
 });
 
 afterEach(() => {
diff --git a/packages/insomnia/src/main/analytics.ts b/packages/insomnia/src/main/analytics.ts
index b78061c767..59b47ec41e 100644
--- a/packages/insomnia/src/main/analytics.ts
+++ b/packages/insomnia/src/main/analytics.ts
@@ -1,8 +1,8 @@
 import crypto from 'node:crypto';
 
-import { Analytics } from '@segment/analytics-node';
 import * as Sentry from '@sentry/electron/main';
 import { net } from 'electron';
+import { AnalyticsEvent, InsomniaAnalytics } from 'insomnia-analytics';
 import { v4 as uuidv4 } from 'uuid';
 
 import { services } from '~/insomnia-data';
@@ -15,7 +15,8 @@ import {
   getSegmentWriteKey,
   PLAYWRIGHT_TEST,
 } from '../common/constants';
-import { platform } from '../common/platform';
+
+export { AnalyticsEvent };
 
 let _currentOrganizationId: string | undefined;
 
@@ -23,18 +24,29 @@ export function setCurrentOrganizationId(id: string | undefined): void {
   _currentOrganizationId = id;
 }
 
-const analytics = new Analytics({
+const analytics = new InsomniaAnalytics({
   writeKey: getSegmentWriteKey(),
-  httpClient: {
-    makeRequest(_options) {
-      return net.fetch(_options.url, {
-        method: _options.method,
-        headers: _options.headers,
-        body: _options.body,
-        signal: AbortSignal.timeout(_options.httpRequestTimeout),
-      });
+  app: {
+    appName: getProductName(),
+    appVersion: getAppVersion(),
+    osVersion: () => process.getSystemVersion(),
+    platform: 'app',
+  },
+  settings: {
+    httpClient: {
+      makeRequest(_options) {
+        return net.fetch(_options.url, {
+          method: _options.method,
+          headers: _options.headers,
+          body: _options.body,
+          signal: AbortSignal.timeout(_options.httpRequestTimeout),
+        });
+      },
     },
   },
+  onError: error => {
+    console.warn('[analytics] Error sending analytics event', error);
+  },
 });
 
 const getDeviceId = async () => {
@@ -42,48 +54,11 @@ const getDeviceId = async () => {
   return settings.deviceId || (await services.settings.update(settings, { deviceId: uuidv4() })).deviceId;
 };
 
-export enum SegmentEvent {
-  appStarted = 'App Started',
-  collectionCreate = 'Collection Created',
-  dataExport = 'Data Exported',
-  dataImport = 'Data Imported',
-  loginSuccess = 'Login Success',
-  documentCreate = 'Document Created',
-  kongConnected = 'Kong Connected',
-  kongSync = 'Kong Synced',
-  requestBodyTypeSelect = 'Request Body Type Selected',
-  requestCreated = 'Request Created',
-  requestExecuted = 'Request Executed',
-  collectionRunExecute = 'Collection Run Executed',
-  projectLocalCreate = 'Local Project Created',
-  projectLocalDelete = 'Local Project Deleted',
-  testSuiteCreate = 'Test Suite Created',
-  testSuiteDelete = 'Test Suite Deleted',
-  unitTestCreate = 'Unit Test Created',
-  unitTestDelete = 'Unit Test Deleted',
-  unitTestRun = 'Ran Individual Unit Test',
-  unitTestRunAll = 'Ran All Unit Tests',
-  vcsSyncStart = 'VCS Sync Started',
-  vcsSyncComplete = 'VCS Sync Completed',
-  vcsAction = 'VCS Action Executed',
-  gitAuthenticationCompleted = 'Git Authentication Completed',
-  gitAuthenticationUpdated = 'Git Authentication Updated',
-  buttonClick = 'Button Clicked',
-  aiFeatureEnabled = 'AI Feature Enabled',
-  aiFeatureDisabled = 'AI Feature Disabled',
-  mcpClientConnected = 'MCP Client Connected',
-  mcpClientDisconnected = 'MCP Client Disconnected',
-  mcpToolCalled = 'MCP Tool Called',
-  mcpResourceRead = 'MCP Resource Read',
-  mcpPromptCalled = 'MCP Prompt Called',
-  installPlugin = 'Plugin Installed',
-}
-
 function hashString(input: string) {
   return crypto.createHash('sha256').update(input).digest('hex');
 }
 
-export async function trackSegmentEvent(event: SegmentEvent, properties?: Record<string, any>) {
+export async function trackAnalyticsEvent(event: AnalyticsEvent, properties?: Record<string, any>) {
   if (PLAYWRIGHT_TEST) {
     return;
   }
@@ -93,46 +68,34 @@ export async function trackSegmentEvent(event: SegmentEvent, properties?: Record
     userSession.hashedAccountId = userSession?.accountId ? hashString(userSession.accountId) : '';
   }
   const allowAnalytics = settings.enableAnalytics || userSession?.hashedAccountId;
-  if (allowAnalytics) {
-    try {
-      const anonymousId = (await getDeviceId()) ?? '';
-      const context = {
-        app: { name: getProductName(), version: getAppVersion() },
-        os: { name: _getOsName(), version: process.getSystemVersion() },
-      };
+  if (!allowAnalytics) {
+    return;
+  }
 
-      analytics.track(
-        {
-          event,
-          properties: {
-            ...(_currentOrganizationId && { organization_id: _currentOrganizationId }),
-            ...properties,
-            platform: 'app',
-          },
-          context,
-          anonymousId,
-          userId: userSession?.hashedAccountId || '',
+  try {
+    const anonymousId = (await getDeviceId()) ?? '';
+    analytics.track({
+      event,
+      properties: {
+        ...(_currentOrganizationId && { organization_id: _currentOrganizationId }),
+        ...properties,
+      },
+      anonymousId,
+      userId: userSession?.hashedAccountId || '',
+    });
+  } catch (error: unknown) {
+    console.warn('[analytics] Unexpected error while sending analytics event', error);
+  } finally {
+    if (!userSession?.hashedAccountId && [AnalyticsEvent.unitTestRun, AnalyticsEvent.unitTestRunAll].includes(event)) {
+      Sentry.captureException(`Run tests by anonymous`, {
+        tags: {
+          source: 'main/analytics',
         },
-        error => {
-          if (error) {
-            console.warn('[analytics] Error sending segment event', error);
-          }
+        extra: {
+          organizationId: properties?.organizationId || '',
+          projectId: properties?.projectId || '',
         },
-      );
-    } catch (error: unknown) {
-      console.warn('[analytics] Unexpected error while sending segment event', error);
-    } finally {
-      if (!userSession?.hashedAccountId && [SegmentEvent.unitTestRun, SegmentEvent.unitTestRunAll].includes(event)) {
-        Sentry.captureException(`Run tests by anonymous`, {
-          tags: {
-            source: 'main/analytics',
-          },
-          extra: {
-            organizationId: properties?.organizationId || '',
-            projectId: properties?.projectId || '',
-          },
-        });
-      }
+      });
     }
   }
 }
@@ -148,48 +111,24 @@ export async function trackPageView(name: string) {
   }
 
   const allowAnalytics = settings.enableAnalytics || userSession?.hashedAccountId;
-  if (allowAnalytics) {
-    try {
-      const anonymousId = (await getDeviceId()) ?? '';
-      const context = {
-        app: { name: getProductName(), version: getAppVersion() },
-        os: { name: _getOsName(), version: process.getSystemVersion() },
-      };
+  if (!allowAnalytics) {
+    return;
+  }
 
-      analytics.page({ name, context, anonymousId, userId: userSession?.hashedAccountId }, error => {
-        if (error) {
-          console.warn('[analytics] Error sending segment event', error);
-        }
+  try {
+    const anonymousId = (await getDeviceId()) ?? '';
+    analytics.page({ name, anonymousId, userId: userSession?.hashedAccountId });
+
+    if (userSession?.id) {
+      net.fetch(getApiBaseURL() + '/v1/telemetry/', {
+        method: 'POST',
+        headers: new Headers({
+          'X-Session-Id': userSession?.id,
+          'X-Insomnia-Client': getClientString(),
+        }),
       });
-
-      if (userSession?.id) {
-        net.fetch(getApiBaseURL() + '/v1/telemetry/', {
-          method: 'POST',
-          headers: new Headers({
-            'X-Session-Id': userSession?.id,
-            'X-Insomnia-Client': getClientString(),
-          }),
-        });
-      }
-    } catch (error: unknown) {
-      console.warn('[analytics] Unexpected error while sending segment event', error);
-    }
-  }
-}
-
-// ~~~~~~~~~~~~~~~~~ //
-// Private Functions //
-// ~~~~~~~~~~~~~~~~~ //
-function _getOsName() {
-  switch (platform) {
-    case 'darwin': {
-      return 'mac';
-    }
-    case 'win32': {
-      return 'windows';
-    }
-    default: {
-      return platform;
     }
+  } catch (error: unknown) {
+    console.warn('[analytics] Unexpected error while sending analytics event', error);
   }
 }
diff --git a/packages/insomnia/src/main/git-service.ts b/packages/insomnia/src/main/git-service.ts
index 19499f86c1..6b85b60012 100644
--- a/packages/insomnia/src/main/git-service.ts
+++ b/packages/insomnia/src/main/git-service.ts
@@ -66,7 +66,7 @@ import { routableFSClient } from '../sync/git/routable-fs-client';
 import { shallowClone } from '../sync/git/shallow-clone';
 import type { AutoResolvedConflict, MergeConflict } from '../sync/types';
 import { invariant } from '../utils/invariant';
-import { SegmentEvent, trackSegmentEvent } from './analytics';
+import { AnalyticsEvent, trackAnalyticsEvent } from './analytics';
 import { ipcMainHandle } from './ipc/electron';
 
 // Initialize Git Remote Providers on module load
@@ -153,7 +153,7 @@ export function getErrorMessage(error: unknown): string {
   // Non-Error objects
   return 'Unknown Error';
 }
-export function vcsSegmentEventProperties(type: 'git', action: VCSAction, error?: string) {
+export function vcsEventProperties(type: 'git', action: VCSAction, error?: string) {
   return { type, action, error };
 }
 
@@ -1097,8 +1097,8 @@ export const cloneGitRepoAction = async ({
     }
 
     if (!projectId) {
-      trackSegmentEvent(SegmentEvent.vcsSyncStart, {
-        ...vcsSegmentEventProperties('git', 'clone'),
+      trackAnalyticsEvent(AnalyticsEvent.vcsSyncStart, {
+        ...vcsEventProperties('git', 'clone'),
         provider,
         repoId: repoSettingsPatch._id,
       });
@@ -1230,8 +1230,8 @@ export const cloneGitRepoAction = async ({
       });
 
       await database.flushChanges(bufferId);
-      trackSegmentEvent(SegmentEvent.vcsSyncComplete, {
-        ...vcsSegmentEventProperties('git', 'clone'),
+      trackAnalyticsEvent(AnalyticsEvent.vcsSyncComplete, {
+        ...vcsEventProperties('git', 'clone'),
         providerName,
         repoId: repoSettingsPatch._id,
       });
@@ -1245,8 +1245,8 @@ export const cloneGitRepoAction = async ({
     const project = await services.project.getById(projectId);
     invariant(project, 'Project not found');
 
-    trackSegmentEvent(SegmentEvent.vcsSyncStart, {
-      ...vcsSegmentEventProperties('git', 'clone'),
+    trackAnalyticsEvent(AnalyticsEvent.vcsSyncStart, {
+      ...vcsEventProperties('git', 'clone'),
       provider,
       repoId: repoSettingsPatch._id,
     });
@@ -1304,8 +1304,8 @@ export const cloneGitRepoAction = async ({
       });
       await services.apiSpec.getOrCreateForParentId(workspace._id);
 
-      trackSegmentEvent(SegmentEvent.vcsSyncComplete, {
-        ...vcsSegmentEventProperties('git', 'clone', 'no directory found'),
+      trackAnalyticsEvent(AnalyticsEvent.vcsSyncComplete, {
+        ...vcsEventProperties('git', 'clone', 'no directory found'),
         providerName: provider,
         repoId: repoSettingsPatch._id,
       });
@@ -1323,8 +1323,8 @@ export const cloneGitRepoAction = async ({
       const workspaces = await inMemoryFsClient.promises.readdir(workspaceBase);
 
       if (workspaces.length === 0) {
-        trackSegmentEvent(SegmentEvent.vcsSyncComplete, {
-          ...vcsSegmentEventProperties('git', 'clone', 'no workspaces found'),
+        trackAnalyticsEvent(AnalyticsEvent.vcsSyncComplete, {
+          ...vcsEventProperties('git', 'clone', 'no workspaces found'),
           providerName: provider,
           repoId: repoSettingsPatch._id,
         });
@@ -1335,8 +1335,8 @@ export const cloneGitRepoAction = async ({
       }
 
       if (workspaces.length > 1) {
-        trackSegmentEvent(SegmentEvent.vcsSyncComplete, {
-          ...vcsSegmentEventProperties('git', 'clone', 'multiple workspaces found'),
+        trackAnalyticsEvent(AnalyticsEvent.vcsSyncComplete, {
+          ...vcsEventProperties('git', 'clone', 'multiple workspaces found'),
           providerName: provider,
           repoId: repoSettingsPatch._id,
         });
@@ -1424,8 +1424,8 @@ export const cloneGitRepoAction = async ({
 
     // Flush DB changes
     await database.flushChanges(bufferId);
-    trackSegmentEvent(SegmentEvent.vcsSyncComplete, {
-      ...vcsSegmentEventProperties('git', 'clone'),
+    trackAnalyticsEvent(AnalyticsEvent.vcsSyncComplete, {
+      ...vcsEventProperties('git', 'clone'),
       providerName: provider,
       repoId: repoSettingsPatch._id,
     });
@@ -1601,8 +1601,8 @@ export const commitToGitRepoAction = async ({
       providerName = credentials.provider;
     }
 
-    trackSegmentEvent(SegmentEvent.vcsAction, {
-      ...vcsSegmentEventProperties('git', 'commit'),
+    trackAnalyticsEvent(AnalyticsEvent.vcsAction, {
+      ...vcsEventProperties('git', 'commit'),
       providerName,
       repoId: gitRepository._id,
     });
@@ -1730,8 +1730,8 @@ export const commitAndPushToGitRepoAction = async ({
       providerName = credentials.provider;
     }
 
-    trackSegmentEvent(SegmentEvent.vcsAction, {
-      ...vcsSegmentEventProperties('git', 'commit'),
+    trackAnalyticsEvent(AnalyticsEvent.vcsAction, {
+      ...vcsEventProperties('git', 'commit'),
       providerName,
       repoId: repo._id,
     });
@@ -1770,8 +1770,8 @@ export const commitAndPushToGitRepoAction = async ({
   try {
     await GitVCS.push(repo.credentialsId);
 
-    trackSegmentEvent(SegmentEvent.vcsAction, {
-      ...vcsSegmentEventProperties('git', 'push'),
+    trackAnalyticsEvent(AnalyticsEvent.vcsAction, {
+      ...vcsEventProperties('git', 'push'),
       providerName,
       repoId: repo._id,
     });
@@ -1804,8 +1804,8 @@ export const commitAndPushToGitRepoAction = async ({
     }
     const errorMessage = getErrorMessage(err);
 
-    trackSegmentEvent(SegmentEvent.vcsAction, {
-      ...vcsSegmentEventProperties('git', 'push', errorMessage),
+    trackAnalyticsEvent(AnalyticsEvent.vcsAction, {
+      ...vcsEventProperties('git', 'push', errorMessage),
       providerName,
       repoId: repo._id,
     });
@@ -1846,8 +1846,8 @@ export const createNewGitBranchAction = async ({
       providerName = credentials.provider;
     }
     await GitVCS.checkout(branch);
-    trackSegmentEvent(SegmentEvent.vcsAction, {
-      ...vcsSegmentEventProperties('git', 'create_branch'),
+    trackAnalyticsEvent(AnalyticsEvent.vcsAction, {
+      ...vcsEventProperties('git', 'create_branch'),
       providerName,
       repoId: gitRepository._id,
     });
@@ -2021,8 +2021,8 @@ export const mergeGitBranch = async ({
     await repoFileWatcherRegistry.importAllFiles(gitRepoId);
     clearConflictSuppression(gitRepository._id);
 
-    trackSegmentEvent(SegmentEvent.vcsAction, {
-      ...vcsSegmentEventProperties('git', 'merge_branch'),
+    trackAnalyticsEvent(AnalyticsEvent.vcsAction, {
+      ...vcsEventProperties('git', 'merge_branch'),
       providerName,
       repoId: gitRepository._id,
     });
@@ -2050,8 +2050,8 @@ export const mergeGitBranch = async ({
       errorMessage = `${err.message}, ${err.data.response}`;
     }
 
-    trackSegmentEvent(SegmentEvent.vcsAction, {
-      ...vcsSegmentEventProperties('git', 'merge_branch', errorMessage),
+    trackAnalyticsEvent(AnalyticsEvent.vcsAction, {
+      ...vcsEventProperties('git', 'merge_branch', errorMessage),
       providerName,
       repoId: gitRepository._id,
     });
@@ -2086,8 +2086,8 @@ export const deleteGitBranchAction = async ({
       providerName = credentials.provider;
     }
 
-    trackSegmentEvent(SegmentEvent.vcsAction, {
-      ...vcsSegmentEventProperties('git', 'delete_branch'),
+    trackAnalyticsEvent(AnalyticsEvent.vcsAction, {
+      ...vcsEventProperties('git', 'delete_branch'),
       providerName,
       repoId: repo._id,
     });
@@ -2163,8 +2163,8 @@ export const pushToGitRemoteAction = async ({
     const bufferId = await database.bufferChanges();
     await GitVCS.push(gitRepository.credentialsId);
 
-    trackSegmentEvent(SegmentEvent.vcsAction, {
-      ...vcsSegmentEventProperties('git', force ? 'force_push' : 'push'),
+    trackAnalyticsEvent(AnalyticsEvent.vcsAction, {
+      ...vcsEventProperties('git', force ? 'force_push' : 'push'),
       providerName,
       repoId: gitRepository._id,
     });
@@ -2208,8 +2208,8 @@ export const pushToGitRemoteAction = async ({
     }
     const errorMessage = getErrorMessage(err);
 
-    trackSegmentEvent(SegmentEvent.vcsAction, {
-      ...vcsSegmentEventProperties('git', 'push', errorMessage),
+    trackAnalyticsEvent(AnalyticsEvent.vcsAction, {
+      ...vcsEventProperties('git', 'push', errorMessage),
       providerName,
       repoId: gitRepository._id,
     });
@@ -2277,8 +2277,8 @@ export async function pullFromGitRemote({ projectId, workspaceId }: { projectId:
     await repoFileWatcherRegistry.importAllFiles(gitRepository._id);
     clearConflictSuppression(repoId);
 
-    trackSegmentEvent(SegmentEvent.vcsAction, {
-      ...vcsSegmentEventProperties('git', 'pull'),
+    trackAnalyticsEvent(AnalyticsEvent.vcsAction, {
+      ...vcsEventProperties('git', 'pull'),
       providerName: credentials.provider,
       repoId: gitRepository._id,
     });
@@ -2330,8 +2330,8 @@ export async function pullFromGitRemote({ projectId, workspaceId }: { projectId:
       providerName = credentials.provider;
     }
 
-    trackSegmentEvent(SegmentEvent.vcsAction, {
-      ...vcsSegmentEventProperties('git', 'pull', errorMessage),
+    trackAnalyticsEvent(AnalyticsEvent.vcsAction, {
+      ...vcsEventProperties('git', 'pull', errorMessage),
       providerName,
       repoId: gitRepository._id,
     });
@@ -2788,9 +2788,9 @@ async function completeSignInToGitProvider({
     }
 
     if (isEditing) {
-      trackSegmentEvent(SegmentEvent.gitAuthenticationUpdated, { provider });
+      trackAnalyticsEvent(AnalyticsEvent.gitAuthenticationUpdated, { provider });
     } else {
-      trackSegmentEvent(SegmentEvent.gitAuthenticationCompleted, { provider });
+      trackAnalyticsEvent(AnalyticsEvent.gitAuthenticationCompleted, { provider });
     }
 
     return {};
diff --git a/packages/insomnia/src/main/install-plugin.ts b/packages/insomnia/src/main/install-plugin.ts
index f9f5d53732..cea45872d0 100644
--- a/packages/insomnia/src/main/install-plugin.ts
+++ b/packages/insomnia/src/main/install-plugin.ts
@@ -7,7 +7,7 @@ import { promisify } from 'node:util';
 import { app, net } from 'electron';
 
 import { services } from '~/insomnia-data';
-import { SegmentEvent, trackSegmentEvent } from '~/main/analytics';
+import { AnalyticsEvent, trackAnalyticsEvent } from '~/main/analytics';
 
 import { isDevelopment } from '../common/constants';
 import { validatePluginName } from '../utils/plugin';
@@ -160,7 +160,7 @@ export default async function installPlugin(pluginName: string, allowScopedPacka
         }),
     );
 
-    trackSegmentEvent(SegmentEvent.installPlugin, {
+    trackAnalyticsEvent(AnalyticsEvent.installPlugin, {
       pluginName: moduleName,
       pluginVersion: info.version,
     });
diff --git a/packages/insomnia/src/main/ipc/electron.ts b/packages/insomnia/src/main/ipc/electron.ts
index e3c8344e29..64cd849ef5 100644
--- a/packages/insomnia/src/main/ipc/electron.ts
+++ b/packages/insomnia/src/main/ipc/electron.ts
@@ -192,7 +192,7 @@ export type MainOnChannels =
   | 'socketIO.event.on'
   | 'startExecution'
   | 'trackPageView'
-  | 'trackSegmentEvent'
+  | 'trackAnalyticsEvent'
   | 'updateLatestStepName'
   | 'webSocket.close'
   | 'webSocket.closeAll'
diff --git a/packages/insomnia/src/main/ipc/main.ts b/packages/insomnia/src/main/ipc/main.ts
index e32d45ae6e..bbc0f302b7 100644
--- a/packages/insomnia/src/main/ipc/main.ts
+++ b/packages/insomnia/src/main/ipc/main.ts
@@ -37,8 +37,8 @@ import type {
 
 import type { HiddenBrowserWindowBridgeAPI } from '../../entry.hidden-window';
 import type { PluginTemplateTag, RenderedRequest } from '../../templating/types';
-import type { SegmentEvent } from '../analytics';
-import { setCurrentOrganizationId, trackPageView, trackSegmentEvent } from '../analytics';
+import type { AnalyticsEvent } from '../analytics';
+import { setCurrentOrganizationId, trackAnalyticsEvent, trackPageView } from '../analytics';
 import {
   authorizeUserInDefaultBrowser,
   cancelAuthorizationInDefaultBrowser,
@@ -186,7 +186,7 @@ export interface RendererToMainBridgeAPI {
   secretStorage: secretStorageBridgeAPI;
   electronStorage: electronStorageBridgeAPI;
   sync: SyncBridgeAPI;
-  trackSegmentEvent: (options: { event: string; properties?: Record<string, unknown> }) => void;
+  trackAnalyticsEvent: (options: { event: string; properties?: Record<string, unknown> }) => void;
   trackPageView: (options: { name: string }) => void;
   setCurrentOrganizationId: (organizationId: string | undefined) => void;
   showNunjucksContextMenu: (options: {
@@ -413,8 +413,8 @@ export function registerMainHandlers() {
     cancelCurlRequest(requestId);
   });
 
-  ipcMainOn('trackSegmentEvent', (_, options: { event: SegmentEvent; properties?: Record<string, unknown> }): void => {
-    trackSegmentEvent(options.event, options.properties);
+  ipcMainOn('trackAnalyticsEvent', (_, options: { event: AnalyticsEvent; properties?: Record<string, unknown> }): void => {
+    trackAnalyticsEvent(options.event, options.properties);
   });
   ipcMainOn('trackPageView', (_, options: { name: string }): void => {
     trackPageView(options.name);
diff --git a/packages/insomnia/src/main/llm-config-service.ts b/packages/insomnia/src/main/llm-config-service.ts
index 42d7f8f4ce..1e17a800a7 100644
--- a/packages/insomnia/src/main/llm-config-service.ts
+++ b/packages/insomnia/src/main/llm-config-service.ts
@@ -4,7 +4,7 @@ import { app } from 'electron';
 
 import { LLM_BACKENDS } from '~/common/constants';
 import { services } from '~/insomnia-data';
-import { SegmentEvent, trackSegmentEvent } from '~/main/analytics';
+import { AnalyticsEvent, trackAnalyticsEvent } from '~/main/analytics';
 import { ipcMainHandle } from '~/main/ipc/electron';
 
 const LLM_PLUGIN_NAME = 'insomnia-llm';
@@ -123,7 +123,7 @@ export const getAIFeatureEnabled = async (feature: AIFeatureNames): Promise<bool
 export const setAIFeatureEnabled = async (feature: AIFeatureNames, enabled: boolean): Promise<void> => {
   await services.pluginData.upsertByKey(LLM_PLUGIN_NAME, `feature.${feature}`, String(enabled));
 
-  trackSegmentEvent(enabled ? SegmentEvent.aiFeatureEnabled : SegmentEvent.aiFeatureDisabled, {
+  trackAnalyticsEvent(enabled ? AnalyticsEvent.aiFeatureEnabled : AnalyticsEvent.aiFeatureDisabled, {
     feature: feature,
     set_for: 'user',
   });
diff --git a/packages/insomnia/src/main/mcp/client-requests.ts b/packages/insomnia/src/main/mcp/client-requests.ts
index 4b3f6093d9..24d09d9777 100644
--- a/packages/insomnia/src/main/mcp/client-requests.ts
+++ b/packages/insomnia/src/main/mcp/client-requests.ts
@@ -11,7 +11,7 @@ import {
 } from '@modelcontextprotocol/sdk/types.js';
 
 import { METHOD_SUBSCRIBE_RESOURCE, METHOD_UNSUBSCRIBE_RESOURCE } from '~/common/mcp-utils';
-import { SegmentEvent, trackSegmentEvent } from '~/main/analytics';
+import { AnalyticsEvent, trackAnalyticsEvent } from '~/main/analytics';
 import { getActiveMcpClient, getReadyActiveMcpConnectionContext, writeEventLogAndNotify } from '~/main/mcp/common';
 import type { CommonMcpOptions, McpMessageEventWithoutBase } from '~/main/mcp/types';
 
@@ -29,7 +29,7 @@ export const callTool = async (options: CommonMcpOptions & CallToolRequest['para
   const mcpClient = getActiveMcpClient(requestId);
   if (mcpClient) {
     const response = await mcpClient.callTool(params, CompatibilityCallToolResultSchema);
-    trackSegmentEvent(SegmentEvent.mcpToolCalled);
+    trackAnalyticsEvent(AnalyticsEvent.mcpToolCalled);
     return response.content;
   }
   return null;
@@ -49,7 +49,7 @@ export const getPrompt = async (options: CommonMcpOptions & GetPromptRequest['pa
   const mcpClient = getActiveMcpClient(options.requestId);
   if (mcpClient) {
     const prompt = await mcpClient.getPrompt(params);
-    trackSegmentEvent(SegmentEvent.mcpPromptCalled);
+    trackAnalyticsEvent(AnalyticsEvent.mcpPromptCalled);
     return prompt;
   }
   return null;
@@ -80,7 +80,7 @@ export const readResource = async (options: CommonMcpOptions & ReadResourceReque
   const mcpClient = getActiveMcpClient(requestId);
   if (mcpClient) {
     const resource = await mcpClient.readResource(params);
-    trackSegmentEvent(SegmentEvent.mcpResourceRead);
+    trackAnalyticsEvent(AnalyticsEvent.mcpResourceRead);
     return resource;
   }
   return null;
diff --git a/packages/insomnia/src/main/network/mcp.ts b/packages/insomnia/src/main/network/mcp.ts
index 28378a696d..c17dfbf78c 100644
--- a/packages/insomnia/src/main/network/mcp.ts
+++ b/packages/insomnia/src/main/network/mcp.ts
@@ -21,7 +21,7 @@ import electron from 'electron';
 import { getAppVersion, getProductName, REALTIME_EVENTS_CHANNELS } from '~/common/constants';
 import { getMcpMethodFromMessage, METHOD_NOTIFICATION_CANCELLED } from '~/common/mcp-utils';
 import { models, services } from '~/insomnia-data';
-import { SegmentEvent, trackSegmentEvent } from '~/main/analytics';
+import { AnalyticsEvent, trackAnalyticsEvent } from '~/main/analytics';
 import {
   callTool,
   getPrompt,
@@ -257,7 +257,7 @@ const createTransportAndConnect = async (context: ConnectionContext, mcpClient:
   }
   const authDisabled = 'disabled' in mcpRequest.authentication && mcpRequest.authentication.disabled;
   const isFirstConnection = !mcpRequest.connected;
-  trackSegmentEvent(SegmentEvent.mcpClientConnected, {
+  trackAnalyticsEvent(AnalyticsEvent.mcpClientConnected, {
     transportType: connectionOptions.transportType,
     firstTime: isFirstConnection,
     ...(connectionOptions.transportType === models.mcpRequest.TRANSPORT_TYPES.HTTP
@@ -455,7 +455,7 @@ const closeMcpConnection = async (options: CommonMcpOptions) => {
     // Execute clear resource subscription in main process rather than UI to make sure closeAllMcpConnections method will clear subscriptions
     await services.mcpRequest.clearResourceSubscriptions(requestId);
   }
-  trackSegmentEvent(SegmentEvent.mcpClientDisconnected);
+  trackAnalyticsEvent(AnalyticsEvent.mcpClientDisconnected);
 };
 
 const closeAllMcpConnections = () => {
diff --git a/packages/insomnia/src/root.tsx b/packages/insomnia/src/root.tsx
index 9480e41b24..6561671d0f 100644
--- a/packages/insomnia/src/root.tsx
+++ b/packages/insomnia/src/root.tsx
@@ -35,7 +35,7 @@ import {
   GIT_PROVIDER_COMPLETE_SIGN_IN_FETCHER_KEY,
   useGitProviderCompleteSignInFetcher,
 } from '~/routes/git-credentials.complete-sign-in';
-import { PENDING_IMPORT_ATTRIBUTION_KEY, SegmentEvent, trackImportEvent } from '~/ui/analytics';
+import { AnalyticsEvent, PENDING_IMPORT_ATTRIBUTION_KEY, trackImportEvent } from '~/ui/analytics';
 import { getLoginUrl } from '~/ui/auth-session-provider.client';
 import { CopyButton } from '~/ui/components/base/copy-button';
 import { Link } from '~/ui/components/base/link';
@@ -391,10 +391,10 @@ const Root = () => {
         if (!userSession.id) {
           window.sessionStorage.setItem('pendingDeepLinkAfterAuthorize', url);
           window.localStorage.setItem('logoutMessage', 'Please log in to import this resource.');
-          trackImportEvent(SegmentEvent.importLoginRequired);
+          trackImportEvent(AnalyticsEvent.importLoginRequired);
           return navigate(href('/auth/login'));
         }
-        trackImportEvent(SegmentEvent.importStarted, { source: 'import-url' });
+        trackImportEvent(AnalyticsEvent.importStarted, { source: 'import-url' });
 
         if (params.uri) {
           return setImportObject({
@@ -640,7 +640,7 @@ const Root = () => {
     if (pendingDeepLink && organizationId && organizationId !== models.organization.SCRATCHPAD_ORGANIZATION_ID) {
       window.sessionStorage.removeItem('pendingDeepLinkAfterAuthorize');
       window.sessionStorage.setItem('suppressWelcomeModals', 'true');
-      trackImportEvent(SegmentEvent.importResumedAfterLogin);
+      trackImportEvent(AnalyticsEvent.importResumedAfterLogin);
       window.main.openDeepLink(pendingDeepLink);
     }
   }, [organizationId]);
diff --git a/packages/insomnia/src/routes/ai.generate-commit-messages.tsx b/packages/insomnia/src/routes/ai.generate-commit-messages.tsx
index 1264f0c071..2db596ad68 100644
--- a/packages/insomnia/src/routes/ai.generate-commit-messages.tsx
+++ b/packages/insomnia/src/routes/ai.generate-commit-messages.tsx
@@ -1,6 +1,6 @@
 import { href } from 'react-router';
 
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { showToast } from '~/ui/components/toast-notification';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -38,8 +38,8 @@ export async function clientAction(args: Route.ClientActionArgs) {
         .join('\n'),
     });
 
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.recommendCommitsGenerated,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.recommendCommitsGenerated,
       properties: {
         file_count: commits?.map(commit => commit.files?.length || 0)?.reduce((a, b) => a + b, 0),
         group_count: commits?.length || 0,
diff --git a/packages/insomnia/src/routes/auth.authorize.tsx b/packages/insomnia/src/routes/auth.authorize.tsx
index e4e6f7255e..d15f20a581 100644
--- a/packages/insomnia/src/routes/auth.authorize.tsx
+++ b/packages/insomnia/src/routes/auth.authorize.tsx
@@ -4,7 +4,7 @@ import { Button, Heading } from 'react-aria-components';
 import { href, redirect, useFetchers, useNavigate } from 'react-router';
 
 import { services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { getLoginUrl, submitAuthCode } from '~/ui/auth-session-provider.client';
 import { Icon } from '~/ui/components/icon';
 import { validateVaultKey } from '~/ui/vault-key.client';
@@ -32,8 +32,8 @@ export async function clientAction({ request }: Route.ClientActionArgs) {
     };
   }
   console.log('Login successful');
-  window.main.trackSegmentEvent({
-    event: SegmentEvent.loginSuccess,
+  window.main.trackAnalyticsEvent({
+    event: AnalyticsEvent.loginSuccess,
   });
   window.localStorage.setItem('hasUserLoggedInBefore', 'true');
   const userSession = await services.userSession.getOrCreate();
diff --git a/packages/insomnia/src/routes/auth.login.tsx b/packages/insomnia/src/routes/auth.login.tsx
index fbd5439ca9..ad5651f5cf 100644
--- a/packages/insomnia/src/routes/auth.login.tsx
+++ b/packages/insomnia/src/routes/auth.login.tsx
@@ -3,7 +3,7 @@ import { Button } from 'react-aria-components';
 import { href, redirect, useNavigate } from 'react-router';
 
 import { models } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { getLoginUrl } from '~/ui/auth-session-provider.client';
 import { Icon } from '~/ui/components/icon';
 import { Tooltip } from '~/ui/components/tooltip';
@@ -152,8 +152,8 @@ const Component = () => {
 
         <Button
           onPress={() => {
-            window.main.trackSegmentEvent({
-              event: SegmentEvent.selectScratchpad,
+            window.main.trackAnalyticsEvent({
+              event: AnalyticsEvent.selectScratchpad,
             });
             navigate(
               href('/organization/:organizationId/project/:projectId/workspace/:workspaceId/debug', {
diff --git a/packages/insomnia/src/routes/import.scan.tsx b/packages/insomnia/src/routes/import.scan.tsx
index 8d7dae62bf..d59d2c9b06 100644
--- a/packages/insomnia/src/routes/import.scan.tsx
+++ b/packages/insomnia/src/routes/import.scan.tsx
@@ -9,7 +9,7 @@ import {
   scanResources,
 } from '~/common/import';
 import type { ImportEntry } from '~/main/importers/entities';
-import { SegmentEvent, trackImportEvent } from '~/ui/analytics';
+import { AnalyticsEvent, trackImportEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -27,7 +27,7 @@ export const scanImportResources = async (data: {
   invariant(typeof source === 'string', 'Source is required.');
   invariant(IMPORT_SOURCE_TYPES.includes(source), 'Unsupported import type');
 
-  trackImportEvent(SegmentEvent.importScanned, { source });
+  trackImportEvent(AnalyticsEvent.importScanned, { source });
 
   const contentList: ImportEntry[] = [];
 
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 a3d93541a5..724421afd7 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx
@@ -51,7 +51,7 @@ import { useOrganizationLoaderData } from '~/routes/organization';
 import { useInsomniaSyncPullRemoteFileActionFetcher } from '~/routes/organization.$organizationId.insomnia-sync.pull-remote-file';
 import { useWorkspaceNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.new';
 import { useStorageRulesLoaderFetcher } from '~/routes/organization.$organizationId.storage-rules';
-import { SegmentEvent, trackOnceDaily } from '~/ui/analytics';
+import { AnalyticsEvent, trackOnceDaily } from '~/ui/analytics';
 import { AvatarGroup } from '~/ui/components/avatar';
 import { CloudSyncProjectBar } from '~/ui/components/dropdowns/cloud-sync-project-bar';
 import { GitProjectSyncDropdown } from '~/ui/components/dropdowns/git-project-sync-dropdown';
@@ -970,7 +970,7 @@ const Component = () => {
                       onChange={filter => {
                         setWorkspaceListFilter(filter);
                         if (filter.trim() !== '') {
-                          trackOnceDaily(SegmentEvent.homepageFiltered);
+                          trackOnceDaily(AnalyticsEvent.homepageFiltered);
                         }
                       }}
                     >
@@ -1066,8 +1066,8 @@ const Component = () => {
 
                     <Button
                       onPress={() => {
-                        window.main.trackSegmentEvent({
-                          event: SegmentEvent.importStarted,
+                        window.main.trackAnalyticsEvent({
+                          event: AnalyticsEvent.importStarted,
                           properties: {
                             source: 'project',
                           },
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 a3680cd0bd..2f34b2def8 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx
@@ -6,7 +6,7 @@ import { projectLock } from '~/common/project';
 import type { WorkspaceMeta } from '~/insomnia-data';
 import { models, services } from '~/insomnia-data';
 import { reportGitProjectCount } from '~/routes/organization.$organizationId.project.new';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { showToast } from '~/ui/components/toast-notification';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
@@ -106,8 +106,8 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
           sessionId,
         });
 
-        window.main.trackSegmentEvent({
-          event: SegmentEvent.projectUpdated,
+        window.main.trackAnalyticsEvent({
+          event: AnalyticsEvent.projectUpdated,
           properties: {
             storage: 'local',
           },
@@ -158,8 +158,8 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
           name,
         });
 
-        window.main.trackSegmentEvent({
-          event: SegmentEvent.projectUpdated,
+        window.main.trackAnalyticsEvent({
+          event: AnalyticsEvent.projectUpdated,
           properties: {
             storage: 'remote',
           },
@@ -222,8 +222,8 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
             sessionId,
           });
 
-          window.main.trackSegmentEvent({
-            event: SegmentEvent.projectUpdated,
+          window.main.trackAnalyticsEvent({
+            event: AnalyticsEvent.projectUpdated,
             properties: {
               storage: 'git',
             },
@@ -376,8 +376,8 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
     // local project rename
     await services.project.update(project, { name });
 
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.projectUpdated,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.projectUpdated,
       properties: {
         storage: 'local',
       },
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx
index 447e19478f..df77b3de4f 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx
@@ -27,7 +27,7 @@ import {
   tryToInterpolateRequest,
   tryToTransformRequestWithPlugins,
 } from '~/network/network';
-import { type ImportAttribution, importAttributionKey, SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent, type ImportAttribution, importAttributionKey } from '~/ui/analytics';
 import { parseGraphQLReqeustBody } from '~/utils/graph-ql';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
@@ -369,8 +369,8 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
           const allPreScripts = docsWithScripts.map(doc => doc.preRequestScript).filter((s): s is string => !!s);
           const allPostScripts = docsWithScripts.map(doc => doc.afterResponseScript).filter((s): s is string => !!s);
 
-          window.main.trackSegmentEvent({
-            event: SegmentEvent.requestExecuted,
+          window.main.trackAnalyticsEvent({
+            event: AnalyticsEvent.requestExecuted,
             properties: {
               preferredHttpVersion: settings.preferredHttpVersion,
               // @ts-expect-error -- who cares
@@ -397,8 +397,8 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
           if (jsonImportAttribution) {
             try {
               const importAttribution = JSON.parse(jsonImportAttribution) as ImportAttribution;
-              window.main.trackSegmentEvent({
-                event: SegmentEvent.importedRequestFirstSend,
+              window.main.trackAnalyticsEvent({
+                event: AnalyticsEvent.importedRequestFirstSend,
                 properties: {
                   ...importAttribution,
                   protocol: activeRequest.type,
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update.tsx
index ce8aec6de8..a0df5808cc 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update.tsx
@@ -2,7 +2,7 @@ import { href } from 'react-router';
 
 import type { WebSocketRequest } from '~/insomnia-data';
 import { models, services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { updateMimeType } from '~/ui/components/dropdowns/content-type-dropdown';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
@@ -45,8 +45,8 @@ export async function clientAction({ params, request }: Route.ClientActionArgs)
   await services.helpers.updateRequest(req, patch);
 
   if (req.name !== patch.name) {
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.requestRenamed,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.requestRenamed,
     });
   }
 
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.delete.tsx
index 5b2bf98884..d4ade81ac0 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.delete.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.delete.tsx
@@ -1,7 +1,7 @@
 import { href, redirect } from 'react-router';
 
 import { services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -19,8 +19,8 @@ export async function clientAction({ params, request }: Route.ClientActionArgs)
   const workspaceMeta = await services.workspaceMeta.getByParentId(workspaceId);
   invariant(workspaceMeta, 'Workspace meta not found');
 
-  window.main.trackSegmentEvent({
-    event: SegmentEvent.requestDeleted,
+  window.main.trackAnalyticsEvent({
+    event: AnalyticsEvent.requestDeleted,
   });
 
   if (workspaceMeta.activeRequestId === id) {
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new.tsx
index 0ed5f15eac..85b35b76aa 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new.tsx
@@ -10,7 +10,7 @@ import {
 } from '~/common/constants';
 import type { Request, RequestBody, RequestParameter } from '~/insomnia-data';
 import { services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import type { CreateRequestType } from '~/ui/hooks/use-request';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
@@ -126,8 +126,8 @@ export async function clientAction({ params, request }: Route.ClientActionArgs)
 
   const certificates = await services.clientCertificate.findByParentId(workspaceId);
 
-  window.main.trackSegmentEvent({
-    event: SegmentEvent.requestCreated,
+  window.main.trackAnalyticsEvent({
+    event: AnalyticsEvent.requestCreated,
     properties: {
       requestType,
       protocol: requestType,
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 19e1952811..096ffff4fd 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
@@ -32,7 +32,7 @@ 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 { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { Dropdown, DropdownItem, ItemContent } from '~/ui/components/base/dropdown';
 import { ErrorBoundary } from '~/ui/components/error-boundary';
 import { HelpTooltip } from '~/ui/components/help-tooltip';
@@ -270,8 +270,8 @@ export const Runner: FC = () => {
     }
     setIsRunning(true);
 
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.collectionRunExecute,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.collectionRunExecute,
       properties: { plan: organizationData?.currentPlan?.type || 'scratchpad', iterations: iterationCount },
     });
 
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 7ae3f9361f..fdcb54b6fd 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
@@ -72,7 +72,7 @@ import Tutorial, {
   scratchPadTutorialList,
 } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tutorial.$panel';
 import { useToggleExpandAllActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.toggle-expand-all';
-import { SegmentEvent } from '~/ui/analytics';
+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';
@@ -848,8 +848,8 @@ const Debug = () => {
                   onOpenChange={isOpen => {
                     setIsEnvironmentPickerOpen(isOpen);
                     if (isOpen) {
-                      window.main.trackSegmentEvent({
-                        event: SegmentEvent.requestEnvironmentClicked,
+                      window.main.trackAnalyticsEvent({
+                        event: AnalyticsEvent.requestEnvironmentClicked,
                       });
                     }
                   }}
@@ -858,8 +858,8 @@ const Debug = () => {
               </div>
               <Button
                 onPress={() => {
-                  window.main.trackSegmentEvent({
-                    event: SegmentEvent.requestAddCookiesClicked,
+                  window.main.trackAnalyticsEvent({
+                    event: AnalyticsEvent.requestAddCookiesClicked,
                   });
                   setIsCookieModalOpen(true);
                 }}
@@ -873,8 +873,8 @@ const Debug = () => {
               </Button>
               <Button
                 onPress={() => {
-                  window.main.trackSegmentEvent({
-                    event: SegmentEvent.requestAddCertificatesClicked,
+                  window.main.trackAnalyticsEvent({
+                    event: AnalyticsEvent.requestAddCertificatesClicked,
                   });
                   setCertificatesModalOpen(true);
                 }}
@@ -901,8 +901,8 @@ const Debug = () => {
                   setFilter(value);
 
                   if (value.trim() !== '') {
-                    window.main.trackSegmentEvent({
-                      event: SegmentEvent.filterCreatedRequests,
+                    window.main.trackAnalyticsEvent({
+                      event: AnalyticsEvent.filterCreatedRequests,
                     });
                   }
                 }}
@@ -923,8 +923,8 @@ const Debug = () => {
                 selectedKey={sortOrder}
                 onSelectionChange={order => {
                   if (order) {
-                    window.main.trackSegmentEvent({
-                      event: SegmentEvent.requestListSortClicked,
+                    window.main.trackAnalyticsEvent({
+                      event: AnalyticsEvent.requestListSortClicked,
                     });
                     setSearchParams({
                       ...Object.fromEntries(searchParams.entries()),
@@ -976,8 +976,8 @@ const Debug = () => {
                   defaultSelected={allExpanded}
                   onChange={() => {
                     setAllExpanded(!allExpanded);
-                    window.main.trackSegmentEvent({
-                      event: SegmentEvent.requestListExpandCollapseClicked,
+                    window.main.trackAnalyticsEvent({
+                      event: AnalyticsEvent.requestListExpandCollapseClicked,
                     });
                     toggleExpandAllFetcher.submit({
                       organizationId,
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create.tsx
index 86690702eb..bd9e77d5f9 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create.tsx
@@ -1,7 +1,7 @@
 import { href } from 'react-router';
 
 import { EnvironmentType, services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -22,8 +22,8 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
     isPrivate,
   });
 
-  window.main.trackSegmentEvent({
-    event: SegmentEvent.environmentCreate,
+  window.main.trackAnalyticsEvent({
+    event: AnalyticsEvent.environmentCreate,
     properties: { type: isPrivate ? 'private' : 'global' },
   });
 
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 47c73a34df..759e0927e5 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
@@ -2,8 +2,8 @@ import { href } from 'react-router';
 
 import { database } from '~/common/database';
 import { services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
-import { getSyncItems, remoteCompareCache, vcsSegmentEventProperties } from '~/ui/sync-utils';
+import { AnalyticsEvent } from '~/ui/analytics';
+import { getSyncItems, remoteCompareCache, vcsEventProperties } from '~/ui/sync-utils';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -24,9 +24,9 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
       projectId: project._id,
     });
 
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.vcsAction,
-      properties: vcsSegmentEventProperties('remote', 'pull'),
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.vcsAction,
+      properties: vcsEventProperties('remote', 'pull'),
     });
     // This is to synchronize the local database with the branch changes
     await database.batchModifyDocs(delta);
@@ -38,9 +38,9 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
   } catch (err) {
     const errorMessage = err instanceof Error ? err.message : 'Unknown error while pulling from remote.';
 
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.vcsAction,
-      properties: vcsSegmentEventProperties('remote', 'pull', errorMessage),
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.vcsAction,
+      properties: vcsEventProperties('remote', 'pull', errorMessage),
     });
 
     return {
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 7d721799cb..5afad71e72 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
@@ -1,8 +1,8 @@
 import { href } from 'react-router';
 
 import { services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
-import { remoteCompareCache, vcsSegmentEventProperties } from '~/ui/sync-utils';
+import { AnalyticsEvent } from '~/ui/analytics';
+import { remoteCompareCache, vcsEventProperties } from '~/ui/sync-utils';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -21,9 +21,9 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
       teamProjectId: project.remoteId,
     });
 
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.vcsAction,
-      properties: vcsSegmentEventProperties('remote', 'push'),
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.vcsAction,
+      properties: vcsEventProperties('remote', 'push'),
     });
 
     delete remoteCompareCache[workspaceId];
@@ -34,9 +34,9 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
   } catch (err) {
     const errorMessage = err instanceof Error ? err.message : 'Unknown error while pushing to remote.';
 
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.vcsAction,
-      properties: vcsSegmentEventProperties('remote', 'push', errorMessage),
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.vcsAction,
+      properties: vcsEventProperties('remote', 'push', errorMessage),
     });
 
     return {
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx
index c9c3d681a4..ffbffa98c3 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx
@@ -2,7 +2,7 @@ import { href, redirect } from 'react-router';
 
 import { getMockServiceBinURL } from '~/common/constants';
 import { services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -62,8 +62,8 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
     });
   }
 
-  window.main.trackSegmentEvent({
-    event: SegmentEvent.generateCollectionFromMock,
+  window.main.trackAnalyticsEvent({
+    event: AnalyticsEvent.generateCollectionFromMock,
     properties: {
       count_requests: mockRoutes.length,
     },
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.delete.tsx
index da9b156f22..73f8dd7f64 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.delete.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.delete.tsx
@@ -1,7 +1,7 @@
 import { href, redirect } from 'react-router';
 
 import { services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -16,8 +16,8 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
 
   await services.mockRoute.remove(mockRoute);
 
-  window.main.trackSegmentEvent({
-    event: SegmentEvent.mockRouteDelete,
+  window.main.trackAnalyticsEvent({
+    event: AnalyticsEvent.mockRouteDelete,
   });
 
   if (isSelected) {
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx
index 313e46277a..9dce91fbbd 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx
@@ -22,7 +22,7 @@ import { models, services } from '~/insomnia-data';
 import { useRootLoaderData } from '~/root';
 import { useRequestNewMockSendActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new-mock-send';
 import { useMockRouteUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { CodeEditor } from '~/ui/components/.client/codemirror/code-editor';
 import { Dropdown, DropdownItem, ItemContent } from '~/ui/components/base/dropdown';
 import { MockResponseHeadersEditor } from '~/ui/components/editors/mock-response-headers-editor';
@@ -304,8 +304,8 @@ export const MockRouteRoute = () => {
                 noLint={mockRoute.body?.includes('{{') && mockRoute.body?.includes('}}')}
                 updateFilter={filter => {
                   if (filter) {
-                    window.main.trackSegmentEvent({
-                      event: SegmentEvent.filterCreatedResponseBody,
+                    window.main.trackAnalyticsEvent({
+                      event: AnalyticsEvent.filterCreatedResponseBody,
                     });
                   }
                 }}
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update.tsx
index 654f7dd1b4..b10e261730 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update.tsx
@@ -2,7 +2,7 @@ import { href } from 'react-router';
 
 import type { MockRoute } from '~/insomnia-data';
 import { services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -47,8 +47,8 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
 
     await services.mockRoute.update(mockRoute, patch);
 
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.mockRouteEdit,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.mockRouteEdit,
     });
 
     return null;
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.new.tsx
index 29c0572a06..74162888d0 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.new.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.new.tsx
@@ -2,7 +2,7 @@ import { href, redirect } from 'react-router';
 
 import type { MockRoute } from '~/insomnia-data';
 import { services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -57,8 +57,8 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
       delete patch.mockServerName;
       const mockRoute = await services.mockRoute.create({ ...patch, parentId: newMockServer._id });
 
-      window.main.trackSegmentEvent({
-        event: SegmentEvent.mockRouteCreate,
+      window.main.trackAnalyticsEvent({
+        event: AnalyticsEvent.mockRouteCreate,
       });
 
       return redirect(
@@ -78,8 +78,8 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
     invariant(mockServer, 'Mock server not found');
     const mockRoute = await services.mockRoute.create(patch);
 
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.mockRouteCreate,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.mockRouteCreate,
       properties: {
         source: 'from_response',
       },
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 4624c36a1f..a31bee0c7a 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
@@ -3,7 +3,7 @@ import { href, redirect } from 'react-router';
 
 import { importResourcesToWorkspace, scanResources } from '~/common/import';
 import { models, services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -53,8 +53,8 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
     workspaceId,
   });
 
-  window.main.trackSegmentEvent({
-    event: SegmentEvent.generateCollection,
+  window.main.trackAnalyticsEvent({
+    event: AnalyticsEvent.generateCollection,
     properties: {
       count_requests: scannedResources.map(r => r.requests?.length ?? 0).reduce((a, b) => a + b, 0),
     },
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 4c12f44d65..8768b18cb0 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
@@ -34,7 +34,7 @@ import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.pr
 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 { useStorageRulesLoaderFetcher } from '~/routes/organization.$organizationId.storage-rules';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor';
 import { DesignEmptyState } from '~/ui/components/design-empty-state';
 import { DocumentTab } from '~/ui/components/document-tab';
@@ -404,8 +404,8 @@ const Component = ({ params }: Route.ComponentProps) => {
       name: 'Toggle preview',
       icon: <Icon className="w-3" icon={isSpecPaneOpen ? 'eye' : 'eye-slash'} />,
       action: () => {
-        window.main.trackSegmentEvent({
-          event: SegmentEvent.designerPreviewToggled,
+        window.main.trackAnalyticsEvent({
+          event: AnalyticsEvent.designerPreviewToggled,
           properties: {
             status: !isSpecPaneOpen ? 'open' : 'collapsed',
           },
@@ -542,8 +542,8 @@ const Component = ({ params }: Route.ComponentProps) => {
             {isGenerateMockServersWithAIEnabled && (
               <Button
                 onPress={() => {
-                  window.main.trackSegmentEvent({
-                    event: SegmentEvent.designerGenerateMockClicked,
+                  window.main.trackAnalyticsEvent({
+                    event: AnalyticsEvent.designerGenerateMockClicked,
                   });
                   setNewMockServerModalOpen(true);
                 }}
@@ -560,8 +560,8 @@ const Component = ({ params }: Route.ComponentProps) => {
               className="flex h-full items-center justify-center gap-2 rounded-xs px-2 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)"
               onChange={value => {
                 setIsSpecPaneOpen(value);
-                window.main.trackSegmentEvent({
-                  event: SegmentEvent.designerPreviewToggled,
+                window.main.trackAnalyticsEvent({
+                  event: AnalyticsEvent.designerPreviewToggled,
                   properties: {
                     status: !value ? 'open' : 'collapsed',
                   },
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.delete.tsx
index 482d309f67..57c681344d 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.delete.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.delete.tsx
@@ -1,7 +1,7 @@
 import { href, redirect } from 'react-router';
 
 import { services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -16,7 +16,7 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
 
   await services.unitTestSuite.remove(unitTestSuite);
 
-  window.main.trackSegmentEvent({ event: SegmentEvent.testSuiteDelete });
+  window.main.trackAnalyticsEvent({ event: AnalyticsEvent.testSuiteDelete });
 
   return redirect(
     href(`/organization/:organizationId/project/:projectId/workspace/:workspaceId/test`, {
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests.tsx
index 95464ad447..d60c8c970b 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests.tsx
@@ -5,7 +5,7 @@ import { database } from '~/common/database';
 import type { UnitTest } from '~/insomnia-data';
 import { models, services } from '~/insomnia-data';
 import { getSendRequestCallback } from '~/network/unit-test-feature';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -52,7 +52,7 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
       results,
       parentId: workspaceId,
     });
-    window.main.trackSegmentEvent({ event: SegmentEvent.unitTestRunAll, properties: { organizationId, projectId } });
+    window.main.trackAnalyticsEvent({ event: AnalyticsEvent.unitTestRunAll, properties: { organizationId, projectId } });
 
     return redirect(
       href(
@@ -93,7 +93,7 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
       results,
       parentId: workspaceId,
     });
-    window.main.trackSegmentEvent({ event: SegmentEvent.unitTestRunAll, properties: { organizationId, projectId } });
+    window.main.trackAnalyticsEvent({ event: AnalyticsEvent.unitTestRunAll, properties: { organizationId, projectId } });
 
     return redirect(
       href(
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.delete.tsx
index 4f8fd9326f..cbf2d2376d 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.delete.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.delete.tsx
@@ -3,7 +3,7 @@ import { href } from 'react-router';
 import { database } from '~/common/database';
 import type { UnitTest } from '~/insomnia-data';
 import { models, services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -18,7 +18,7 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
   invariant(unitTest, 'Test not found');
 
   await services.unitTest.remove(unitTest);
-  window.main.trackSegmentEvent({ event: SegmentEvent.unitTestDelete });
+  window.main.trackAnalyticsEvent({ event: AnalyticsEvent.unitTestDelete });
 
   return null;
 }
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.run.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.run.tsx
index 1c86d3d7f4..adae5b57c6 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.run.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.run.tsx
@@ -5,7 +5,7 @@ import { database } from '~/common/database';
 import type { UnitTest } from '~/insomnia-data';
 import { models, services } from '~/insomnia-data';
 import { getSendRequestCallback } from '~/network/unit-test-feature';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -53,7 +53,7 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
       results,
       parentId: unitTest.parentId,
     });
-    window.main.trackSegmentEvent({ event: SegmentEvent.unitTestRun, properties: { organizationId, projectId } });
+    window.main.trackAnalyticsEvent({ event: AnalyticsEvent.unitTestRun, properties: { organizationId, projectId } });
 
     return redirect(
       href(
@@ -94,7 +94,7 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
       results,
       parentId: unitTest.parentId,
     });
-    window.main.trackSegmentEvent({ event: SegmentEvent.unitTestRun, properties: { organizationId, projectId } });
+    window.main.trackAnalyticsEvent({ event: AnalyticsEvent.unitTestRun, properties: { organizationId, projectId } });
 
     return redirect(
       href(
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.new.tsx
index cf4079068b..dc55f580b2 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.new.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.new.tsx
@@ -1,7 +1,7 @@
 import { href } from 'react-router';
 
 import { services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -22,7 +22,7 @@ expect(response1.status).to.equal(200);`,
     name,
   });
 
-  window.main.trackSegmentEvent({ event: SegmentEvent.unitTestCreate });
+  window.main.trackAnalyticsEvent({ event: AnalyticsEvent.unitTestCreate });
 
   return null;
 }
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.new.tsx
index 51ad1aa726..9ae6ab1e18 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.new.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.new.tsx
@@ -1,7 +1,7 @@
 import { href, redirect } from 'react-router';
 
 import { services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -19,7 +19,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
     name,
   });
 
-  window.main.trackSegmentEvent({ event: SegmentEvent.testSuiteCreate });
+  window.main.trackAnalyticsEvent({ event: AnalyticsEvent.testSuiteCreate });
 
   return redirect(
     href('/organization/:organizationId/project/:projectId/workspace/:workspaceId/test/test-suite/:testSuiteId', {
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 b719dc4818..328fa2c992 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
@@ -2,7 +2,7 @@ import { href, redirect } from 'react-router';
 
 import type { Project, Workspace } from '~/insomnia-data';
 import { models, services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -49,8 +49,8 @@ async function deleteWorkspace(workspace: Workspace | null, project: Project | n
   await deleteWorkspaceFromLocal(workspace);
 
   if (workspace.scope === 'mock-server') {
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.mockDelete,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.mockDelete,
     });
   }
 
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 095e281047..52dfd3f685 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
@@ -7,7 +7,7 @@ import type { MockRoute, MockServer, WorkspaceScope } from '~/insomnia-data';
 import { models, services } from '~/insomnia-data';
 import type { MockRouteData } from '~/plugins/types';
 import { safeToUseInsomniaFileNameWithExt } from '~/sync/git/insomnia-filename';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { showToast } from '~/ui/components/toast-notification';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
@@ -144,8 +144,8 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
         description: '',
       });
 
-      window.main.trackSegmentEvent({
-        event: SegmentEvent.mcpClientAdded,
+      window.main.trackAnalyticsEvent({
+        event: AnalyticsEvent.mcpClientAdded,
       });
     }
 
@@ -168,20 +168,20 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
       });
     }
 
-    let event = SegmentEvent.documentCreate;
+    let event = AnalyticsEvent.documentCreate;
     let environmentType: string | undefined;
 
     if (models.workspace.isCollection(workspace)) {
-      event = SegmentEvent.collectionCreate;
+      event = AnalyticsEvent.collectionCreate;
     } else if (models.workspace.isEnvironment(workspace)) {
-      event = SegmentEvent.environmentCreate;
+      event = AnalyticsEvent.environmentCreate;
       const environment = await services.environment.getById(workspace._id);
       environmentType = environment?.isPrivate ? 'private' : 'global';
     } else if (scope === 'mcp') {
-      event = SegmentEvent.mcpClientWorkspaceCreate;
+      event = AnalyticsEvent.mcpClientWorkspaceCreate;
     }
 
-    window.main.trackSegmentEvent({
+    window.main.trackAnalyticsEvent({
       event: event,
       ...(environmentType && {
         properties: {
@@ -212,7 +212,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
         })
       )._id;
 
-      window.main.trackSegmentEvent({ event: SegmentEvent.requestCreated, properties: { requestType: 'HTTP' } });
+      window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestCreated, properties: { requestType: 'HTTP' } });
 
       return redirect(
         href(`/organization/:organizationId/project/:projectId/workspace/:workspaceId/debug/request/:requestId`, {
@@ -351,8 +351,8 @@ async function createMockServer(
       });
     }
 
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.mockCreate,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.mockCreate,
       properties: {
         provider: (modelConfig && modelConfig.backend) || '',
         model: (modelConfig && modelConfig.model) || '',
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 a8c850c195..7e50a8e91f 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
@@ -2,7 +2,7 @@ import { href } from 'react-router';
 
 import { models, services } from '~/insomnia-data';
 import { safeToUseInsomniaFileNameWithExt } from '~/sync/git/insomnia-filename';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -53,8 +53,8 @@ export async function clientAction({ request }: Route.ClientActionArgs) {
       url: mockServerUrl,
     });
 
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.mockEdit,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.mockEdit,
     });
   }
 
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx
index 730a3951f7..4be7aff472 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx
@@ -6,7 +6,7 @@ import { isNotNullOrUndefined } from '~/common/misc';
 import { projectLock } from '~/common/project';
 import type { Project } from '~/insomnia-data';
 import { models, services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { showToast } from '~/ui/components/toast-notification';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
@@ -141,8 +141,8 @@ export const createProject = async (organizationId: string, newProjectData: Crea
     }
   }
 
-  window.main.trackSegmentEvent({
-    event: SegmentEvent.projectCreated,
+  window.main.trackAnalyticsEvent({
+    event: AnalyticsEvent.projectCreated,
     properties: {
       storage: newProjectData.storageType,
       git_provider,
diff --git a/packages/insomnia/src/routes/organization.tsx b/packages/insomnia/src/routes/organization.tsx
index 833c79c72b..c93389218f 100644
--- a/packages/insomnia/src/routes/organization.tsx
+++ b/packages/insomnia/src/routes/organization.tsx
@@ -21,7 +21,7 @@ import { useRootLoaderData } from '~/root';
 import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
 import { useSyncOrganizationsAndProjectsActionFetcher } from '~/routes/organization.sync-organizations-and-projects';
 import { useUntrackedProjectsLoaderFetcher } from '~/routes/untracked-projects';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { getLoginUrl } from '~/ui/auth-session-provider.client';
 import { CommandPalette } from '~/ui/components/command-palette';
 import { GitHubStarsButton } from '~/ui/components/github-stars-button';
@@ -417,8 +417,8 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
                     className="h-[10px] w-[10px] grow-0 gap-2 text-xs text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset"
                     onChange={value => {
                       setIsOrganizationSidebarOpen(value);
-                      window.main.trackSegmentEvent({
-                        event: SegmentEvent.statusbarLeftbarToggled,
+                      window.main.trackAnalyticsEvent({
+                        event: AnalyticsEvent.statusbarLeftbarToggled,
                         properties: {
                           status: value ? 'open' : 'collapsed',
                         },
@@ -461,8 +461,8 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
                     className="h-[10px] w-[10px] grow-0 rotate-90 gap-2 text-xs text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset"
                     onChange={flag => {
                       setIsMinimal(!flag);
-                      window.main.trackSegmentEvent({
-                        event: SegmentEvent.statusbarTopbarToggled,
+                      window.main.trackAnalyticsEvent({
+                        event: AnalyticsEvent.statusbarTopbarToggled,
                         properties: {
                           status: !flag ? 'minimal' : 'expanded',
                         },
@@ -525,8 +525,8 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
                       <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)"
                         onPress={() => {
-                          window.main.trackSegmentEvent({
-                            event: SegmentEvent.statusbarOrphanedProjectsClicked,
+                          window.main.trackAnalyticsEvent({
+                            event: AnalyticsEvent.statusbarOrphanedProjectsClicked,
                           });
                           showModal(SettingsModal, { tab: 'data' });
                         }}
@@ -541,8 +541,8 @@ const Component = ({ loaderData }: Route.ComponentProps) => {
                       <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)"
                         onPress={() => {
-                          window.main.trackSegmentEvent({
-                            event: SegmentEvent.statusbarOrphanedProjectsClicked,
+                          window.main.trackAnalyticsEvent({
+                            event: AnalyticsEvent.statusbarOrphanedProjectsClicked,
                           });
                           showModal(SettingsModal, { tab: 'data' });
                         }}
diff --git a/packages/insomnia/src/routes/settings.update.tsx b/packages/insomnia/src/routes/settings.update.tsx
index f90842db6b..d537f0c004 100644
--- a/packages/insomnia/src/routes/settings.update.tsx
+++ b/packages/insomnia/src/routes/settings.update.tsx
@@ -1,6 +1,6 @@
 import type { Settings } from '~/insomnia-data';
 import { services } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { createFetcherSubmitHook } from '~/utils/router';
 
 import type { Route } from './+types/settings.update';
@@ -8,7 +8,7 @@ import type { Route } from './+types/settings.update';
 export async function clientAction({ request }: Route.ClientActionArgs) {
   const patch = (await request.json()) as Partial<Settings>;
   if ('enableAnalytics' in patch && !patch.enableAnalytics) {
-    window.main.trackSegmentEvent({ event: SegmentEvent.analyticsDisabled });
+    window.main.trackAnalyticsEvent({ event: AnalyticsEvent.analyticsDisabled });
   }
   await services.settings.patch(patch);
   return null;
diff --git a/packages/insomnia/src/ui/analytics.ts b/packages/insomnia/src/ui/analytics.ts
index 4f38253fb0..715cbcbb58 100644
--- a/packages/insomnia/src/ui/analytics.ts
+++ b/packages/insomnia/src/ui/analytics.ts
@@ -1,150 +1,6 @@
-export enum SegmentEvent {
-  appStarted = 'App Started',
-  analyticsDisabled = 'Analytics Disabled',
-  collectionCreate = 'Collection Created',
-  dataExport = 'Data Exported',
-  exportCompleted = 'Export Completed',
-  dataImport = 'Data Imported',
-  importStarted = 'Import Started',
-  importScanned = 'Import Scanned',
-  importCompleted = 'Import Completed',
-  importLoginRequired = 'Import Login Required',
-  importResumedAfterLogin = 'Import Resumed After Login',
-  importedRequestFirstSend = 'Imported Request First Send',
-  documentCreate = 'Document Created',
-  mockCreateModalOpened = 'Mock Server Create Modal Opened',
-  mockCreate = 'Mock Created',
-  mockEdit = 'Mock Server Edited',
-  mockDelete = 'Mock Server Deleted',
-  mockRouteCreate = 'Mock Route Created',
-  mockRouteEdit = 'Mock Route Edited',
-  mockRouteDelete = 'Mock Route Deleted',
-  generateCollection = 'Generated Collection',
-  generateCollectionFromMock = 'Generate Collection From Mock',
-  environmentCreate = 'Environment Created',
-  loginSuccess = 'Login Success',
-  inviteTrigger = 'Invite Triggered From App',
-  exportAllCollections = 'Exported All Collections',
-  kongConnected = 'Kong Connected',
-  kongSync = 'Kong Synced',
-  requestBodyTypeSelect = 'Request Body Type Selected',
-  requestCreated = 'Request Created',
-  requestExecuted = 'Request Executed',
-  requestEdit = 'Request Edited',
-  requestDeleted = 'Request Deleted',
-  requestRenamed = 'Request Renamed',
-  requestUrlCopied = 'Request URL Copied',
-  collectionRunExecute = 'Collection Run Executed',
-  projectLocalCreate = 'Local Project Created',
-  projectLocalDelete = 'Local Project Deleted',
-  selectScratchpad = 'Scratchpad Selected at Login',
-  syncConflictResolutionStart = 'Sync Conflict Resolution Started',
-  syncConflictResolutionCompleteMine = 'Sync Conflict Resolution Completed Mine',
-  syncConflictResolutionCompleteTheirs = 'Sync Conflict Resolution Completed Theirs',
-  testSuiteCreate = 'Test Suite Created',
-  testSuiteDelete = 'Test Suite Deleted',
-  unitTestCreate = 'Unit Test Created',
-  unitTestDelete = 'Unit Test Deleted',
-  unitTestRun = 'Ran Individual Unit Test',
-  unitTestRunAll = 'Ran All Unit Tests',
-  vcsSyncStart = 'VCS Sync Started',
-  vcsSyncComplete = 'VCS Sync Completed',
-  vcsAction = 'VCS Action Executed',
-  buttonClick = 'Button Clicked',
-  inviteMember = 'Invite Sent',
-  inviteResent = 'Invite Resent',
-  inviteRevoked = 'Invite Revoked',
-  projectCreated = 'Project Created',
-  projectUpdated = 'Project Updated',
-  exportStarted = 'Export Started',
-  exportRequestsChosen = 'Export Requests Chosen',
-  recommendCommitsGenerated = 'Recommend Commits Generated',
-  recommendCommitsSaved = 'Recommend Commits Saved',
-  recommendCommitsCancelled = 'Recommend Commits Cancelled',
-  recommendCommitsClicked = 'Recommend Commits Clicked',
-  mcpClientWorkspaceCreate = 'MCP Client Workspace Created',
-  mcpClientAdded = 'MCP Client Added',
-  inviteNotPermitted = 'Invite Not Permitted',
-  responseToMockClicked = 'Response To Mock Clicked',
-  gitSyncButtonClicked = 'Git Sync Button Clicked',
-  preferencesViewed = 'Preferences Viewed',
-  copyAsCurl = 'Copied As cURL',
-  themeChanged = 'Theme Changed',
-  generateCodeClicked = 'Generate Code Clicked',
-  generateCodeLanguageChanged = 'Generate Code Language Changed',
-  filterCreatedHomePage = 'Filter Created From Home Page',
-  filterCreatedProjects = 'Filter Created Projects',
-  filterCreatedRequests = 'Filter Created Requests',
-  filterCreatedResponseBody = 'Filter Created Response Body',
+import type { AnalyticsEvent } from 'insomnia-analytics/events';
 
-  // INS-2120: Segment events to track common actions
-  homepageFiltered = 'homepage-filtered',
-  quickSearchOpenedByKeyboard = 'quick-search-opened-by-keyboard',
-  quickSearchOpenedByMouse = 'quick-search-opened-by-mouse',
-  statusbarLeftbarToggled = 'statusbar-leftbar-toggled',
-  statusbarTopbarToggled = 'statusbar-topbar-toggled',
-  statusbarOrphanedProjectsClicked = 'statusbar-orphaned-projects-clicked',
-  designerGenerateMockClicked = 'designer-generate-mock-clicked',
-  designerPreviewToggled = 'designer-preview-toggled',
-  requestEnvironmentClicked = 'request-environment-clicked',
-  requestAddCookiesClicked = 'request-add-cookies-clicked',
-  requestAddCertificatesClicked = 'request-add-certificates-clicked',
-  requestListSortClicked = 'request-list-sort-clicked',
-  requestListExpandCollapseClicked = 'request-list-expand-collapse-clicked',
-  requestParamsDescriptionToggled = 'request-params-description-toggled',
-  requestParamsImportFromURLClicked = 'request-params-import-from-URL-clicked',
-  requestParamsBulkEditToggled = 'request-params-bulk-edit-toggled',
-  responsePreviewJSONPathEntered = 'response-preview-jsonpath-entered',
-  requestBodyBeautifyClicked = 'request-body-beautify-clicked',
-  requestHeadersDescriptionToggled = 'request-headers-description-toggled',
-  requestHeadersBulkEditToggled = 'request-headers-bulk-edit-toggled',
-  requestScriptsPreScriptSnippetAdded = 'request-scripts-prescript-snippet-added',
-  requestScriptsPostScriptSnippetAdded = 'request-scripts-postscript-snippet-added',
-  responseHeadersCopyAllClicked = 'response-headers-copy-all-clicked',
-  responseCookiesManageCookiesClicked = 'response-cookies-manage-cookies-clicked',
-  requestOpenInNewTabClicked = 'request-open-in-new-tab-clicked',
-  requestListMenuPinClicked = 'request-list-menu-pin-clicked',
-  requestListMenuDuplicateClicked = 'request-list-menu-duplicate-clicked',
-  requestListMenuRenameClicked = 'request-list-menu-rename-clicked',
-  requestListMenuSettingsClicked = 'request-list-menu-settings-clicked',
-  requestSendMenuGenerateCodeClicked = 'request-send-menu-generate-code-clicked',
-  requestSendMenuSendAfterDelayClicked = 'request-send-menu-send-after-delay-clicked',
-  requestSendMenuRepeatAfterIntervalClicked = 'request-send-menu-repeat-after-interval-clicked',
-  requestSendMenuDownloadAfterSendClicked = 'request-send-menu-download-after-send-clicked',
-  requestSendMenuSendAndDownloadClicked = 'request-send-menu-send-and-download-clicked',
-  mcpListExpandCollapseClicked = 'mcp-list-expand-collapse-clicked',
-  mcpListFiltered = 'mcp-list-filtered',
-  mcpRequestParamsBeautifyClicked = 'mcp-request-params-beautify-clicked',
-  mcpRequestHeadersDescriptionToggled = 'mcp-request-headers-description-toggled',
-  mcpRequestRootsNotifyClicked = 'mcp-request-roots-notify-clicked',
-  mcpResponseHeadersCopyAllClicked = 'mcp-response-headers-copy-all-clicked',
-  kongKonnectPatValidated = 'kong-konnect-pat-validated',
-  kongKonnectSyncCompleted = 'kong-konnect-sync-completed',
-  emptyStateSendRequestClicked = 'empty-state-send-request-clicked',
-  emptyStateCreateDocumentClicked = 'empty-state-create-document-clicked',
-}
-
-type PushPull = 'push' | 'pull';
-type VCSAction =
-  | PushPull
-  | `force_${PushPull}`
-  | 'create_branch'
-  | 'merge_branch'
-  | 'delete_branch'
-  | 'checkout_branch'
-  | 'commit'
-  | 'stage_all'
-  | 'stage'
-  | 'unstage_all'
-  | 'unstage'
-  | 'rollback'
-  | 'rollback_all'
-  | 'update'
-  | 'setup'
-  | 'clone';
-export function vcsSegmentEventProperties(type: 'git', action: VCSAction, error?: string) {
-  return { type, action, error };
-}
+export { AnalyticsEvent } from 'insomnia-analytics/events';
 
 function getTodayDateString(): string {
   return new Date().toISOString().split('T')[0];
@@ -159,11 +15,11 @@ export function markTrackedToday(key: string): void {
   localStorage.setItem(key, getTodayDateString());
 }
 
-export function trackOnceDaily(event: SegmentEvent, properties?: Record<string, unknown>): void {
+export function trackOnceDaily(event: AnalyticsEvent, properties?: Record<string, unknown>): void {
   if (hasTrackedToday(event)) {
     return;
   }
-  window.main.trackSegmentEvent({ event, properties });
+  window.main.trackAnalyticsEvent({ event, properties });
   markTrackedToday(event);
 }
 
@@ -185,8 +41,8 @@ export function readPendingImportAttribution(): ImportAttribution {
   }
 }
 
-export function trackImportEvent(event: SegmentEvent, properties: Record<string, unknown> = {}): void {
-  window.main.trackSegmentEvent({
+export function trackImportEvent(event: AnalyticsEvent, properties: Record<string, unknown> = {}): void {
+  window.main.trackAnalyticsEvent({
     event,
     properties: { ...readPendingImportAttribution(), ...properties },
   });
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 48218acccf..11539254df 100644
--- a/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx
+++ b/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx
@@ -26,7 +26,7 @@ import { useRootLoaderData } from '~/root';
 import { getTagDefinitions } from '~/templating/index';
 import { type NunjucksParsedTag, type nunjucksTagContextMenuOptions } from '~/templating/types';
 import { extractNunjucksTagFromCoords } from '~/templating/utils';
-import { SegmentEvent, trackOnceDaily } from '~/ui/analytics';
+import { AnalyticsEvent, trackOnceDaily } from '~/ui/analytics';
 import { Icon } from '~/ui/components/icon';
 import { createKeybindingsHandler, useDocBodyKeyboardShortcuts } from '~/ui/components/keydown-binder';
 import { FilterHelpModal } from '~/ui/components/modals/filter-help-modal';
@@ -793,7 +793,7 @@ export const CodeEditor = memo(
                   defaultValue={filter || ''}
                   placeholder={mode?.includes('json') ? '$.store.books[*].author' : '/store/books/author'}
                   onFocus={() => {
-                    trackOnceDaily(SegmentEvent.responsePreviewJSONPathEntered);
+                    trackOnceDaily(AnalyticsEvent.responsePreviewJSONPathEntered);
                   }}
                   onKeyDown={createKeybindingsHandler({
                     Enter: () => {
diff --git a/packages/insomnia/src/ui/components/command-palette.tsx b/packages/insomnia/src/ui/components/command-palette.tsx
index fadd011e1d..efcfd2c501 100644
--- a/packages/insomnia/src/ui/components/command-palette.tsx
+++ b/packages/insomnia/src/ui/components/command-palette.tsx
@@ -28,7 +28,7 @@ import { useCommandsLoaderFetcher } from '~/routes/commands';
 import { useInsomniaSyncPullRemoteFileActionFetcher } from '~/routes/organization.$organizationId.insomnia-sync.pull-remote-file';
 import { useSetActiveEnvironmentFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active';
 import { useRemoteFilesLoaderFetcher } from '~/routes/remote-files';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { AvatarGroup } from '~/ui/components/avatar';
 import { Icon } from '~/ui/components/icon';
 import { useDocBodyKeyboardShortcuts } from '~/ui/components/keydown-binder';
@@ -49,8 +49,8 @@ export const CommandPalette = memo(function CommandPalette({ style = {} }: { sty
   useDocBodyKeyboardShortcuts({
     request_quickSwitch: () => {
       setIsOpen(true);
-      window.main.trackSegmentEvent({
-        event: SegmentEvent.quickSearchOpenedByKeyboard,
+      window.main.trackAnalyticsEvent({
+        event: AnalyticsEvent.quickSearchOpenedByKeyboard,
       });
     },
   });
@@ -62,8 +62,8 @@ export const CommandPalette = memo(function CommandPalette({ style = {} }: { sty
       onOpenChange={isOpen => {
         setIsOpen(isOpen);
         if (isOpen) {
-          window.main.trackSegmentEvent({
-            event: SegmentEvent.quickSearchOpenedByMouse,
+          window.main.trackAnalyticsEvent({
+            event: AnalyticsEvent.quickSearchOpenedByMouse,
           });
         }
       }}
diff --git a/packages/insomnia/src/ui/components/dropdowns/content-type-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/content-type-dropdown.tsx
index bb30438d9e..a00b171d64 100644
--- a/packages/insomnia/src/ui/components/dropdowns/content-type-dropdown.tsx
+++ b/packages/insomnia/src/ui/components/dropdowns/content-type-dropdown.tsx
@@ -34,7 +34,7 @@ import {
   useRequestLoaderData,
 } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId';
 import { deconstructQueryStringToParams } from '../../../utils/url/querystring';
-import { SegmentEvent } from '../../analytics';
+import { AnalyticsEvent } from '../../analytics';
 import { useRequestPatcher } from '../../hooks/use-request';
 import { Icon } from '../icon';
 import { showModal } from '../modals';
@@ -76,12 +76,12 @@ export const ContentTypeDropdown: FC = () => {
         addCancel: true,
         onConfirm: async () => {
           patchRequest(requestId, { body: { mimeType } });
-          window.main.trackSegmentEvent({ event: SegmentEvent.requestBodyTypeSelect, properties: { type: mimeType } });
+          window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestBodyTypeSelect, properties: { type: mimeType } });
         },
       });
     } else {
       patchRequest(requestId, { body: { mimeType } });
-      window.main.trackSegmentEvent({ event: SegmentEvent.requestBodyTypeSelect, properties: { type: mimeType } });
+      window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestBodyTypeSelect, properties: { type: mimeType } });
     }
   };
 
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 4c45c6d0e8..3d8db81ceb 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
@@ -24,7 +24,7 @@ import { useGitProjectRepoFetcher } from '~/routes/git.repo';
 import { useGitProjectStatusActionFetcher } from '~/routes/git.status';
 import { useStorageRulesLoaderFetcher } from '~/routes/organization.$organizationId.storage-rules';
 import { GitVCSOperationErrors } from '~/sync/git/git-vcs-operation-errors';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { ProjectModal } from '~/ui/components/modals/project-modal';
 import { showSettingsModal } from '~/ui/components/modals/settings-modal';
 import { useGitCredentials } from '~/ui/hooks/use-git-credentials';
@@ -664,8 +664,8 @@ export const GitProjectSyncDropdown: FC<Props> = ({ gitRepository, activeProject
             <Button
               onPress={() => {
                 setIsUpdateProjectModalOpen(true);
-                window.main.trackSegmentEvent({
-                  event: SegmentEvent.gitSyncButtonClicked,
+                window.main.trackAnalyticsEvent({
+                  event: AnalyticsEvent.gitSyncButtonClicked,
                 });
               }}
               className="flex h-[25px] items-center justify-center gap-2 rounded-md border border-solid border-(--hl-md) bg-(--color-surprise) px-4 py-2 text-sm font-semibold text-(--color-font-surprise) ring-1 ring-transparent transition-all hover:bg-(--color-surprise)/80 focus:ring-(--hl-md) focus:ring-inset aria-pressed:opacity-80"
diff --git a/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx
index c599d7648e..7c757aa191 100644
--- a/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx
+++ b/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx
@@ -16,7 +16,7 @@ import { useRootLoaderData } from '~/root';
 import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
 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 { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { useTabNavigate } from '~/ui/hooks/use-insomnia-tab';
 
 import { exportHarRequest } from '../../../common/har';
@@ -77,7 +77,7 @@ export const RequestActionsDropdown = ({
   const tabNavigate = useTabNavigate();
 
   const openInNewTab = async () => {
-    window.main.trackSegmentEvent({ event: SegmentEvent.requestOpenInNewTabClicked });
+    window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestOpenInNewTabClicked });
     tabNavigate(
       {
         organization: organizationId,
@@ -101,7 +101,7 @@ export const RequestActionsDropdown = ({
     if (!request) {
       return;
     }
-    window.main.trackSegmentEvent({ event: SegmentEvent.requestListMenuDuplicateClicked });
+    window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestListMenuDuplicateClicked });
 
     showModal(PromptModal, {
       title: 'Duplicate Request',
@@ -141,8 +141,8 @@ export const RequestActionsDropdown = ({
 
   const generateCode = () => {
     if (isRequest(request)) {
-      window.main.trackSegmentEvent({
-        event: SegmentEvent.generateCodeClicked,
+      window.main.trackAnalyticsEvent({
+        event: AnalyticsEvent.generateCodeClicked,
       });
 
       showModal(GenerateCodeModal, { request });
@@ -160,8 +160,8 @@ export const RequestActionsDropdown = ({
         window.clipboard.writeText(cmd);
       }
 
-      window.main.trackSegmentEvent({
-        event: SegmentEvent.copyAsCurl,
+      window.main.trackAnalyticsEvent({
+        event: AnalyticsEvent.copyAsCurl,
       });
     } catch (err) {
       showModal(AlertModal, {
@@ -172,7 +172,7 @@ export const RequestActionsDropdown = ({
   };
 
   const togglePin = () => {
-    window.main.trackSegmentEvent({ event: SegmentEvent.requestListMenuPinClicked });
+    window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestListMenuPinClicked });
     patchRequestMeta(request._id, { pinned: !isPinned });
   };
 
@@ -279,7 +279,7 @@ export const RequestActionsDropdown = ({
           id: 'Rename',
           name: 'Rename',
           action: () => {
-            window.main.trackSegmentEvent({ event: SegmentEvent.requestListMenuRenameClicked });
+            window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestListMenuRenameClicked });
             onRename();
           },
           icon: 'edit',
@@ -297,7 +297,7 @@ export const RequestActionsDropdown = ({
           icon: 'gear',
           hint: hotKeyRegistry.request_showSettings,
           action: () => {
-            window.main.trackSegmentEvent({ event: SegmentEvent.requestListMenuSettingsClicked });
+            window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestListMenuSettingsClicked });
             setIsSettingsModalOpen(true);
           },
         },
diff --git a/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx
index 8a5863a7ec..a09ad2556c 100644
--- a/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx
+++ b/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx
@@ -21,7 +21,7 @@ import { getDocumentActions } from '../../../plugins';
 import * as pluginApp from '../../../plugins/context/app';
 import * as pluginData from '../../../plugins/context/data';
 import * as pluginStore from '../../../plugins/context/store';
-import { SegmentEvent } from '../../analytics';
+import { AnalyticsEvent } from '../../analytics';
 import { useLoadingRecord } from '../../hooks/use-loading-record';
 import { Dropdown, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
 import { Icon } from '../icon';
@@ -178,8 +178,8 @@ export const WorkspaceCardDropdown: FC<Props> = props => {
                 label="Import"
                 icon="file-import"
                 onClick={() => {
-                  window.main.trackSegmentEvent({
-                    event: SegmentEvent.importStarted,
+                  window.main.trackAnalyticsEvent({
+                    event: AnalyticsEvent.importStarted,
                     properties: {
                       source: `${workspace.scope}-list`,
                     },
@@ -195,8 +195,8 @@ export const WorkspaceCardDropdown: FC<Props> = props => {
               label="Export"
               icon="file-export"
               onClick={() => {
-                window.main.trackSegmentEvent({
-                  event: SegmentEvent.exportStarted,
+                window.main.trackAnalyticsEvent({
+                  event: AnalyticsEvent.exportStarted,
                   properties: {
                     source: `${workspace.scope}-list`,
                   },
diff --git a/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx
index 29b3b2e774..0c68bf99c6 100644
--- a/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx
+++ b/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx
@@ -42,7 +42,7 @@ import * as pluginStore from '../../../plugins/context/store';
 import { useWorkspaceLoaderData } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
 import { useMockServerGenerateRequestCollectionActionFetcher } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection';
 import { invariant } from '../../../utils/invariant';
-import { SegmentEvent } from '../../analytics';
+import { AnalyticsEvent } from '../../analytics';
 import { DropdownHint } from '../base/dropdown/dropdown-hint';
 import { Icon } from '../icon';
 import { useDocBodyKeyboardShortcuts } from '../keydown-binder';
@@ -142,8 +142,8 @@ export const WorkspaceDropdown: FC<{}> = () => {
           name: 'Import',
           icon: <Icon icon="file-import" />,
           action: () => {
-            window.main.trackSegmentEvent({
-              event: SegmentEvent.importStarted,
+            window.main.trackAnalyticsEvent({
+              event: AnalyticsEvent.importStarted,
               properties: {
                 source: `scratchpad-${activeWorkspace.scope}-menu`,
               },
@@ -157,8 +157,8 @@ export const WorkspaceDropdown: FC<{}> = () => {
           name: 'Export',
           icon: <Icon icon="file-export" />,
           action: () => {
-            window.main.trackSegmentEvent({
-              event: SegmentEvent.exportStarted,
+            window.main.trackAnalyticsEvent({
+              event: AnalyticsEvent.exportStarted,
               properties: {
                 source: `scratchpad-${activeWorkspace.scope}-menu`,
               },
@@ -203,8 +203,8 @@ export const WorkspaceDropdown: FC<{}> = () => {
                 name: 'From File',
                 icon: <Icon icon="file-import" />,
                 action: () => {
-                  window.main.trackSegmentEvent({
-                    event: SegmentEvent.importStarted,
+                  window.main.trackAnalyticsEvent({
+                    event: AnalyticsEvent.importStarted,
                     properties: {
                       source: `${activeWorkspace.scope}-menu`,
                     },
@@ -271,8 +271,8 @@ export const WorkspaceDropdown: FC<{}> = () => {
           name: 'Export',
           icon: <Icon icon="file-export" />,
           action: () => {
-            window.main.trackSegmentEvent({
-              event: SegmentEvent.exportStarted,
+            window.main.trackAnalyticsEvent({
+              event: AnalyticsEvent.exportStarted,
               properties: {
                 source: `${activeWorkspace.scope}-menu`,
               },
diff --git a/packages/insomnia/src/ui/components/editors/body/raw-editor.tsx b/packages/insomnia/src/ui/components/editors/body/raw-editor.tsx
index ef22f9e3f8..b9fb8b9c77 100644
--- a/packages/insomnia/src/ui/components/editors/body/raw-editor.tsx
+++ b/packages/insomnia/src/ui/components/editors/body/raw-editor.tsx
@@ -2,7 +2,7 @@ import React, { type FC, Fragment } from 'react';
 
 import { CodeEditor } from '~/ui/components/.client/codemirror/code-editor';
 
-import { SegmentEvent } from '../../../../ui/analytics';
+import { AnalyticsEvent } from '../../../../ui/analytics';
 
 interface Props {
   onChange: (value: string) => void;
@@ -25,7 +25,7 @@ export const RawEditor: FC<Props> = ({ className, content, contentType, onChange
       mode={contentType}
       placeholder="..."
       onPrettify={() => {
-        window.main.trackSegmentEvent({ event: SegmentEvent.requestBodyBeautifyClicked });
+        window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestBodyBeautifyClicked });
       }}
     />
   </Fragment>
diff --git a/packages/insomnia/src/ui/components/github-stars-button.tsx b/packages/insomnia/src/ui/components/github-stars-button.tsx
index adcebb37f3..7f194326b6 100644
--- a/packages/insomnia/src/ui/components/github-stars-button.tsx
+++ b/packages/insomnia/src/ui/components/github-stars-button.tsx
@@ -3,7 +3,7 @@ import { Link } from 'react-aria-components';
 import * as reactUse from 'react-use';
 
 import { getGitHubRestApiUrl } from '../../common/constants';
-import { SegmentEvent } from '../analytics';
+import { AnalyticsEvent } from '../analytics';
 import { Icon } from './icon';
 
 const LOCALSTORAGE_GITHUB_STARS_KEY = 'insomnia:github-stars';
@@ -50,8 +50,8 @@ export const GitHubStarsButton = () => {
   });
 
   const starClick = useCallback(() => {
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.buttonClick,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.buttonClick,
       properties: {
         type: 'GitHub stars',
         action: 'clicked star',
@@ -60,8 +60,8 @@ export const GitHubStarsButton = () => {
   }, []);
 
   const counterClick = useCallback(() => {
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.buttonClick,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.buttonClick,
       properties: {
         type: 'GitHub stars',
         action: 'clicked stargazers',
diff --git a/packages/insomnia/src/ui/components/header-invite-button.tsx b/packages/insomnia/src/ui/components/header-invite-button.tsx
index 69911c6bc8..ea9074651a 100644
--- a/packages/insomnia/src/ui/components/header-invite-button.tsx
+++ b/packages/insomnia/src/ui/components/header-invite-button.tsx
@@ -5,7 +5,7 @@ import { Button, Heading, Link, Radio, RadioGroup } from 'react-aria-components'
 import { getCurrentSessionId } from '~/account/session';
 import { Modal } from '~/basic-components/modal';
 import { getAppWebsiteBaseURL } from '~/common/constants';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { Tooltip } from '~/ui/components/tooltip';
 
 import { Icon } from './icon';
@@ -109,8 +109,8 @@ const MissingSomeoneModal = ({ isOpen, onClose }: any) => {
   const [reason, setReason] = useState<string | null>(null);
   const handleClose = () => {
     if (reason) {
-      window.main.trackSegmentEvent({
-        event: SegmentEvent.inviteNotPermitted,
+      window.main.trackAnalyticsEvent({
+        event: AnalyticsEvent.inviteNotPermitted,
         properties: {
           collaboration_type: reason,
         },
diff --git a/packages/insomnia/src/ui/components/mcp/mcp-pane.tsx b/packages/insomnia/src/ui/components/mcp/mcp-pane.tsx
index 7266c5342c..3aae511c6b 100644
--- a/packages/insomnia/src/ui/components/mcp/mcp-pane.tsx
+++ b/packages/insomnia/src/ui/components/mcp/mcp-pane.tsx
@@ -36,7 +36,7 @@ import {
   type McpRequestLoaderData,
   useRequestLoaderData,
 } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId';
-import { SegmentEvent, trackOnceDaily } from '~/ui/analytics';
+import { AnalyticsEvent, trackOnceDaily } from '~/ui/analytics';
 import { McpActionsDropdown } from '~/ui/components/dropdowns/mcp-actions-dropdown';
 import { WorkspaceDropdown } from '~/ui/components/dropdowns/workspace-dropdown';
 import { WorkspaceSyncDropdown } from '~/ui/components/dropdowns/workspace-sync-dropdown';
@@ -446,7 +446,7 @@ export const McpPane = () => {
                 onChange={value => {
                   setFilter(value);
                   if (value) {
-                    trackOnceDaily(SegmentEvent.mcpListFiltered);
+                    trackOnceDaily(AnalyticsEvent.mcpListFiltered);
                   }
                 }}
               >
@@ -472,7 +472,7 @@ export const McpPane = () => {
                       setCollapsedPrimitives(['tools', 'resources', 'prompts']);
                     }
                     setAllExpanded(newState);
-                    window.main.trackSegmentEvent({ event: SegmentEvent.mcpListExpandCollapseClicked });
+                    window.main.trackAnalyticsEvent({ event: AnalyticsEvent.mcpListExpandCollapseClicked });
                   }}
                   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"
                 >
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 299a41be53..b6d92e042c 100644
--- a/packages/insomnia/src/ui/components/mcp/mcp-request-pane.tsx
+++ b/packages/insomnia/src/ui/components/mcp/mcp-request-pane.tsx
@@ -20,7 +20,7 @@ import {
   type McpRequestLoaderData,
   useRequestLoaderData,
 } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId';
-import { SegmentEvent } from '../../../ui/analytics';
+import { AnalyticsEvent } from '../../../ui/analytics';
 import { useRequestPatcher, useRequestPayloadPatcher } from '../../hooks/use-request';
 import { CodeEditor, type CodeEditorHandle } from '../.client/codemirror/code-editor';
 import { AuthWrapper } from '../editors/auth/auth-wrapper';
@@ -373,7 +373,7 @@ export const McpRequestPane: FC<Props> = ({
                         mode="json"
                         placeholder=""
                         onPrettify={() => {
-                          window.main.trackSegmentEvent({ event: SegmentEvent.mcpRequestParamsBeautifyClicked });
+                          window.main.trackAnalyticsEvent({ event: AnalyticsEvent.mcpRequestParamsBeautifyClicked });
                         }}
                       />
                     </div>
@@ -404,7 +404,7 @@ export const McpRequestPane: FC<Props> = ({
             isDisabled={!isDisconnected}
             requestType="McpRequest"
             onDescriptionToggle={() => {
-              window.main.trackSegmentEvent({ event: SegmentEvent.mcpRequestHeadersDescriptionToggled });
+              window.main.trackAnalyticsEvent({ event: AnalyticsEvent.mcpRequestHeadersDescriptionToggled });
             }}
           />
         </TabPanel>
diff --git a/packages/insomnia/src/ui/components/mcp/mcp-roots-panel.tsx b/packages/insomnia/src/ui/components/mcp/mcp-roots-panel.tsx
index fa3d49bccb..5aaea80e50 100644
--- a/packages/insomnia/src/ui/components/mcp/mcp-roots-panel.tsx
+++ b/packages/insomnia/src/ui/components/mcp/mcp-roots-panel.tsx
@@ -4,7 +4,7 @@ import { Button, Heading, ListBox, ListBoxItem, Toolbar } from 'react-aria-compo
 
 import type { McpRequest } from '~/insomnia-data';
 import type { McpReadyState } from '~/main/mcp/types';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { PromptButton } from '~/ui/components/base/prompt-button';
 import { useRequestPatcher } from '~/ui/hooks/use-request';
 
@@ -54,7 +54,7 @@ export const McpRootsPanel = ({ request, readyState }: McpRootsPanelProps) => {
           className="rounded-sm bg-(--color-surprise) px-(--padding-md) text-center text-(--color-font-surprise)"
           onClick={() => {
             window.main.mcp.notification.rootListChange({ requestId });
-            window.main.trackSegmentEvent({ event: SegmentEvent.mcpRequestRootsNotifyClicked });
+            window.main.trackAnalyticsEvent({ event: AnalyticsEvent.mcpRequestRootsNotifyClicked });
           }}
           isDisabled={!isConnected}
         >
diff --git a/packages/insomnia/src/ui/components/modals/export-requests-modal.tsx b/packages/insomnia/src/ui/components/modals/export-requests-modal.tsx
index 4e0c921ce9..13e7d22d7a 100644
--- a/packages/insomnia/src/ui/components/modals/export-requests-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/export-requests-modal.tsx
@@ -11,7 +11,7 @@ import {
   useWorkspaceLoaderFetcher,
   type WorkspaceLoaderData,
 } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
-import { SegmentEvent } from '../../analytics';
+import { AnalyticsEvent } from '../../analytics';
 import { Icon } from '../icon';
 import { getMethodShortHand } from '../tags/method-tag';
 
@@ -358,8 +358,8 @@ export const ExportRequestsModal = ({
                 <Button
                   onPress={() => {
                     if (state?.treeRoot) {
-                      window.main.trackSegmentEvent({
-                        event: SegmentEvent.exportRequestsChosen,
+                      window.main.trackAnalyticsEvent({
+                        event: AnalyticsEvent.exportRequestsChosen,
                         properties: {
                           totalRequests: state.treeRoot.totalRequests,
                           exported_requests: state.treeRoot.selectedRequests,
diff --git a/packages/insomnia/src/ui/components/modals/generate-code-modal.tsx b/packages/insomnia/src/ui/components/modals/generate-code-modal.tsx
index 51e8741293..aec2e05c2a 100644
--- a/packages/insomnia/src/ui/components/modals/generate-code-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/generate-code-modal.tsx
@@ -3,7 +3,7 @@ import { forwardRef, useCallback, useImperativeHandle, useRef, useState } from '
 import { Button } from 'react-aria-components';
 
 import type { Request } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor';
 
 import { exportHarWithRequest } from '../../../common/har';
@@ -94,8 +94,8 @@ export const GenerateCodeModal = forwardRef<GenerateCodeModalHandle, Props>((pro
         setSnippet(cmd);
       }
 
-      window.main.trackSegmentEvent({
-        event: SegmentEvent.generateCodeLanguageChanged,
+      window.main.trackAnalyticsEvent({
+        event: AnalyticsEvent.generateCodeLanguageChanged,
         properties: {
           language: target?.title,
         },
diff --git a/packages/insomnia/src/ui/components/modals/git-project-staging-modal.tsx b/packages/insomnia/src/ui/components/modals/git-project-staging-modal.tsx
index 99ff5a8c9d..38490958fb 100644
--- a/packages/insomnia/src/ui/components/modals/git-project-staging-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/git-project-staging-modal.tsx
@@ -50,7 +50,7 @@ import {
 import type { GitFileType } from '~/sync/git/git-vcs';
 import { GitVCSOperationErrors } from '~/sync/git/git-vcs-operation-errors';
 import type { GitProviderOption } from '~/sync/git/providers/types';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { Badge } from '~/ui/components/base/badge';
 import { GitOauthAuthBanner } from '~/ui/components/git/git-oauth-auth-banner';
 import { isGitRepoLoadAuthHttp40Error } from '~/ui/components/git/git-oauth-auth-utils';
@@ -395,8 +395,8 @@ const GeneratedCommitsForm: FC<GeneratedCommitsFormProps> = ({
           }))
           .filter(commit => commit.id !== DO_NOT_COMMIT_ID && commit.files.length > 0);
 
-        window.main.trackSegmentEvent({
-          event: SegmentEvent.recommendCommitsSaved,
+        window.main.trackAnalyticsEvent({
+          event: AnalyticsEvent.recommendCommitsSaved,
           properties: {
             group_count: commits.length,
             file_excluded_count: commitsSections.getItem(DO_NOT_COMMIT_ID)?.value?.files?.length || 0,
@@ -1303,12 +1303,12 @@ const OriginalGitProjectStagingModal: FC<
 
   const handleGenerateCommits = React.useCallback(() => {
     if (commitGenerationCompleted) {
-      window.main.trackSegmentEvent({ event: SegmentEvent.recommendCommitsCancelled });
+      window.main.trackAnalyticsEvent({ event: AnalyticsEvent.recommendCommitsCancelled });
       setCommitGenerationKey(commitGenerationKey + 1);
       return;
     }
 
-    window.main.trackSegmentEvent({ event: SegmentEvent.recommendCommitsClicked });
+    window.main.trackAnalyticsEvent({ event: AnalyticsEvent.recommendCommitsClicked });
     generateCommitsFetcher.submit({
       projectId,
     });
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 f6fd4e69bc..144f7b4a81 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
@@ -22,10 +22,10 @@ import {
 } from '../../../../common/import';
 import { invariant } from '../../../../utils/invariant';
 import {
+  AnalyticsEvent,
   importAttributionKey,
   PENDING_IMPORT_ATTRIBUTION_KEY,
   readPendingImportAttribution,
-  SegmentEvent,
   trackImportEvent,
 } from '../../../analytics';
 import { Modal, type ModalHandle, type ModalProps } from '../../base/modal';
@@ -275,7 +275,7 @@ export const ImportModal: FC<ImportModalProps> = ({
   // Track the import completion event, redirect to the new workspace and close the modal
   useEffect(() => {
     if (importFetcher?.data?.done === true && scanResourcesFetcherData?.length) {
-      trackImportEvent(SegmentEvent.importCompleted, {
+      trackImportEvent(AnalyticsEvent.importCompleted, {
         workspaces: scanResourcesFetcherData.map(scanResult => scanResult.workspaces?.length || 0),
         requests: scanResourcesFetcherData.map(scanResult => scanResult.requests?.length || 0),
       });
@@ -405,7 +405,7 @@ export const ImportModal: FC<ImportModalProps> = ({
                 .filter(({ errors }) => errors.length === 0)
                 .forEach(scanResult => {
                   const type = scanResult.type?.id ?? 'unknown';
-                  trackImportEvent(SegmentEvent.dataImport, { 'data-import-type': type });
+                  trackImportEvent(AnalyticsEvent.dataImport, { 'data-import-type': type });
                 });
             }}
           />
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 b5b33c48ad..5d189f44ab 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
@@ -21,7 +21,7 @@ import { models } from '~/insomnia-data';
 import { useRootLoaderData } from '~/root';
 import { useOrganizationLoaderData } from '~/routes/organization';
 import { useCollaboratorsSearchLoaderFetcher } from '~/routes/organization.$organizationId.collaborators-search';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { Icon } from '~/ui/components/icon';
 import { useIsLightTheme } from '~/ui/hooks/theme';
 
@@ -380,8 +380,8 @@ export const InviteForm = ({
             })
               .then(
                 () => {
-                  window.main.trackSegmentEvent({
-                    event: SegmentEvent.inviteMember,
+                  window.main.trackAnalyticsEvent({
+                    event: AnalyticsEvent.inviteMember,
                     properties: {
                       numberOfInvites: emailsToInvite.length,
                       numberOfTeams: groupsToInvite.length,
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 0dda8ef3c5..58154366b7 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
@@ -37,7 +37,7 @@ import { useInviteFetcher } from '~/routes/organization.$organizationId.collabor
 import { useReinviteFetcher } from '~/routes/organization.$organizationId.collaborators.invites.$invitationId.reinvite';
 import { useCollaboratorsCheckSeatsLoaderFetcher } from '~/routes/organization.$organizationId.collaborators-check-seats';
 import { useOrganizationMemberRolesActionFetcher } from '~/routes/organization.$organizationId.members.$userId.roles';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { PromptButton } from '~/ui/components/base/prompt-button';
 import { Icon } from '~/ui/components/icon';
 import { AlertModal } from '~/ui/components/modals/alert-modal';
@@ -408,7 +408,7 @@ const MemberListItem: FC<{
                   organizationId,
                   invitationId: member.metadata.invitationId,
                 });
-                window.main.trackSegmentEvent({ event: SegmentEvent.inviteResent });
+                window.main.trackAnalyticsEvent({ event: AnalyticsEvent.inviteResent });
               }
             }}
             className="flex min-w-[75px] items-center gap-2 px-2 py-1 text-sm font-semibold text-(--color-font) transition-all aria-pressed:bg-(--hl-sm)"
@@ -519,7 +519,7 @@ const MemberListItem: FC<{
                 .then(() => {
                   onResetCurrentPage();
                   onRemoveMember();
-                  window.main.trackSegmentEvent({ event: SegmentEvent.inviteRevoked });
+                  window.main.trackAnalyticsEvent({ event: AnalyticsEvent.inviteRevoked });
                 })
                 .catch(error => {
                   onError(error.message);
@@ -665,7 +665,7 @@ export const InviteModalContainer: FC<{
   // track event when modal is opened
   useEffect(() => {
     if (isOpen) {
-      window.main.trackSegmentEvent({ event: SegmentEvent.inviteTrigger });
+      window.main.trackAnalyticsEvent({ event: AnalyticsEvent.inviteTrigger });
     }
   }, [isOpen]);
 
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 9d486eeb9c..e64ca5a019 100644
--- a/packages/insomnia/src/ui/components/modals/new-workspace-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/new-workspace-modal.tsx
@@ -29,7 +29,7 @@ import { Badge } from '~/ui/components/base/badge';
 import { useAIFeatureStatus } from '~/ui/hooks/use-organization-features';
 
 import { safeToUseInsomniaFileName, safeToUseInsomniaFileNameWithExt } from '../../../sync/git/insomnia-filename';
-import { SegmentEvent } from '../../analytics';
+import { AnalyticsEvent } from '../../analytics';
 import { Icon } from '../icon';
 
 const titleByScope: Record<WorkspaceScope, string> = {
@@ -142,8 +142,8 @@ export const NewWorkspaceModal = ({
 
   useEffect(() => {
     if (isOpen && scope === models.workspace.WorkspaceScopeKeys.mockServer) {
-      window.main.trackSegmentEvent({
-        event: SegmentEvent.mockCreateModalOpened,
+      window.main.trackAnalyticsEvent({
+        event: AnalyticsEvent.mockCreateModalOpened,
       });
     }
   }, [isOpen, scope]);
diff --git a/packages/insomnia/src/ui/components/modals/settings-modal.tsx b/packages/insomnia/src/ui/components/modals/settings-modal.tsx
index 741c347270..fe7a0abfc9 100644
--- a/packages/insomnia/src/ui/components/modals/settings-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/settings-modal.tsx
@@ -7,7 +7,7 @@ import { AI_PLUGIN_NAME, isKonnectSyncEnabled } from '~/common/constants';
 import { models } from '~/insomnia-data';
 import { getBundlePlugins } from '~/plugins';
 import { useRootLoaderData } from '~/root';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { AISettings } from '~/ui/components/settings/ai-settings';
 import { CredentialsSettings } from '~/ui/components/settings/credentials';
 import { KonnectSettings } from '~/ui/components/settings/konnect-settings';
@@ -105,8 +105,8 @@ export const SettingsModal = forwardRef<SettingsModalHandle, ModalProps>((props,
           onSelectionChange={key => {
             setDefaultTabKey(key.toString());
 
-            window.main.trackSegmentEvent({
-              event: SegmentEvent.preferencesViewed,
+            window.main.trackAnalyticsEvent({
+              event: AnalyticsEvent.preferencesViewed,
               properties: { tab: key.toString() },
             });
           }}
@@ -260,8 +260,8 @@ SettingsModal.displayName = 'SettingsModal';
 export const showSettingsModal = (options?: { tab?: SettingsModalTabKey }) => {
   showModal(SettingsModal, options);
 
-  window.main.trackSegmentEvent({
-    event: SegmentEvent.preferencesViewed,
+  window.main.trackAnalyticsEvent({
+    event: AnalyticsEvent.preferencesViewed,
     properties: { tab: options?.tab || 'general' },
   });
 };
diff --git a/packages/insomnia/src/ui/components/modals/sync-merge-modal.tsx b/packages/insomnia/src/ui/components/modals/sync-merge-modal.tsx
index 9ebf8f73dd..0aae11fb4f 100644
--- a/packages/insomnia/src/ui/components/modals/sync-merge-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/sync-merge-modal.tsx
@@ -20,7 +20,7 @@ import { showModal } from '~/ui/components/modals';
 import { AlertModal } from '~/ui/components/modals/alert-modal';
 
 import { type MergeConflict, RESOLUTION_SOURCE } from '../../../sync/types';
-import { SegmentEvent } from '../../analytics';
+import { AnalyticsEvent } from '../../analytics';
 import { MergeEditor } from '../.client/codemirror/merge-editor';
 import { DiffEditor } from '../diff-view-editor';
 import { Icon } from '../icon';
@@ -137,8 +137,8 @@ export const SyncMergeModal = forwardRef<SyncMergeModalHandle>((_, ref) => {
         onCancelUnresolvedRef.current = onCancelUnresolved;
         setIsOpen(true);
 
-        window.main.trackSegmentEvent({
-          event: SegmentEvent.syncConflictResolutionStart,
+        window.main.trackAnalyticsEvent({
+          event: AnalyticsEvent.syncConflictResolutionStart,
         });
       },
     }),
@@ -309,14 +309,14 @@ export const SyncMergeModal = forwardRef<SyncMergeModalHandle>((_, ref) => {
                             );
                             // if at least one conflict.choose is theirsBlob, track conflict resolution complete as theirs
                             if (conflicts?.some(conflict => conflict.choose === conflict.theirsBlob)) {
-                              window.main.trackSegmentEvent({
-                                event: SegmentEvent.syncConflictResolutionCompleteTheirs,
+                              window.main.trackAnalyticsEvent({
+                                event: AnalyticsEvent.syncConflictResolutionCompleteTheirs,
                               });
                             }
                             // if at least one conflict.choose is mine, track conflict resolution complete as mine
                             if (conflicts?.some(conflict => conflict.choose === conflict.mineBlob)) {
-                              window.main.trackSegmentEvent({
-                                event: SegmentEvent.syncConflictResolutionCompleteMine,
+                              window.main.trackAnalyticsEvent({
+                                event: AnalyticsEvent.syncConflictResolutionCompleteMine,
                               });
                             }
 
diff --git a/packages/insomnia/src/ui/components/panes/request-pane.tsx b/packages/insomnia/src/ui/components/panes/request-pane.tsx
index adf7e2ab95..a6f5250f74 100644
--- a/packages/insomnia/src/ui/components/panes/request-pane.tsx
+++ b/packages/insomnia/src/ui/components/panes/request-pane.tsx
@@ -15,7 +15,7 @@ import {
   type RequestLoaderData,
   useRequestLoaderData,
 } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId';
-import { SegmentEvent } from '../../../ui/analytics';
+import { AnalyticsEvent } from '../../../ui/analytics';
 import { deconstructQueryStringToParams, extractQueryStringFromUrl } from '../../../utils/url/querystring';
 import { useRequestPatcher, useSettingsPatcher } from '../../hooks/use-request';
 import { useGitVCSVersion } from '../../hooks/use-vcs-version';
@@ -206,7 +206,7 @@ export const RequestPane: FC<Props> = ({ environmentId, settings, onPaste }) =>
                       isDisabled={!urlHasQueryParameters}
                       onPress={() => {
                         handleImportQueryFromUrl();
-                        window.main.trackSegmentEvent({ event: SegmentEvent.requestParamsImportFromURLClicked });
+                        window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestParamsImportFromURLClicked });
                       }}
                       className="flex h-full w-[14ch] shrink-0 items-center justify-start gap-2 rounded-xs px-2 py-1 text-sm text-(--color-font) ring-1 ring-transparent transition-colors hover:bg-(--hl-xs) focus:bg-(--hl-sm) focus:ring-(--hl-md) focus:ring-inset aria-selected:bg-(--hl-xs) aria-selected:hover:bg-(--hl-sm) aria-selected:focus:bg-(--hl-sm) data-pressed:bg-(--hl-sm)"
                     >
@@ -217,7 +217,7 @@ export const RequestPane: FC<Props> = ({ environmentId, settings, onPaste }) =>
                         patchSettings({
                           useBulkParametersEditor: isSelected,
                         });
-                        window.main.trackSegmentEvent({ event: SegmentEvent.requestParamsBulkEditToggled });
+                        window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestParamsBulkEditToggled });
                       }}
                       isSelected={settings.useBulkParametersEditor}
                       className="flex h-full w-[14ch] shrink-0 items-center justify-start gap-2 rounded-xs px-2 py-1 text-sm text-(--color-font) ring-1 ring-transparent transition-colors hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset"
@@ -239,7 +239,7 @@ export const RequestPane: FC<Props> = ({ environmentId, settings, onPaste }) =>
                     key={contentType}
                     bulk={settings.useBulkParametersEditor}
                     onDescriptionToggle={() => {
-                      window.main.trackSegmentEvent({ event: SegmentEvent.requestParamsDescriptionToggled });
+                      window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestParamsDescriptionToggled });
                     }}
                   />
                 </ErrorBoundary>
@@ -307,7 +307,7 @@ export const RequestPane: FC<Props> = ({ environmentId, settings, onPaste }) =>
                 headers={activeRequest.headers}
                 requestType="Request"
                 onDescriptionToggle={() => {
-                  window.main.trackSegmentEvent({ event: SegmentEvent.requestHeadersDescriptionToggled });
+                  window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestHeadersDescriptionToggled });
                 }}
               />
             </div>
@@ -320,7 +320,7 @@ export const RequestPane: FC<Props> = ({ environmentId, settings, onPaste }) =>
                 patchSettings({
                   useBulkHeaderEditor: !settings.useBulkHeaderEditor,
                 });
-                window.main.trackSegmentEvent({ event: SegmentEvent.requestHeadersBulkEditToggled });
+                window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestHeadersBulkEditToggled });
               }}
             >
               {settings.useBulkHeaderEditor ? 'Regular Edit' : 'Bulk Edit'}
@@ -370,8 +370,8 @@ export const RequestPane: FC<Props> = ({ environmentId, settings, onPaste }) =>
                   onChange={preRequestScript => patchRequest(requestId, { preRequestScript })}
                   settings={settings}
                   onSnippetAdded={snippetName => {
-                    window.main.trackSegmentEvent({
-                      event: SegmentEvent.requestScriptsPreScriptSnippetAdded,
+                    window.main.trackAnalyticsEvent({
+                      event: AnalyticsEvent.requestScriptsPreScriptSnippetAdded,
                       properties: { snippetName },
                     });
                   }}
@@ -386,8 +386,8 @@ export const RequestPane: FC<Props> = ({ environmentId, settings, onPaste }) =>
                   onChange={afterResponseScript => patchRequest(requestId, { afterResponseScript })}
                   settings={settings}
                   onSnippetAdded={snippetName => {
-                    window.main.trackSegmentEvent({
-                      event: SegmentEvent.requestScriptsPostScriptSnippetAdded,
+                    window.main.trackAnalyticsEvent({
+                      event: AnalyticsEvent.requestScriptsPostScriptSnippetAdded,
                       properties: { snippetName },
                     });
                   }}
diff --git a/packages/insomnia/src/ui/components/panes/response-pane.tsx b/packages/insomnia/src/ui/components/panes/response-pane.tsx
index 0cac3de500..93321719d5 100644
--- a/packages/insomnia/src/ui/components/panes/response-pane.tsx
+++ b/packages/insomnia/src/ui/components/panes/response-pane.tsx
@@ -4,7 +4,7 @@ import { Tab, TabList, TabPanel, Tabs, Toolbar } from 'react-aria-components';
 import { services } from '~/insomnia-data';
 import type { ResponseTimelineEntry } from '~/main/network/libcurl-promise';
 import { useRootLoaderData } from '~/root';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 
 import { PREVIEW_MODE_SOURCE } from '../../../common/constants';
 import { getSetCookieHeaders } from '../../../common/misc';
@@ -147,8 +147,8 @@ export const ResponsePane: FC<Props> = ({ activeRequestId }) => {
         className="flex h-full w-full flex-1 flex-col"
         onSelectionChange={key => {
           if (key === 'mock-response') {
-            window.main.trackSegmentEvent({
-              event: SegmentEvent.responseToMockClicked,
+            window.main.trackAnalyticsEvent({
+              event: AnalyticsEvent.responseToMockClicked,
               properties: {
                 source: 'Response Pane Tab',
               },
@@ -248,7 +248,7 @@ export const ResponsePane: FC<Props> = ({ activeRequestId }) => {
             <ResponseHeadersViewer
               headers={activeResponse.headers}
               onCopyAll={() => {
-                window.main.trackSegmentEvent({ event: SegmentEvent.responseHeadersCopyAllClicked });
+                window.main.trackAnalyticsEvent({ event: AnalyticsEvent.responseHeadersCopyAllClicked });
               }}
             />
           </ErrorBoundary>
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 6b151f0a2e..a32135a9da 100644
--- a/packages/insomnia/src/ui/components/project/project-empty-view.tsx
+++ b/packages/insomnia/src/ui/components/project/project-empty-view.tsx
@@ -1,7 +1,7 @@
 import React, { type FC } from 'react';
 import { Button } from 'react-aria-components';
 
-import { SegmentEvent } from '../../analytics';
+import { AnalyticsEvent } from '../../analytics';
 import { Icon } from '../icon';
 
 interface Props {
@@ -24,8 +24,8 @@ export const ProjectEmptyView: FC<Props> = ({
           aria-label="Create request collection"
           className="flex w-full max-w-[180px] flex-col items-center justify-center gap-(--padding-xs) rounded-md border border-solid border-(--hl-sm) px-12 py-8 text-(--font-size-sm) shadow-xs transition-all duration-100 hover:bg-(--color-bg) sm:gap-(--padding-sm)"
           onPress={() => {
-            window.main.trackSegmentEvent({
-              event: SegmentEvent.emptyStateSendRequestClicked,
+            window.main.trackAnalyticsEvent({
+              event: AnalyticsEvent.emptyStateSendRequestClicked,
             });
             onCreateRequestCollectionWithRequest();
           }}
@@ -37,8 +37,8 @@ export const ProjectEmptyView: FC<Props> = ({
           aria-label="Create document"
           className="flex w-full max-w-[180px] flex-col items-center justify-center gap-(--padding-xs) rounded-md border border-solid border-(--hl-sm) px-12 py-8 text-(--font-size-sm) shadow-xs transition-all duration-100 hover:bg-(--color-bg) sm:gap-(--padding-sm)"
           onPress={() => {
-            window.main.trackSegmentEvent({
-              event: SegmentEvent.emptyStateCreateDocumentClicked,
+            window.main.trackAnalyticsEvent({
+              event: AnalyticsEvent.emptyStateCreateDocumentClicked,
             });
             onCreateDesignDocument();
           }}
@@ -50,8 +50,8 @@ export const ProjectEmptyView: FC<Props> = ({
           aria-label="Import"
           className="flex w-full max-w-[180px] flex-col items-center justify-center gap-(--padding-xs) rounded-md border border-solid border-(--hl-sm) px-12 py-8 text-(--font-size-sm) shadow-xs transition-all duration-100 hover:bg-(--color-bg) sm:gap-(--padding-sm)"
           onPress={() => {
-            window.main.trackSegmentEvent({
-              event: SegmentEvent.importStarted,
+            window.main.trackAnalyticsEvent({
+              event: AnalyticsEvent.importStarted,
               properties: {
                 source: 'home-page',
               },
diff --git a/packages/insomnia/src/ui/components/project/project-list-sidebar.tsx b/packages/insomnia/src/ui/components/project/project-list-sidebar.tsx
index cc8c8197b6..801a369b06 100644
--- a/packages/insomnia/src/ui/components/project/project-list-sidebar.tsx
+++ b/packages/insomnia/src/ui/components/project/project-list-sidebar.tsx
@@ -7,7 +7,7 @@ import * as reactUse from 'react-use';
 import type { GitRepository, Project } from '~/insomnia-data';
 import { models } from '~/insomnia-data';
 import type { SyncResult } from '~/konnect/sync';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 
 import { useKonnectSync } from '../../hooks/use-konnect-sync';
 import { AvatarGroup } from '../avatar';
@@ -270,7 +270,7 @@ export const ProjectListSidebar = ({
           onChange={value => {
             setProjectListFilter(value);
             if (value.trim() !== '') {
-              window.main.trackSegmentEvent({ event: SegmentEvent.filterCreatedProjects });
+              window.main.trackAnalyticsEvent({ event: AnalyticsEvent.filterCreatedProjects });
             }
           }}
         />
diff --git a/packages/insomnia/src/ui/components/rendered-query-string.tsx b/packages/insomnia/src/ui/components/rendered-query-string.tsx
index 5b4b61cf4f..67b9847513 100644
--- a/packages/insomnia/src/ui/components/rendered-query-string.tsx
+++ b/packages/insomnia/src/ui/components/rendered-query-string.tsx
@@ -11,7 +11,7 @@ import type {
   WebSocketRequest,
 } from '~/insomnia-data';
 import { models } from '~/insomnia-data';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { showSettingsModal } from '~/ui/components/modals/settings-modal';
 
 import { database as db } from '../../common/database';
@@ -141,8 +141,8 @@ export const RenderedQueryString: FC<Props> = ({ request }) => {
         message: `Your URL is quite long, so only the first ${MAX_URL_LENGTH} characters were copied.`,
       });
     } else {
-      window.main.trackSegmentEvent({
-        event: SegmentEvent.requestUrlCopied,
+      window.main.trackAnalyticsEvent({
+        event: AnalyticsEvent.requestUrlCopied,
       });
     }
   }, [tooLong]);
diff --git a/packages/insomnia/src/ui/components/request-url-bar.tsx b/packages/insomnia/src/ui/components/request-url-bar.tsx
index 81ef839d76..20727c971b 100644
--- a/packages/insomnia/src/ui/components/request-url-bar.tsx
+++ b/packages/insomnia/src/ui/components/request-url-bar.tsx
@@ -25,7 +25,7 @@ import {
   type RequestLoaderData,
   useRequestLoaderData,
 } from '../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId';
-import { SegmentEvent } from '../../ui/analytics';
+import { AnalyticsEvent } from '../../ui/analytics';
 import { tryToInterpolateRequestOrShowRenderErrorModal } from '../../utils/try-interpolate';
 import { buildQueryStringFromParams, joinUrlAndQueryString } from '../../utils/url/querystring';
 import { useInsomniaTabContext } from '../context/app/insomnia-tab-context';
@@ -374,7 +374,7 @@ export const RequestUrlBar = forwardRef<RequestUrlBarHandle, Props>(
                           icon="code"
                           label="Generate Client Code"
                           onClick={() => {
-                            window.main.trackSegmentEvent({ event: SegmentEvent.requestSendMenuGenerateCodeClicked });
+                            window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestSendMenuGenerateCodeClicked });
                             showModal(GenerateCodeModal, { request: activeRequest });
                           }}
                         />
@@ -386,7 +386,7 @@ export const RequestUrlBar = forwardRef<RequestUrlBarHandle, Props>(
                           icon="clock-o"
                           label="Send After Delay"
                           onClick={() => {
-                            window.main.trackSegmentEvent({ event: SegmentEvent.requestSendMenuSendAfterDelayClicked });
+                            window.main.trackAnalyticsEvent({ event: AnalyticsEvent.requestSendMenuSendAfterDelayClicked });
                             showModal(PromptModal, {
                               inputType: 'decimal',
                               title: 'Send After Delay',
@@ -404,8 +404,8 @@ export const RequestUrlBar = forwardRef<RequestUrlBarHandle, Props>(
                           icon="repeat"
                           label="Repeat on Interval"
                           onClick={() => {
-                            window.main.trackSegmentEvent({
-                              event: SegmentEvent.requestSendMenuRepeatAfterIntervalClicked,
+                            window.main.trackAnalyticsEvent({
+                              event: AnalyticsEvent.requestSendMenuRepeatAfterIntervalClicked,
                             });
                             showModal(PromptModal, {
                               inputType: 'decimal',
@@ -436,8 +436,8 @@ export const RequestUrlBar = forwardRef<RequestUrlBarHandle, Props>(
                             icon="download"
                             label="Download After Send"
                             onClick={async () => {
-                              window.main.trackSegmentEvent({
-                                event: SegmentEvent.requestSendMenuDownloadAfterSendClicked,
+                              window.main.trackAnalyticsEvent({
+                                event: AnalyticsEvent.requestSendMenuDownloadAfterSendClicked,
                               });
                               const { canceled, filePaths } = await window.dialog.showOpenDialog({
                                 title: 'Select Download Location',
@@ -457,8 +457,8 @@ export const RequestUrlBar = forwardRef<RequestUrlBarHandle, Props>(
                           icon="download"
                           label="Send And Download"
                           onClick={() => {
-                            window.main.trackSegmentEvent({
-                              event: SegmentEvent.requestSendMenuSendAndDownloadClicked,
+                            window.main.trackAnalyticsEvent({
+                              event: AnalyticsEvent.requestSendMenuSendAndDownloadClicked,
                             });
                             sendOrConnect(true);
                           }}
diff --git a/packages/insomnia/src/ui/components/settings/import-export.tsx b/packages/insomnia/src/ui/components/settings/import-export.tsx
index f983818d74..fb007d8210 100644
--- a/packages/insomnia/src/ui/components/settings/import-export.tsx
+++ b/packages/insomnia/src/ui/components/settings/import-export.tsx
@@ -5,7 +5,7 @@ import { exportRequestsHAR, exportWorkspacesHAR } from 'insomnia/src/common/har'
 import { getInsomniaV5DataExport } from 'insomnia/src/common/insomnia-v5';
 import { isNotNullOrUndefined } from 'insomnia/src/common/misc';
 import { strings } from 'insomnia/src/common/strings';
-import { SegmentEvent } from 'insomnia/src/ui/analytics';
+import { AnalyticsEvent } from 'insomnia/src/ui/analytics';
 import { Icon } from 'insomnia/src/ui/components/icon';
 import { showError, showModal } from 'insomnia/src/ui/components/modals';
 import { AskModal } from 'insomnia/src/ui/components/modals/ask-modal';
@@ -212,7 +212,7 @@ export const exportProjectToFile = (activeProjectName: string, workspacesForActi
             throw new Error(`selected export format "${selectedFormat}" is invalid`);
           }
         }
-        window.main.trackSegmentEvent({ event: SegmentEvent.exportCompleted });
+        window.main.trackAnalyticsEvent({ event: AnalyticsEvent.exportCompleted });
       } catch (err) {
         showError({
           title: 'Export Failed',
@@ -240,8 +240,8 @@ export const exportMockServerToFile = async (workspace: Workspace) => {
       includePrivateEnvironments: false,
     });
     await writeExportedFileToFileSystem(fileName, stringifiedExport);
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.dataExport,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.dataExport,
       properties: { type: 'yaml', scope: 'mock-server' },
     });
   } catch (err) {
@@ -282,8 +282,8 @@ export const exportGlobalEnvironmentToFile = async (workspace: Workspace) => {
       includePrivateEnvironments: shouldExportPrivateEnvironments,
     });
     await writeExportedFileToFileSystem(fileName, stringifiedExport);
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.dataExport,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.dataExport,
       properties: { type: 'yaml', scope: 'environment' },
     });
   } catch (err) {
@@ -350,7 +350,7 @@ export const exportRequestsToFile = (workspaceId: string, requestIds: string[])
           }
         }
         await writeExportedFileToFileSystem(fileName, stringifiedExport);
-        window.main.trackSegmentEvent({ event: SegmentEvent.dataExport, properties: { type: selectedFormat } });
+        window.main.trackAnalyticsEvent({ event: AnalyticsEvent.dataExport, properties: { type: selectedFormat } });
       } catch (err) {
         showError({
           title: 'Export Failed',
@@ -378,8 +378,8 @@ export const exportMcpClientToFile = async (workspace: Workspace) => {
       includePrivateEnvironments: false,
     });
     await writeExportedFileToFileSystem(fileName, stringifiedExport);
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.dataExport,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.dataExport,
       properties: { type: 'yaml', scope: 'mcp' },
     });
   } catch (err) {
@@ -733,8 +733,8 @@ export const ImportExport: FC<Props> = ({ hideSettingsModal, onModalChange }) =>
             title: 'Export Complete',
             message: 'All your data have been successfully exported',
           });
-          window.main.trackSegmentEvent({
-            event: SegmentEvent.exportAllCollections,
+          window.main.trackAnalyticsEvent({
+            event: AnalyticsEvent.exportAllCollections,
           });
         }}
         aria-label="Export all data"
@@ -802,8 +802,8 @@ export const ImportExport: FC<Props> = ({ hideSettingsModal, onModalChange }) =>
                   title: 'Export Complete',
                   message: 'All your data have been successfully exported',
                 });
-                window.main.trackSegmentEvent({
-                  event: SegmentEvent.exportAllCollections,
+                window.main.trackAnalyticsEvent({
+                  event: AnalyticsEvent.exportAllCollections,
                 });
               }}
               aria-label="Export all data"
diff --git a/packages/insomnia/src/ui/components/settings/konnect-settings.tsx b/packages/insomnia/src/ui/components/settings/konnect-settings.tsx
index 86bcdde7b3..2663581764 100644
--- a/packages/insomnia/src/ui/components/settings/konnect-settings.tsx
+++ b/packages/insomnia/src/ui/components/settings/konnect-settings.tsx
@@ -3,7 +3,7 @@ import { Button } from 'react-aria-components';
 
 import { validatePat } from '~/konnect/api';
 import { useRootLoaderData } from '~/root';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 
 import { useSettingsPatcher } from '../../hooks/use-request';
 
@@ -28,7 +28,7 @@ export const KonnectSettings = () => {
       await window.main.secretStorage.setSecret('konnectPat', trimmed);
       patchSettings({ hasKonnectPat: true });
       setPat('');
-      window.main.trackSegmentEvent({ event: SegmentEvent.kongKonnectPatValidated });
+      window.main.trackAnalyticsEvent({ event: AnalyticsEvent.kongKonnectPatValidated });
     } else {
       setValidationError(result.error ?? 'PAT is invalid or could not connect to Konnect.');
     }
diff --git a/packages/insomnia/src/ui/components/viewers/response-cookies-viewer.tsx b/packages/insomnia/src/ui/components/viewers/response-cookies-viewer.tsx
index a63628eeb6..3d928c9c56 100644
--- a/packages/insomnia/src/ui/components/viewers/response-cookies-viewer.tsx
+++ b/packages/insomnia/src/ui/components/viewers/response-cookies-viewer.tsx
@@ -1,7 +1,7 @@
 import React, { type FC, useState } from 'react';
 import { Cookie } from 'tough-cookie';
 
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { CookiesModal } from '~/ui/components/modals/cookies-modal';
 
 interface Props {
@@ -64,7 +64,7 @@ export const ResponseCookiesViewer: FC<Props> = props => {
           className="pull-right btn btn--clicky"
           onClick={() => {
             setIsCookieModalOpen(true);
-            window.main.trackSegmentEvent({ event: SegmentEvent.responseCookiesManageCookiesClicked });
+            window.main.trackAnalyticsEvent({ event: AnalyticsEvent.responseCookiesManageCookiesClicked });
           }}
         >
           Manage Cookies
diff --git a/packages/insomnia/src/ui/components/viewers/response-viewer.tsx b/packages/insomnia/src/ui/components/viewers/response-viewer.tsx
index 076c3b62ca..fad8e31513 100644
--- a/packages/insomnia/src/ui/components/viewers/response-viewer.tsx
+++ b/packages/insomnia/src/ui/components/viewers/response-viewer.tsx
@@ -1,7 +1,7 @@
 import iconv from 'iconv-lite';
 import { Fragment, useCallback, useRef, useState } from 'react';
 
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor';
 
 import {
@@ -248,8 +248,8 @@ export const ResponseViewer = ({
           updateFilter?.(filter);
 
           if (filter) {
-            window.main.trackSegmentEvent({
-              event: SegmentEvent.filterCreatedResponseBody,
+            window.main.trackAnalyticsEvent({
+              event: AnalyticsEvent.filterCreatedResponseBody,
             });
           }
         }}
@@ -375,8 +375,8 @@ export const ResponseViewer = ({
         updateFilter?.(filter);
 
         if (filter) {
-          window.main.trackSegmentEvent({
-            event: SegmentEvent.filterCreatedResponseBody,
+          window.main.trackAnalyticsEvent({
+            event: AnalyticsEvent.filterCreatedResponseBody,
           });
         }
       }}
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 139b5691dc..cd591c08d6 100644
--- a/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx
+++ b/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx
@@ -16,7 +16,7 @@ import type { ResponseTimelineEntry } from '../../../main/network/libcurl-promis
 import type { SocketIOEvent } from '../../../main/network/socket-io';
 import type { WebSocketEvent } from '../../../main/network/websocket';
 import { useRequestLoaderData } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId';
-import { SegmentEvent } from '../../../ui/analytics';
+import { AnalyticsEvent } from '../../../ui/analytics';
 import { deserializeNDJSON } from '../../../utils/ndjson';
 import { useReadyState } from '../../hooks/use-ready-state';
 import { useRealtimeConnectionEvents } from '../../hooks/use-realtime-connection-events';
@@ -415,7 +415,7 @@ const RealtimeActiveResponsePane: FC<RealtimeActiveResponsePaneProps & { readySt
                 <ResponseHeadersViewer
                   headers={response.headers}
                   onCopyAll={() => {
-                    window.main.trackSegmentEvent({ event: SegmentEvent.mcpResponseHeadersCopyAllClicked });
+                    window.main.trackAnalyticsEvent({ event: AnalyticsEvent.mcpResponseHeadersCopyAllClicked });
                   }}
                 />
               </ErrorBoundary>
diff --git a/packages/insomnia/src/ui/hooks/theme.ts b/packages/insomnia/src/ui/hooks/theme.ts
index 81f9d568bb..d60fe776f2 100644
--- a/packages/insomnia/src/ui/hooks/theme.ts
+++ b/packages/insomnia/src/ui/hooks/theme.ts
@@ -3,7 +3,7 @@ import * as reactUse from 'react-use';
 
 import type { ThemeSettings } from '~/insomnia-data';
 import { useRootLoaderData } from '~/root';
-import { SegmentEvent } from '~/ui/analytics';
+import { AnalyticsEvent } from '~/ui/analytics';
 
 import { type ColorScheme, getThemes } from '../../plugins';
 import { applyColorScheme, getColorScheme, type PluginTheme } from '../../plugins/misc';
@@ -55,8 +55,8 @@ export const useThemes = () => {
   // Activate the theme for the selected color scheme
   const activate = useCallback(
     async (themeName: string, colorScheme: ColorScheme) => {
-      window.main.trackSegmentEvent({
-        event: SegmentEvent.themeChanged,
+      window.main.trackAnalyticsEvent({
+        event: AnalyticsEvent.themeChanged,
         properties: { themeName, colorScheme },
       });
 
diff --git a/packages/insomnia/src/ui/hooks/use-konnect-sync.ts b/packages/insomnia/src/ui/hooks/use-konnect-sync.ts
index e846346522..655eb2bbcb 100644
--- a/packages/insomnia/src/ui/hooks/use-konnect-sync.ts
+++ b/packages/insomnia/src/ui/hooks/use-konnect-sync.ts
@@ -3,7 +3,7 @@ import { useRevalidator } from 'react-router';
 
 import type { SyncResult } from '../../konnect/sync';
 import { syncKonnect } from '../../konnect/sync';
-import { SegmentEvent } from '../analytics';
+import { AnalyticsEvent } from '../analytics';
 
 const REVALIDATE_DEBOUNCE_MS = 500;
 
@@ -63,8 +63,8 @@ export function useKonnectSync(): UseKonnectSyncResult {
       error: !result.success && !cancelled ? (result.error ?? 'Sync failed') : null,
     });
 
-    window.main.trackSegmentEvent({
-      event: SegmentEvent.kongKonnectSyncCompleted,
+    window.main.trackAnalyticsEvent({
+      event: AnalyticsEvent.kongKonnectSyncCompleted,
       properties: {
         success: result.success,
         cancelled,
diff --git a/packages/insomnia/src/ui/sync-utils.ts b/packages/insomnia/src/ui/sync-utils.ts
index 35c7de9516..da416e1428 100644
--- a/packages/insomnia/src/ui/sync-utils.ts
+++ b/packages/insomnia/src/ui/sync-utils.ts
@@ -37,7 +37,7 @@ type VCSAction =
   | 'setup'
   | 'clone';
 
-export function vcsSegmentEventProperties(type: 'remote', action: VCSAction, error?: string) {
+export function vcsEventProperties(type: 'remote', action: VCSAction, error?: string) {
   return { type, action, error };
 }
 

From e507572f9c8fa0002b35a18faeec2a389f7a79de Mon Sep 17 00:00:00 2001
From: Ryan Willis <ryan.willis@konghq.com>
Date: Fri, 15 May 2026 08:36:36 -0700
Subject: [PATCH 4/7] chore: pdf preview frame regression tests (#9922)

---
 .../fixtures/files/dummy.pdf                  | Bin 13264 -> 591 bytes
 .../tests/smoke/app.test.ts                   |  19 ++++++++++++++++++
 .../dummy-pdf-preview-Smoke-darwin.png        | Bin 0 -> 5599 bytes
 .../dummy-pdf-preview-Smoke-linux.png         | Bin 0 -> 5764 bytes
 .../dummy-pdf-preview-Smoke-win32.png         | Bin 0 -> 5495 bytes
 5 files changed, 19 insertions(+)
 create mode 100644 packages/insomnia-smoke-test/tests/smoke/app.test.ts-snapshots/dummy-pdf-preview-Smoke-darwin.png
 create mode 100644 packages/insomnia-smoke-test/tests/smoke/app.test.ts-snapshots/dummy-pdf-preview-Smoke-linux.png
 create mode 100644 packages/insomnia-smoke-test/tests/smoke/app.test.ts-snapshots/dummy-pdf-preview-Smoke-win32.png

diff --git a/packages/insomnia-smoke-test/fixtures/files/dummy.pdf b/packages/insomnia-smoke-test/fixtures/files/dummy.pdf
index 774c2ea70c55104973794121eae56bcad918da97..8cd2c288db15e9646914741421e547ec9ade94f1 100644
GIT binary patch
literal 591
zcmZWn%WlFj5WM><_JY(NTE}@nBcU89M3vgA2y#O`7_!hHh%4KvpkLp$10^j!*|W1d
z<FR|waegQ6V<sQ~wcN7d5O{I?MBtCo%AMK(pUMpy2#GL*EMr)gj_A&R8(JQJu1W)o
z$kE?vifU>LqSNRq*Nsj_BT-u&{)%NKN9q8JfcSk8!XOR(yxJ1YK<os7&(NqwugIWt
zo-3N*Hv$q*$TE`dsJpha`U}<@`vGz4>c(o6dp0T<&jo}r6l*ph)i8jfWH;kxzdr({
z1uN1Z2e(jc*`#oBoLW!8INh^Co1}Ne=grdkU>zuckEFr2@`SrDwAD&>d>%Be8C{$O
zzYF?F5+$&P3zmYfLVdxKhbv47^5j;B7smAB|F9_P%(GfnJJkL|%&TvNK83B6d&|>D
RFji{oea1n`dcDb8{sSOZn<W4M

literal 13264
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

diff --git a/packages/insomnia-smoke-test/tests/smoke/app.test.ts b/packages/insomnia-smoke-test/tests/smoke/app.test.ts
index 9d0d444788..ea6d13b7d9 100644
--- a/packages/insomnia-smoke-test/tests/smoke/app.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/app.test.ts
@@ -91,6 +91,25 @@ test('can send requests', async ({ page, insomnia }) => {
     .toBeVisible();
   await page.getByTestId('request-pane').getByRole('button', { name: 'Send' }).click();
   await expect.soft(statusTag).toContainText('200 OK');
+
+  const pdfIframe = page.getByTestId('ResponsePDFView');
+  await expect.soft(pdfIframe).toBeVisible();
+  await expect.soft(pdfIframe).toHaveAttribute('src', /^blob:/);
+
+  // find Electron/Chromium's built-in PDF viewer extension
+  await expect
+    .poll(() => page.frames().some(f => f.url().startsWith('chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai')), {
+      timeout: 5000,
+      message: 'Expected Chromium built-in PDF viewer extension frame to mount inside the PDF preview iframe',
+    })
+    .toBe(true);
+
+  await expect.soft(pdfIframe).toHaveScreenshot('dummy-pdf-preview.png', {
+    animations: 'disabled',
+    maxDiffPixelRatio: 0.15, // 15% discrepancy allowed for CI/environment differences
+    timeout: 5000,
+  });
+
   await page.getByRole('tab', { name: 'Console' }).click();
   await page.locator('pre').filter({ hasText: '< Content-Type: application/pdf' }).click();
 
diff --git a/packages/insomnia-smoke-test/tests/smoke/app.test.ts-snapshots/dummy-pdf-preview-Smoke-darwin.png b/packages/insomnia-smoke-test/tests/smoke/app.test.ts-snapshots/dummy-pdf-preview-Smoke-darwin.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc1f311ea0d9ebdb4e5a07cf7bfb45b9d56cec23
GIT binary patch
literal 5599
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

literal 0
HcmV?d00001

diff --git a/packages/insomnia-smoke-test/tests/smoke/app.test.ts-snapshots/dummy-pdf-preview-Smoke-linux.png b/packages/insomnia-smoke-test/tests/smoke/app.test.ts-snapshots/dummy-pdf-preview-Smoke-linux.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0687de94951d02f2a66af46067f8492268eff67
GIT binary patch
literal 5764
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
Z_=}+0xEp2Xzz+b>P|;N`e)|0NzXAG}&QJgV

literal 0
HcmV?d00001

diff --git a/packages/insomnia-smoke-test/tests/smoke/app.test.ts-snapshots/dummy-pdf-preview-Smoke-win32.png b/packages/insomnia-smoke-test/tests/smoke/app.test.ts-snapshots/dummy-pdf-preview-Smoke-win32.png
new file mode 100644
index 0000000000000000000000000000000000000000..5183119ceeefcec57dd83a11dfe263934a353bf2
GIT binary patch
literal 5495
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
EU+NS@6aWAK

literal 0
HcmV?d00001


From 6eebf09a2ac55222d40a527a127110ce0509c5f8 Mon Sep 17 00:00:00 2001
From: Ryan Willis <ryan.willis@konghq.com>
Date: Fri, 15 May 2026 13:21:50 -0700
Subject: [PATCH 5/7] fix: ensure plugin directory exists before showing it
 (#9923)

---
 .../tests/smoke/app.test.ts                   | 26 ++++++++++++-------
 packages/insomnia/src/main/ipc/main.ts        |  9 ++++---
 .../src/ui/components/settings/plugins.tsx    | 13 ++++------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/packages/insomnia-smoke-test/tests/smoke/app.test.ts b/packages/insomnia-smoke-test/tests/smoke/app.test.ts
index ea6d13b7d9..db69c43be0 100644
--- a/packages/insomnia-smoke-test/tests/smoke/app.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/app.test.ts
@@ -5,8 +5,9 @@ import { test } from '../../playwright/test';
 test('can send requests', async ({ page, insomnia }) => {
   test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
 
-  const statusTag = page.locator('[data-testid="response-status-tag"]:visible');
+  const statusTag = page.getByTestId('response-pane').getByTestId('response-status-tag');
   const responseBody = page.getByTestId('response-pane');
+  const responsePreviewBody = page.locator('[data-testid="response-pane"] >> [data-testid="CodeEditor"]:visible');
 
   await insomnia.projectPage.importFixture('smoke-test-collection.yaml');
 
@@ -33,10 +34,10 @@ test('can send requests', async ({ page, insomnia }) => {
     .toBeVisible();
   await page.getByTestId('request-pane').getByRole('button', { name: 'Send' }).click();
   await expect.soft(statusTag).toContainText('200 OK');
-  await expect.soft(responseBody).toContainText('"id": "1"');
+  await expect.soft(responsePreviewBody).toContainText('"id": "1"');
   await page.getByRole('button', { name: 'Preview' }).click();
   await page.getByRole('menuitem', { name: 'Raw Data' }).click();
-  await expect.soft(responseBody).toContainText('{"id":"1"}');
+  await expect.soft(responsePreviewBody).toContainText('{"id":"1"}');
 
   await page
     .getByLabel('Request Collection')
@@ -47,7 +48,7 @@ test('can send requests', async ({ page, insomnia }) => {
     .toBeVisible();
   await page.getByTestId('request-pane').getByRole('button', { name: 'Connect' }).click();
   await expect.soft(statusTag).toContainText('200 OK');
-  await page.getByRole('tab', { name: 'Console' }).click();
+  await page.getByTestId('response-pane').getByRole('tab', { name: 'Console' }).click();
   await expect.soft(responseBody).toContainText('Connected to 127.0.0.1');
   await page.getByTestId('request-pane').getByRole('button', { name: 'Disconnect' }).click();
 
@@ -64,7 +65,7 @@ test('can send requests', async ({ page, insomnia }) => {
   await expect.soft(statusTag).toContainText('200 OK');
   await page.getByRole('button', { name: 'Preview' }).click();
   await page.getByRole('menuitem', { name: 'Raw Data' }).click();
-  await expect.soft(responseBody).toContainText('a,b,c');
+  await expect.soft(responsePreviewBody).toContainText('a,b,c');
 
   await page
     .getByLabel('Request Collection')
@@ -77,8 +78,8 @@ test('can send requests', async ({ page, insomnia }) => {
     .toBeVisible();
   await page.getByTestId('request-pane').getByRole('button', { name: 'Send' }).click();
   await expect.soft(statusTag).toContainText('200 OK');
-  await expect.soft(responseBody).toContainText('xml version="1.0"');
-  await expect.soft(responseBody).toContainText('<LoginResult>');
+  await expect.soft(responsePreviewBody).toContainText('xml version="1.0"');
+  await expect.soft(responsePreviewBody).toContainText('<LoginResult>');
 
   await page
     .getByLabel('Request Collection')
@@ -110,13 +111,18 @@ test('can send requests', async ({ page, insomnia }) => {
     timeout: 5000,
   });
 
-  await page.getByRole('tab', { name: 'Console' }).click();
+  await page.getByTestId('response-pane').getByRole('tab', { name: 'Console' }).click();
   await page.locator('pre').filter({ hasText: '< Content-Type: application/pdf' }).click();
+  await page.getByTestId('response-pane').getByRole('tab', { name: 'Preview' }).click();
 
   await page.getByLabel('Request Collection').getByTestId('sends request with basic authentication').press('Enter');
+  await expect
+    .soft(page.getByTestId('request-pane').getByTestId('OneLineEditor').getByText('http://127.0.0.1:4010/auth/basic'))
+    .toBeVisible();
   await page.getByTestId('request-pane').getByRole('button', { name: 'Send' }).click();
   await expect.soft(statusTag).toContainText('200 OK');
-  await expect.soft(responseBody).toContainText('basic auth received');
+  await page.getByTestId('response-pane').getByRole('tab', { name: 'Preview' }).click();
+  await expect.soft(responsePreviewBody).toContainText('basic auth received');
 
   await page
     .getByLabel('Request Collection')
@@ -127,7 +133,7 @@ test('can send requests', async ({ page, insomnia }) => {
     .toBeVisible();
   await page.getByTestId('request-pane').getByRole('button', { name: 'Send' }).click();
   await expect.soft(statusTag).toContainText('200 OK');
-  await page.getByRole('tab', { name: 'Console' }).click();
+  await page.getByTestId('response-pane').getByRole('tab', { name: 'Console' }).click();
   await expect.soft(responseBody).toContainText('Set-Cookie: insomnia-test-cookie=value123');
 
   await page.getByLabel('Request Collection').getByTestId('delayed request').press('Enter');
diff --git a/packages/insomnia/src/main/ipc/main.ts b/packages/insomnia/src/main/ipc/main.ts
index bbc0f302b7..d5ea14087b 100644
--- a/packages/insomnia/src/main/ipc/main.ts
+++ b/packages/insomnia/src/main/ipc/main.ts
@@ -399,10 +399,13 @@ export function registerMainHandlers() {
   ipcMainHandle('readDir', readDir);
 
   ipcMainHandle('readOrCreateDataDir', async (_, options: { folder: string }) => {
-    const dataPath = app.getPath('userData');
-    const folderPath = path.join(dataPath, options.folder);
+    const folderPath = path.join(app.getPath('userData'), options.folder);
     mkdirSync(folderPath, { recursive: true });
-    return readDir(_, { path: folderPath });
+    try {
+      return await readDir(_, { path: folderPath });
+    } catch {
+      return [];
+    }
   });
 
   ipcMainHandle('curlRequest', (_, options: Parameters<typeof curlRequest>[0]) => {
diff --git a/packages/insomnia/src/ui/components/settings/plugins.tsx b/packages/insomnia/src/ui/components/settings/plugins.tsx
index e079af144b..118f57dee2 100644
--- a/packages/insomnia/src/ui/components/settings/plugins.tsx
+++ b/packages/insomnia/src/ui/components/settings/plugins.tsx
@@ -394,9 +394,7 @@ export const Plugins: FC = () => {
                     patchSettings({ npmRegistryUrl: trimmedRegistryUrl });
                   }}
                 />
-                <FieldError className="text-xs text-(--color-danger)">
-                  {npmRegistryUrlError}
-                </FieldError>
+                <FieldError className="text-xs text-(--color-danger)">{npmRegistryUrlError}</FieldError>
               </TextField>
               {npmRegistryUrl && (
                 <Button
@@ -586,11 +584,10 @@ export const Plugins: FC = () => {
             or{' '}
             <Button
               className="text-(--color-surprise) underline"
-              onPress={() =>
-                window.shell.showItemInFolder(
-                  window.path.resolve(process.env['INSOMNIA_DATA_PATH'] || window.app.getPath('userData'), 'plugins'),
-                )
-              }
+              onPress={async () => {
+                await window.main.readOrCreateDataDir({ folder: 'plugins' });
+                window.shell.showItemInFolder(window.path.resolve(window.app.getPath('userData'), 'plugins'));
+              }}
             >
               Reveal Plugins Folder
             </Button>{' '}

From 254971bcfd87ecf8190444a3a977251996f11c8e Mon Sep 17 00:00:00 2001
From: Bingbing <ZxBing0066@gmail.com>
Date: Tue, 19 May 2026 15:51:42 +0800
Subject: [PATCH 6/7] feat: rebuild user, org and project services (#9917)

---
 packages/insomnia/src/account/session.ts      | 34 +++--------
 .../insomnia/src/common/__tests__/har.test.ts |  2 +-
 .../src/common/__tests__/render.test.ts       |  1 -
 packages/insomnia/src/common/import.ts        |  5 +-
 .../src/common/organization-storage-rules.ts  |  2 +-
 packages/insomnia/src/entry.main.ts           |  2 +-
 .../insomnia-data/__tests__/request.test.ts   |  1 -
 .../insomnia-data/node-src/services/index.ts  |  2 +
 .../node-src/services/organization.ts         | 60 +++++++++++++++++++
 .../node-src/services/project.ts              | 46 ++++++++------
 .../node-src/services/user-session.ts         | 42 ++++---------
 .../__tests__/sync-initialization.test.ts     | 10 ++--
 packages/insomnia/src/main/analytics.ts       |  4 +-
 .../src/main/cloud-sync/initialization.ts     |  6 +-
 packages/insomnia/src/main/git-service.ts     | 22 +++----
 .../src/network/__tests__/network.test.ts     |  4 --
 packages/insomnia/src/root.tsx                |  6 +-
 .../insomnia/src/routes/auth.authorize.tsx    |  6 +-
 .../src/routes/auth.clear-vault-key.tsx       |  4 +-
 .../src/routes/auth.update-vault-salt.tsx     |  4 +-
 .../src/routes/auth.validate-vault-key.tsx    |  2 +-
 packages/insomnia/src/routes/commands.tsx     |  2 +-
 .../git-credentials.$id.related-projects.tsx  |  2 +-
 .../src/routes/git.all-connected-repos.tsx    |  2 +-
 .../insomnia/src/routes/import.resources.tsx  |  2 +-
 ...orators.invites.$invitationId.reinvite.tsx |  2 +-
 ...Id.collaborators.invites.$invitationId.tsx |  2 +-
 ....$organizationId.members.$userId.roles.tsx |  2 +-
 ...ganization.$organizationId.permissions.tsx |  2 +-
 ...ganizationId.project.$projectId._index.tsx |  6 +-
 ...ganizationId.project.$projectId.delete.tsx |  4 +-
 ...nId.project.$projectId.list-workspaces.tsx |  2 +-
 ...onId.project.$projectId.move-workspace.tsx |  2 +-
 ...organizationId.project.$projectId.move.tsx |  2 +-
 ...ion.$organizationId.project.$projectId.tsx |  2 +-
 ...ganizationId.project.$projectId.update.tsx |  4 +-
 ....debug.request.$requestId.grant-access.tsx |  2 +-
 ...projectId.workspace.$workspaceId.debug.tsx |  2 +-
 ...kspaceId.insomnia-sync.create-snapshot.tsx |  2 +-
 ...space.$workspaceId.insomnia-sync.fetch.tsx |  2 +-
 ...kspace.$workspaceId.insomnia-sync.pull.tsx |  2 +-
 ...kspace.$workspaceId.insomnia-sync.push.tsx |  2 +-
 ...e.$workspaceId.insomnia-sync.sync-data.tsx |  4 +-
 ...d.workspace.$workspaceId.insomnia-sync.tsx |  2 +-
 ....$projectId.workspace.$workspaceId.mcp.tsx |  2 +-
 ...ock-server.generate-request-collection.tsx |  2 +-
 ...tId.workspace.$workspaceId.mock-server.tsx |  2 +-
 ...aceId.spec.generate-request-collection.tsx |  2 +-
 ...$projectId.workspace.$workspaceId.spec.tsx |  2 +-
 ...ject.$projectId.workspace.$workspaceId.tsx |  4 +-
 ...Id.project.$projectId.workspace.delete.tsx |  2 +-
 ...onId.project.$projectId.workspace.move.tsx |  2 +-
 ...ionId.project.$projectId.workspace.new.tsx |  8 +--
 ...Id.project.$projectId.workspace.update.tsx |  2 +-
 ...ization.$organizationId.project._index.tsx |  2 +-
 ...ganization.$organizationId.project.new.tsx |  2 +-
 .../src/routes/organization._index.tsx        |  2 +-
 ...zation.sync-organizations-and-projects.tsx |  2 +-
 .../insomnia/src/routes/organization.sync.tsx |  2 +-
 packages/insomnia/src/routes/organization.tsx |  5 +-
 .../src/routes/untracked-projects.tsx         |  2 +-
 packages/insomnia/src/templating/utils.ts     |  2 +-
 .../modals/__tests__/import-export.test.ts    |  1 -
 .../insomnia/src/ui/organization-utils.ts     | 55 +++--------------
 packages/insomnia/src/ui/vault-key.client.ts  |  6 +-
 packages/insomnia/src/utils/router.ts         |  4 +-
 66 files changed, 211 insertions(+), 223 deletions(-)
 create mode 100644 packages/insomnia/src/insomnia-data/node-src/services/organization.ts

diff --git a/packages/insomnia/src/account/session.ts b/packages/insomnia/src/account/session.ts
index 3b9a7f9c58..67d7d09d14 100644
--- a/packages/insomnia/src/account/session.ts
+++ b/packages/insomnia/src/account/session.ts
@@ -26,11 +26,7 @@ export async function absorbKey(sessionId: string, key: string) {
     getUserProfile({ sessionId: sessionIdResolved }),
     getEncryptionKeys({ sessionId: sessionIdResolved }),
   ]);
-  const {
-    public_key: publicKey,
-    enc_private_key: encPrivateKey,
-    enc_symmetric_key: encSymmetricKey,
-  } = keys;
+  const { public_key: publicKey, enc_private_key: encPrivateKey, enc_symmetric_key: encSymmetricKey } = keys;
   const { email, id: accountId, first_name: firstName, last_name: lastName } = profile;
   const symmetricKeyStr = crypt.decryptAES(key, JSON.parse(encSymmetricKey));
 
@@ -67,7 +63,7 @@ export async function getPrivateKey() {
 }
 
 export async function getCurrentSessionId() {
-  const { id } = await services.userSession.getOrCreate();
+  const { id } = await services.userSession.get();
   return id;
 }
 
@@ -122,16 +118,14 @@ export async function setSessionData(
     lastName,
   };
 
-  const userData = await services.userSession.getOrCreate();
-  await services.userSession.update(userData, sessionData);
+  await services.userSession.update(sessionData);
 
   return sessionData;
 }
 
 /** Update the session data with vault salt and vault key */
 export async function setVaultSessionData(vaultSalt: string, vaultKey: string) {
-  const userData = await services.userSession.getOrCreate();
-  await services.userSession.update(userData, { vaultSalt, vaultKey });
+  await services.userSession.update({ vaultSalt, vaultKey });
 }
 
 // ~~~~~~~~~~~~~~~~ //
@@ -139,25 +133,13 @@ export async function setVaultSessionData(vaultSalt: string, vaultKey: string) {
 // ~~~~~~~~~~~~~~~~ //
 
 export async function getUserSession(): Promise<SessionData> {
-  const userData = await services.userSession.getOrCreate();
+  const userData = await services.userSession.get();
 
   return userData;
 }
 
 async function _unsetSessionData() {
-  await services.userSession.getOrCreate();
-  await services.userSession.update(await services.userSession.getOrCreate(), {
-    id: '',
-    accountId: '',
-    email: '',
-    firstName: '',
-    lastName: '',
-    symmetricKey: {} as JsonWebKey,
-    publicKey: {} as JsonWebKey,
-    encPrivateKey: {} as crypt.AESMessage,
-    vaultSalt: '',
-    vaultKey: '',
-  });
+  await services.userSession.remove();
 }
 
 /**
@@ -272,12 +254,12 @@ export async function migrateFromLocalStorage() {
   try {
     const sessionData = JSON.parse(session) as SessionData;
 
-    const currentUserSession = await services.userSession.getOrCreate();
+    const currentUserSession = await services.userSession.get();
 
     if (currentUserSession.id) {
       console.warn('Session already exists, skipping migration');
     } else {
-      await services.userSession.update(currentUserSession, sessionData);
+      await services.userSession.update(sessionData);
     }
   } catch (e) {
     console.error('Failed to parse session data', e);
diff --git a/packages/insomnia/src/common/__tests__/har.test.ts b/packages/insomnia/src/common/__tests__/har.test.ts
index ff635fe996..d3a6607e2f 100644
--- a/packages/insomnia/src/common/__tests__/har.test.ts
+++ b/packages/insomnia/src/common/__tests__/har.test.ts
@@ -12,7 +12,7 @@ import { getRenderedRequestAndContext } from '../render';
 describe('export', () => {
   beforeEach(async () => {
     await db.init({ inMemoryOnly: true }, true);
-    await services.project.all();
+    await services.project.list();
     await services.settings.getOrCreate();
   });
 
diff --git a/packages/insomnia/src/common/__tests__/render.test.ts b/packages/insomnia/src/common/__tests__/render.test.ts
index 2497d2154f..8a67d05a40 100644
--- a/packages/insomnia/src/common/__tests__/render.test.ts
+++ b/packages/insomnia/src/common/__tests__/render.test.ts
@@ -12,7 +12,6 @@ const reqGroupBuilder = createBuilder(requestGroupModelSchema);
 
 describe('render tests', () => {
   beforeEach(async () => {
-    await services.project.all();
     await services.settings.getOrCreate();
     envBuilder.reset();
     reqGroupBuilder.reset();
diff --git a/packages/insomnia/src/common/import.ts b/packages/insomnia/src/common/import.ts
index 548f0d67d0..faa4db3591 100644
--- a/packages/insomnia/src/common/import.ts
+++ b/packages/insomnia/src/common/import.ts
@@ -592,7 +592,7 @@ export const importResourcesToNewWorkspace = async ({
 }): Promise<Workspace> => {
   invariant(resourceCacheItem, 'No resources to import');
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found');
 
   const resources = resourceCacheItem.resources;
@@ -766,8 +766,7 @@ export async function findExistingImportedSpec(
     }
   | undefined
 > {
-  const allProjects = await services.project.all();
-  const filteredProjects = organizationId ? allProjects.filter(p => p.parentId === organizationId) : allProjects;
+  const filteredProjects = await services.project.list({ organizationId });
 
   // match active project first, then look in rest
   const projectIds = new Set<string>();
diff --git a/packages/insomnia/src/common/organization-storage-rules.ts b/packages/insomnia/src/common/organization-storage-rules.ts
index e6076490c6..b907734845 100644
--- a/packages/insomnia/src/common/organization-storage-rules.ts
+++ b/packages/insomnia/src/common/organization-storage-rules.ts
@@ -34,7 +34,7 @@ export async function fetchAndCacheOrganizationStorageRule(
     }
   }
 
-  const { id: sessionId } = await services.userSession.getOrCreate();
+  const { id: sessionId } = await services.userSession.get();
 
   return await getOrganizationStorageRule({
     organizationId,
diff --git a/packages/insomnia/src/entry.main.ts b/packages/insomnia/src/entry.main.ts
index abe693822c..59adc61664 100644
--- a/packages/insomnia/src/entry.main.ts
+++ b/packages/insomnia/src/entry.main.ts
@@ -289,7 +289,7 @@ async function _createModelInstances() {
   await services.stats.get();
   await services.settings.getOrCreate();
   try {
-    const scratchpadProject = await services.project.getById(models.project.SCRATCHPAD_PROJECT_ID);
+    const scratchpadProject = await services.project.get(models.project.SCRATCHPAD_PROJECT_ID);
     const scratchPad = await services.workspace.getById(models.workspace.SCRATCHPAD_WORKSPACE_ID);
     if (!scratchpadProject) {
       console.log('[main] Initializing Scratch Pad Project');
diff --git a/packages/insomnia/src/insomnia-data/__tests__/request.test.ts b/packages/insomnia/src/insomnia-data/__tests__/request.test.ts
index e9da89d417..c641d16069 100644
--- a/packages/insomnia/src/insomnia-data/__tests__/request.test.ts
+++ b/packages/insomnia/src/insomnia-data/__tests__/request.test.ts
@@ -30,7 +30,6 @@ import { services } from '~/insomnia-data';
 // @vitest-environment jsdom
 describe('Request Model - Comprehensive Tests', () => {
   beforeEach(async () => {
-    await services.project.all();
     await services.settings.getOrCreate();
 
     // Create test project for all tests
diff --git a/packages/insomnia/src/insomnia-data/node-src/services/index.ts b/packages/insomnia/src/insomnia-data/node-src/services/index.ts
index f69c65abde..b53542b4f2 100644
--- a/packages/insomnia/src/insomnia-data/node-src/services/index.ts
+++ b/packages/insomnia/src/insomnia-data/node-src/services/index.ts
@@ -15,6 +15,7 @@ import * as mcpResponseService from './mcp-response';
 import * as mockRouteService from './mock-route';
 import * as mockServerService from './mock-server';
 import * as oAuth2TokenService from './o-auth-2-token';
+import * as organizationService from './organization';
 import * as pluginDataService from './plugin-data';
 import * as projectService from './project';
 import * as protoDirectoryService from './proto-directory';
@@ -59,6 +60,7 @@ export const servicesNodeImpl = {
   mcpRequest: mcpRequestService,
   mcpResponse: mcpResponseService,
   oAuth2Token: oAuth2TokenService,
+  organization: organizationService,
   pluginData: pluginDataService,
   protoDirectory: protoDirectoryService,
   protoFile: protoFileService,
diff --git a/packages/insomnia/src/insomnia-data/node-src/services/organization.ts b/packages/insomnia/src/insomnia-data/node-src/services/organization.ts
new file mode 100644
index 0000000000..48141388db
--- /dev/null
+++ b/packages/insomnia/src/insomnia-data/node-src/services/organization.ts
@@ -0,0 +1,60 @@
+import { getOrganizations, type Organization } from 'insomnia-api';
+
+import { models } from '~/insomnia-data';
+
+import * as userSessionService from './user-session';
+
+function sortOrganizations(accountId: string, organizations: Organization[]): Organization[] {
+  const home = organizations.find(
+    organization =>
+      models.organization.isPersonalOrganization(organization) &&
+      models.organization.isOwnerOfOrganization({
+        organization,
+        accountId,
+      }),
+  );
+  const myOrgs = organizations
+    .filter(
+      organization =>
+        !models.organization.isPersonalOrganization(organization) &&
+        models.organization.isOwnerOfOrganization({
+          organization,
+          accountId,
+        }),
+    )
+    .sort((a, b) => a.name.localeCompare(b.name));
+  const notMyOrgs = organizations
+    .filter(
+      organization =>
+        !models.organization.isOwnerOfOrganization({
+          organization,
+          accountId,
+        }),
+    )
+    .sort((a, b) => a.name.localeCompare(b.name));
+  return [...(home ? [home] : []), ...myOrgs, ...notMyOrgs];
+}
+
+/**
+ * List organizations from the Insomnia cloud API.
+ */
+export async function list(): Promise<Organization[]> {
+  const { id: sessionId, accountId } = await userSessionService.get();
+
+  if (!sessionId || !accountId) {
+    return [];
+  }
+
+  const result = await getOrganizations({ sessionId });
+  const organizations = result?.organizations ?? [];
+
+  return sortOrganizations(accountId, organizations);
+}
+
+/**
+ * Get a single organization by ID.
+ */
+export async function get(id: string): Promise<Organization | undefined> {
+  const all = await list();
+  return all.find(org => org.id === id);
+}
diff --git a/packages/insomnia/src/insomnia-data/node-src/services/project.ts b/packages/insomnia/src/insomnia-data/node-src/services/project.ts
index 41d57097ce..a6ca41a3b5 100644
--- a/packages/insomnia/src/insomnia-data/node-src/services/project.ts
+++ b/packages/insomnia/src/insomnia-data/node-src/services/project.ts
@@ -1,4 +1,4 @@
-import type { Project } from '~/insomnia-data';
+import type { Project, Query } from '~/insomnia-data';
 import { database as db, models } from '~/insomnia-data';
 
 const { type } = models.project;
@@ -7,30 +7,42 @@ export function create(patch: Partial<Project> = {}) {
   return db.docCreate<Project>(type, patch);
 }
 
-export function getById(_id: string) {
-  return db.findOne<Project>(type, { _id });
+export function list(options?: { gitRepositoryIds?: string[]; organizationId?: string }) {
+  const query: Query<Project> = {};
+  if (options?.organizationId) {
+    query.parentId = options.organizationId;
+  }
+  if (options?.gitRepositoryIds) {
+    const queryIds = options.gitRepositoryIds.flatMap(id => models.project.getQueryableGitRepositoryIds(id));
+    query.gitRepositoryId = { $in: queryIds };
+  }
+  return db.find<Project>(type, query);
+}
+
+export function get(id: string) {
+  return db.findOne<Project>(type, { _id: id });
 }
 
 export function getByRemoteId(remoteId: string) {
   return db.findOne<Project>(type, { remoteId });
 }
 
-export function getAllByGitRepositoryIds(gitRepositoryIds: string[]) {
-  const queryIds = gitRepositoryIds.flatMap(id => models.project.getQueryableGitRepositoryIds(id));
-  return db.find<Project>(type, {
-    gitRepositoryId: { $in: queryIds },
-  });
-}
+const getProjectByIdOrProject = async (idOrProject: string | Project) => {
+  const project = typeof idOrProject === 'string' ? await get(idOrProject) : idOrProject;
+  if (!project) {
+    throw new Error(
+      `Project not found: ${typeof idOrProject === 'string' ? idOrProject : `_id=${idOrProject._id}, name=${idOrProject.name}`}`,
+    );
+  }
+  return project;
+};
 
-export function remove(project: Project) {
-  return db.remove(project);
-}
-
-export function update(project: Project, patch: Partial<Project>) {
+export async function update(idOrProject: string | Project, patch: Partial<Project>) {
+  const project = await getProjectByIdOrProject(idOrProject);
   return db.docUpdate(project, patch);
 }
 
-export async function all() {
-  const projects = await db.find<Project>(type);
-  return projects;
+export async function remove(idOrProject: string | Project) {
+  const project = await getProjectByIdOrProject(idOrProject);
+  return db.remove(project);
 }
diff --git a/packages/insomnia/src/insomnia-data/node-src/services/user-session.ts b/packages/insomnia/src/insomnia-data/node-src/services/user-session.ts
index 7eac158caa..7d44e8e702 100644
--- a/packages/insomnia/src/insomnia-data/node-src/services/user-session.ts
+++ b/packages/insomnia/src/insomnia-data/node-src/services/user-session.ts
@@ -3,41 +3,23 @@ import { database as db, models } from '~/insomnia-data';
 
 const { type } = models.userSession;
 
-export async function all() {
-  let userList = await db.find<UserSession>(type);
-
-  if (userList?.length === 0) {
-    userList = [await getOrCreate()];
-  }
-
-  return userList;
-}
-
-async function create() {
-  const user = await db.docCreate<UserSession>(type);
-  return user;
-}
-
-export async function update(user: UserSession, patch: Partial<UserSession>) {
-  const updatedUser = await db.docUpdate<UserSession>(user, patch);
-  return updatedUser;
-}
-
-export async function patch(patch: Partial<UserSession>) {
-  const user = await getOrCreate();
-  const updatedUser = await db.docUpdate<UserSession>(user, patch);
-  return updatedUser;
-}
-
-export async function getOrCreate() {
+export async function get() {
   const result = await db.findOne<UserSession>(type);
 
   if (!result) {
-    return await create();
+    const user = await db.docCreate<UserSession>(type);
+    return user;
   }
   return result;
 }
 
-export async function get() {
-  return getOrCreate();
+export async function update(patch: Partial<UserSession>) {
+  const user = await get();
+  const updatedUser = await db.docUpdate<UserSession>(user, patch);
+  return updatedUser;
+}
+
+export async function remove() {
+  const user = await get();
+  await db.remove(user);
 }
diff --git a/packages/insomnia/src/main/__tests__/sync-initialization.test.ts b/packages/insomnia/src/main/__tests__/sync-initialization.test.ts
index 4aecefa039..477a57a8db 100644
--- a/packages/insomnia/src/main/__tests__/sync-initialization.test.ts
+++ b/packages/insomnia/src/main/__tests__/sync-initialization.test.ts
@@ -20,10 +20,10 @@ vi.mock('~/insomnia-data', () => ({
       getById: vi.fn(),
     },
     project: {
-      getById: vi.fn(),
+      get: vi.fn(),
     },
     userSession: {
-      getOrCreate: vi.fn(),
+      get: vi.fn(),
     },
     workspaceMeta: {
       getOrCreateByParentId: vi.fn(),
@@ -68,8 +68,8 @@ describe('sync-initialization', () => {
     vi.clearAllMocks();
 
     vi.mocked(services.workspace.getById).mockResolvedValue(workspace);
-    vi.mocked(services.project.getById).mockResolvedValue(project);
-    vi.mocked(services.userSession.getOrCreate).mockResolvedValue({ id: 'sess_123' } as any);
+    vi.mocked(services.project.get).mockResolvedValue(project);
+    vi.mocked(services.userSession.get).mockResolvedValue({ id: 'sess_123' } as any);
     vi.mocked(services.workspaceMeta.getOrCreateByParentId).mockResolvedValue({ gitRepositoryId: null } as any);
     vi.mocked(services.environment.getOrCreateForParentId).mockResolvedValue({} as any);
     vi.mocked(services.cookieJar.getOrCreateForParentId).mockResolvedValue({} as any);
@@ -83,7 +83,7 @@ describe('sync-initialization', () => {
   });
 
   it('returns early when initializing a workspace backend project without a session', async () => {
-    vi.mocked(services.userSession.getOrCreate).mockResolvedValue({ id: null } as any);
+    vi.mocked(services.userSession.get).mockResolvedValue({ id: null } as any);
 
     await initializeWorkspaceBackendProject({ workspaceId: workspace._id });
 
diff --git a/packages/insomnia/src/main/analytics.ts b/packages/insomnia/src/main/analytics.ts
index 59b47ec41e..dd71185315 100644
--- a/packages/insomnia/src/main/analytics.ts
+++ b/packages/insomnia/src/main/analytics.ts
@@ -63,7 +63,7 @@ export async function trackAnalyticsEvent(event: AnalyticsEvent, properties?: Re
     return;
   }
   const settings = await services.settings.getOrCreate();
-  const userSession = await services.userSession.getOrCreate();
+  const userSession = await services.userSession.get();
   if (!userSession?.hashedAccountId) {
     userSession.hashedAccountId = userSession?.accountId ? hashString(userSession.accountId) : '';
   }
@@ -105,7 +105,7 @@ export async function trackPageView(name: string) {
     return;
   }
   const settings = await services.settings.getOrCreate();
-  const userSession = await services.userSession.getOrCreate();
+  const userSession = await services.userSession.get();
   if (!userSession?.hashedAccountId) {
     userSession.hashedAccountId = userSession?.accountId ? hashString(userSession.accountId) : '';
   }
diff --git a/packages/insomnia/src/main/cloud-sync/initialization.ts b/packages/insomnia/src/main/cloud-sync/initialization.ts
index 436ae72ec5..19d341ef98 100644
--- a/packages/insomnia/src/main/cloud-sync/initialization.ts
+++ b/packages/insomnia/src/main/cloud-sync/initialization.ts
@@ -11,7 +11,7 @@ export const initializeWorkspaceBackendProject = async ({ workspaceId }: { works
   const workspace = await services.workspace.getById(workspaceId);
   invariant(workspace, 'Workspace not found');
 
-  const { id } = await services.userSession.getOrCreate();
+  const { id } = await services.userSession.get();
   if (!id) {
     return;
   }
@@ -32,10 +32,10 @@ export const syncNewWorkspaceIfNeeded = async ({ workspaceId }: { workspaceId: s
   const workspace = await services.workspace.getById(workspaceId);
   invariant(workspace, 'Workspace not found');
 
-  const project = await services.project.getById(workspace.parentId);
+  const project = await services.project.get(workspace.parentId);
   invariant(project, 'Project not found');
 
-  const userSession = await services.userSession.getOrCreate();
+  const userSession = await services.userSession.get();
   if (!userSession.id || !models.project.isRemoteProject(project)) {
     return;
   }
diff --git a/packages/insomnia/src/main/git-service.ts b/packages/insomnia/src/main/git-service.ts
index 6b85b60012..58c56d1715 100644
--- a/packages/insomnia/src/main/git-service.ts
+++ b/packages/insomnia/src/main/git-service.ts
@@ -216,7 +216,7 @@ async function getGitRepository({ projectId, workspaceId }: { projectId: string;
   }
 
   invariant(projectId, 'Project ID is required');
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found');
   invariant(models.project.isConnectedGitProject(project), 'Project is not linked to a git repository');
   const repoId = models.project.getEffectiveRepoId(project);
@@ -290,7 +290,7 @@ export async function getProjectGitFileIssues({
   workspaceId,
   gitRepositoryId,
 }: GetProjectGitFileIssuesOptions): Promise<WorkspaceFileIssue[]> {
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   if (!project || !models.project.isConnectedGitProject(project)) {
     return [];
   }
@@ -1157,7 +1157,7 @@ export const cloneGitRepoAction = async ({
 
       async function getProject() {
         if (cloneIntoProjectId) {
-          const project = await services.project.getById(cloneIntoProjectId);
+          const project = await services.project.get(cloneIntoProjectId);
           invariant(project, 'Project not found');
 
           await services.project.update(project, {
@@ -1242,7 +1242,7 @@ export const cloneGitRepoAction = async ({
       };
     }
 
-    const project = await services.project.getById(projectId);
+    const project = await services.project.get(projectId);
     invariant(project, 'Project not found');
 
     trackAnalyticsEvent(AnalyticsEvent.vcsSyncStart, {
@@ -1359,7 +1359,7 @@ export const cloneGitRepoAction = async ({
       const existingWorkspace = await services.workspace.getById(workspace._id);
 
       if (existingWorkspace) {
-        const project = await services.project.getById(existingWorkspace.parentId);
+        const project = await services.project.get(existingWorkspace.parentId);
         if (!project) {
           return {
             errors: [
@@ -1469,7 +1469,7 @@ export const updateGitRepoAction = async ({
       const workspaceMeta = await services.workspaceMeta.getByParentId(workspaceId);
       gitRepositoryId = workspaceMeta?.gitRepositoryId;
     } else if (projectId) {
-      const project = await services.project.getById(projectId);
+      const project = await services.project.get(projectId);
       invariant(project, 'Project not found');
       gitRepositoryId = project.gitRepositoryId;
     }
@@ -1497,7 +1497,7 @@ export const updateGitRepoAction = async ({
         gitRepositoryId: gitRepository._id,
       });
     } else if (projectId) {
-      const project = await services.project.getById(projectId);
+      const project = await services.project.get(projectId);
       invariant(project, 'Project not found');
       await services.project.update(project, {
         gitRepositoryId: models.project.toProtectedRepoId(gitRepository._id),
@@ -1557,7 +1557,7 @@ export const resetGitRepoAction = async ({ projectId, workspaceId }: { projectId
       gitRepositoryId: null,
     });
   } else if (projectId) {
-    const project = await services.project.getById(projectId);
+    const project = await services.project.get(projectId);
     invariant(project, 'Project not found');
     await services.project.update(project, {
       gitRepositoryId: models.project.EMPTY_GIT_PROJECT_ID,
@@ -2679,7 +2679,7 @@ const getRepositoryDirectoryTree = async ({
   repositoryTree: FileTree;
   folderList: Record<string, string[]>;
 }> => {
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
 
   if (project && models.project.isEmptyGitProject(project)) {
     return {
@@ -2893,7 +2893,7 @@ export async function runAllGitRepoMigrations(): Promise<MigrationSummary> {
   const logs: string[] = [];
   const failedProjects: { id: string; name: string }[] = [];
 
-  const allProjects = await services.project.all();
+  const allProjects = await services.project.list();
   const gitProjects = allProjects.filter((p): p is GitProject => models.project.isConnectedGitProject(p));
 
   if (gitProjects.length === 0) return { logs, failedProjects, totalProjects: 0 };
@@ -2947,7 +2947,7 @@ export async function runAllGitRepoMigrations(): Promise<MigrationSummary> {
     failedProjects.map(async ({ id, name }) => {
       logs.push(`${ts()} [INFO] ["${name}"] Converting to local project`);
       try {
-        const project = await services.project.getById(id);
+        const project = await services.project.get(id);
         if (!project || !models.project.isConnectedGitProject(project)) {
           logs.push(`${ts()} [WARN] ["${name}"] Project not found or already local — skipping`);
           return;
diff --git a/packages/insomnia/src/network/__tests__/network.test.ts b/packages/insomnia/src/network/__tests__/network.test.ts
index f3815d583b..0c8a1d3ca2 100644
--- a/packages/insomnia/src/network/__tests__/network.test.ts
+++ b/packages/insomnia/src/network/__tests__/network.test.ts
@@ -35,10 +35,6 @@ describe('getAuthQueryParams', () => {
   });
 });
 describe('sendCurlAndWriteTimeline()', () => {
-  beforeEach(async () => {
-    await services.project.all();
-  });
-
   it('sends a generic request', async () => {
     const workspace = await services.workspace.create();
     const settings = await services.settings.getOrCreate();
diff --git a/packages/insomnia/src/root.tsx b/packages/insomnia/src/root.tsx
index 6561671d0f..9fa80a6f1d 100644
--- a/packages/insomnia/src/root.tsx
+++ b/packages/insomnia/src/root.tsx
@@ -161,7 +161,7 @@ export const useRootLoaderData = () => {
 export async function clientLoader(_args: Route.ClientLoaderArgs) {
   const settings = await services.settings.get();
   const workspaceCount = await services.workspace.count();
-  const userSession = await services.userSession.getOrCreate();
+  const userSession = await services.userSession.get();
   const cloudCredentials = await services.cloudCredential.all();
 
   return {
@@ -387,7 +387,7 @@ const Root = () => {
           );
         }
 
-        const userSession = await services.userSession.getOrCreate();
+        const userSession = await services.userSession.get();
         if (!userSession.id) {
           window.sessionStorage.setItem('pendingDeepLinkAfterAuthorize', url);
           window.localStorage.setItem('logoutMessage', 'Please log in to import this resource.');
@@ -516,7 +516,7 @@ const Root = () => {
       if (urlWithoutParams === 'insomnia://app/open/organization') {
         // if user is logged out, navigate to authorize instead
         // gracefully handle open org in app from browser
-        const userSession = await services.userSession.getOrCreate();
+        const userSession = await services.userSession.get();
         if (!userSession.id || userSession.id === '') {
           const url = new URL(getLoginUrl());
           window.main.openInBrowser(url.toString());
diff --git a/packages/insomnia/src/routes/auth.authorize.tsx b/packages/insomnia/src/routes/auth.authorize.tsx
index d15f20a581..a7532fce33 100644
--- a/packages/insomnia/src/routes/auth.authorize.tsx
+++ b/packages/insomnia/src/routes/auth.authorize.tsx
@@ -36,14 +36,14 @@ export async function clientAction({ request }: Route.ClientActionArgs) {
     event: AnalyticsEvent.loginSuccess,
   });
   window.localStorage.setItem('hasUserLoggedInBefore', 'true');
-  const userSession = await services.userSession.getOrCreate();
+  const userSession = await services.userSession.get();
   const { accountId, id: sessionId } = userSession;
   try {
     // check vault salt exists in server
     const { salt: vaultSalt } = await getVault({ sessionId });
     if (vaultSalt) {
       // save vault salt to session
-      await services.userSession.update(userSession, { vaultSalt });
+      await services.userSession.update({ vaultSalt });
       // get vault key saved in local
       const localVaultKey = await getVaultKeyFromStorage(accountId);
       if (localVaultKey) {
@@ -52,7 +52,7 @@ export async function clientAction({ request }: Route.ClientActionArgs) {
         if (validateResult) {
           // Encrypt vault key and save encrypted vault key & raw vault salt to session
           const encryptedVaultKey = await window.main.secretStorage.encryptString(localVaultKey);
-          await services.userSession.update(userSession, { vaultKey: encryptedVaultKey, vaultSalt });
+          await services.userSession.update({ vaultKey: encryptedVaultKey, vaultSalt });
         }
       }
     }
diff --git a/packages/insomnia/src/routes/auth.clear-vault-key.tsx b/packages/insomnia/src/routes/auth.clear-vault-key.tsx
index 5ec363e44e..eede8df665 100644
--- a/packages/insomnia/src/routes/auth.clear-vault-key.tsx
+++ b/packages/insomnia/src/routes/auth.clear-vault-key.tsx
@@ -10,7 +10,7 @@ import type { Route } from './+types/auth.clear-vault-key';
 export async function clientAction({ request }: Route.ClientActionArgs) {
   const { organizations = [], sessionId: resetVaultClientSessionId } = await request.json();
 
-  const userSession = await services.userSession.getOrCreate();
+  const userSession = await services.userSession.get();
   const { id: sessionId } = userSession;
   const { salt: newVaultSalt } =
     (await getVault({ sessionId }).catch(error => {
@@ -21,7 +21,7 @@ export async function clientAction({ request }: Route.ClientActionArgs) {
     // remove all secret environment variables
     await services.environment.removeAllSecrets(organizations);
     // Update vault salt and delete vault key from session
-    await services.userSession.update(userSession, { vaultSalt: newVaultSalt, vaultKey: '' });
+    await services.userSession.update({ vaultSalt: newVaultSalt, vaultKey: '' });
     // show notification
     electron.ipcRenderer.emit('show-toast', null, {
       content: {
diff --git a/packages/insomnia/src/routes/auth.update-vault-salt.tsx b/packages/insomnia/src/routes/auth.update-vault-salt.tsx
index 0255c9aa28..b6a9340ccb 100644
--- a/packages/insomnia/src/routes/auth.update-vault-salt.tsx
+++ b/packages/insomnia/src/routes/auth.update-vault-salt.tsx
@@ -6,11 +6,11 @@ import { createFetcherSubmitHook } from '~/utils/router';
 
 export async function clientAction(_args: ActionFunctionArgs) {
   try {
-    const userSession = await services.userSession.getOrCreate();
+    const userSession = await services.userSession.get();
     const { id: sessionId } = userSession;
     const { salt: vaultSalt } = await getVault({ sessionId });
     if (vaultSalt) {
-      await services.userSession.update(userSession, { vaultSalt });
+      await services.userSession.update({ vaultSalt });
       return vaultSalt;
     }
   } catch (error) {
diff --git a/packages/insomnia/src/routes/auth.validate-vault-key.tsx b/packages/insomnia/src/routes/auth.validate-vault-key.tsx
index 6790065def..1da944e1ca 100644
--- a/packages/insomnia/src/routes/auth.validate-vault-key.tsx
+++ b/packages/insomnia/src/routes/auth.validate-vault-key.tsx
@@ -6,7 +6,7 @@ import { createFetcherSubmitHook } from '~/utils/router';
 
 export async function clientAction({ request }: ActionFunctionArgs) {
   const { vaultKey, saveVaultKey: saveVaultKeyLocally = false } = await request.json();
-  const userSession = await services.userSession.getOrCreate();
+  const userSession = await services.userSession.get();
   const { vaultSalt, accountId } = userSession;
 
   if (!vaultSalt) {
diff --git a/packages/insomnia/src/routes/commands.tsx b/packages/insomnia/src/routes/commands.tsx
index c0a3a0a6e3..f71a1aef12 100644
--- a/packages/insomnia/src/routes/commands.tsx
+++ b/packages/insomnia/src/routes/commands.tsx
@@ -38,7 +38,7 @@ export async function clientLoader(args: Route.ClientLoaderArgs) {
     );
   };
 
-  const { accountId } = await services.userSession.getOrCreate();
+  const { accountId } = await services.userSession.get();
 
   const allOrganizations = JSON.parse(localStorage.getItem(`${accountId}:organizations`) || '[]') as Organization[];
 
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 2992a99bec..bd97a968d4 100644
--- a/packages/insomnia/src/routes/git-credentials.$id.related-projects.tsx
+++ b/packages/insomnia/src/routes/git-credentials.$id.related-projects.tsx
@@ -12,7 +12,7 @@ export async function clientLoader({ params }: Route.ClientLoaderArgs) {
 
   const gitRepositoryIds = relatedGitRepositories.map(repo => repo._id);
 
-  const relatedProjects = await services.project.getAllByGitRepositoryIds(gitRepositoryIds);
+  const relatedProjects = await services.project.list({ gitRepositoryIds });
 
   return {
     projects: relatedProjects,
diff --git a/packages/insomnia/src/routes/git.all-connected-repos.tsx b/packages/insomnia/src/routes/git.all-connected-repos.tsx
index 2f9749865f..5b4762d307 100644
--- a/packages/insomnia/src/routes/git.all-connected-repos.tsx
+++ b/packages/insomnia/src/routes/git.all-connected-repos.tsx
@@ -7,7 +7,7 @@ import { models, services } from '~/insomnia-data';
 import { createFetcherLoadHook } from '~/utils/router';
 
 export async function clientLoader() {
-  const { accountId } = await services.userSession.getOrCreate();
+  const { accountId } = await services.userSession.get();
   const organizations = JSON.parse(localStorage.getItem(`${accountId}:organizations`) || '[]') as Organization[];
   const allProjects = (
     await Promise.all(
diff --git a/packages/insomnia/src/routes/import.resources.tsx b/packages/insomnia/src/routes/import.resources.tsx
index 232ee26a27..92c73befb1 100644
--- a/packages/insomnia/src/routes/import.resources.tsx
+++ b/packages/insomnia/src/routes/import.resources.tsx
@@ -35,7 +35,7 @@ export const importScannedResources = async ({
   invariant(organizationId && typeof organizationId === 'string', 'OrganizationId is required.');
   invariant(projectId && typeof projectId === 'string', 'ProjectId is required.');
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found.');
 
   return await (typeof workspaceId === 'string' && workspaceId
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 6cd137af9d..ec19c2ed8f 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
@@ -10,7 +10,7 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
   const { organizationId, invitationId } = params;
 
   try {
-    const user = await services.userSession.getOrCreate();
+    const user = await services.userSession.get();
     const sessionId = user.id;
 
     const response = await reinvite({
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 e236906471..c27bcdfabd 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.tsx
@@ -16,7 +16,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
   invariant(typeof roleId === 'string', 'Role ID is required');
 
   try {
-    const user = await services.userSession.getOrCreate();
+    const user = await services.userSession.get();
     const sessionId = user.id;
 
     const response = await updateInvitationRole({
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 5f3201d63e..50aa9188b4 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.members.$userId.roles.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.members.$userId.roles.tsx
@@ -16,7 +16,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
   invariant(typeof roleId === 'string', 'Role ID is required');
 
   try {
-    const user = await services.userSession.getOrCreate();
+    const user = await services.userSession.get();
     const sessionId = user.id;
     const response = await updateUserRoles({
       organizationId,
diff --git a/packages/insomnia/src/routes/organization.$organizationId.permissions.tsx b/packages/insomnia/src/routes/organization.$organizationId.permissions.tsx
index c0f9f61db3..a75245ce06 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.permissions.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.permissions.tsx
@@ -26,7 +26,7 @@ export const fallbackBilling = Object.freeze<Billing>({
 
 export async function clientLoader({ params }: Route.ClientLoaderArgs) {
   const { organizationId } = params;
-  const { id: sessionId, accountId } = await services.userSession.getOrCreate();
+  const { id: sessionId, accountId } = await services.userSession.get();
 
   if (models.organization.isScratchpadOrganizationId(organizationId)) {
     return {
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 724421afd7..717c790a40 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx
@@ -253,7 +253,7 @@ async function getAllLocalFiles({ projectId }: { projectId: string }) {
 
 async function getAllRemoteFiles({ projectId, organizationId }: { projectId: string; organizationId: string }) {
   try {
-    const project = await services.project.getById(projectId);
+    const project = await services.project.get(projectId);
 
     const remoteId = project?.remoteId;
     if (!remoteId) {
@@ -359,7 +359,7 @@ const CheckAllProjectSyncStatus = async (projects: Project[]) => {
 export async function clientLoader({ params }: LoaderFunctionArgs) {
   const { organizationId, projectId } = params;
   invariant(organizationId, 'Organization ID is required');
-  const { id: sessionId } = await services.userSession.getOrCreate();
+  const { id: sessionId } = await services.userSession.get();
   const fallbackLearningFeature = {
     active: false,
     title: '',
@@ -389,7 +389,7 @@ export async function clientLoader({ params }: LoaderFunctionArgs) {
 
   invariant(projectId, 'projectId parameter is required');
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   console.log('[project loader] Loading project:', project?.name, projectId);
   const [localFiles, organizationProjects = []] = await Promise.all([
     getAllLocalFiles({ projectId }),
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 787d4cf1aa..5b4cb9ad92 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete.tsx
@@ -14,10 +14,10 @@ export async function clientAction({ params }: Route.ClientActionArgs) {
   const { organizationId, projectId } = params;
   invariant(organizationId, 'Organization ID is required');
   invariant(projectId, 'Project ID is required');
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found');
 
-  const user = await services.userSession.getOrCreate();
+  const user = await services.userSession.get();
   const sessionId = user.id;
   invariant(sessionId, 'User must be logged in to delete a project');
 
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.list-workspaces.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.list-workspaces.tsx
index 074dfa1132..ba06aecdf0 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.list-workspaces.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.list-workspaces.tsx
@@ -113,7 +113,7 @@ async function getAllLocalFiles({ projectId }: { projectId: string }) {
 export async function clientLoader({ params }: Route.ClientLoaderArgs) {
   const { organizationId, projectId } = params;
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, `Project was not found ${projectId}`);
   const organizationProjects =
     (await database.find<Project>(models.project.type, {
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move-workspace.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move-workspace.tsx
index 5cc4e0fd18..822dd1e5a5 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move-workspace.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move-workspace.tsx
@@ -11,7 +11,7 @@ export async function clientAction({ request }: Route.ClientActionArgs) {
   const projectId = formData.get('projectId');
   const workspaceId = formData.get('workspaceId');
   invariant(typeof projectId === 'string', 'Project ID is required');
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found');
 
   invariant(typeof workspaceId === 'string', 'Workspace ID is required');
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move.tsx
index f0513f0c6c..bdfd0e49f7 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move.tsx
@@ -14,7 +14,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
 
   invariant(typeof organizationId === 'string', 'Organization ID is required');
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found');
 
   await services.project.update(project, {
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx
index a6c9faf09a..fe7f1a0cd1 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx
@@ -10,7 +10,7 @@ export async function clientLoader({ params }: Route.ClientLoaderArgs) {
   const { organizationId, projectId } = params;
   invariant(projectId, 'Project ID is required');
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
 
   if (!project) {
     return redirect(href('/organization/:organizationId', { organizationId }));
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 2f34b2def8..d2a63e1600 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx
@@ -36,13 +36,13 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
 
   const { organizationId, projectId } = params;
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found');
 
   const effectiveRepoId = models.project.isGitProject(project) ? models.project.getEffectiveRepoId(project) : null;
   const gitRepository = effectiveRepoId ? await services.gitRepository.getById(effectiveRepoId) : null;
 
-  const user = await services.userSession.getOrCreate();
+  const user = await services.userSession.get();
   const sessionId = user.id;
 
   try {
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.grant-access.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.grant-access.tsx
index d45194c9ff..5cdd5d669e 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.grant-access.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.grant-access.tsx
@@ -19,7 +19,7 @@ export async function clientAction({ params, request }: Route.ClientActionArgs)
     return;
   }
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found for request');
   if (accessLevel === 'project') {
     await services.project.update(project, { mcpStdioAccess: true });
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 fdcb54b6fd..32f862b448 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
@@ -158,7 +158,7 @@ export async function clientLoader({ params, request }: Route.ClientLoaderArgs)
   if (!params.requestId && !params.requestGroupId) {
     const { projectId, workspaceId, organizationId } = params;
 
-    const activeProject = await services.project.getById(projectId);
+    const activeProject = await services.project.get(projectId);
     if (!activeProject) {
       showResourceNotFoundToast(`Project not found: ${projectId}`);
       throw redirect(href('/organization/:organizationId/project', { organizationId }));
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 80bf9f41a5..2290dd3c9c 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
@@ -22,7 +22,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
   try {
     await window.main.sync.takeSnapshot(data.message);
     if (data.push) {
-      const project = await services.project.getById(projectId);
+      const project = await services.project.get(projectId);
       invariant(project, 'Project not found');
       invariant(project.remoteId, 'Project is not remote');
 
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 739cca6cd6..15184fff6f 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
@@ -10,7 +10,7 @@ import type { Route } from './+types/organization.$organizationId.project.$proje
 export async function clientAction({ request, params }: Route.ClientActionArgs) {
   const { projectId } = params;
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found');
 
   const formData = await request.formData();
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 759e0927e5..f331b770f6 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
@@ -12,7 +12,7 @@ import type { Route } from './+types/organization.$organizationId.project.$proje
 export async function clientAction({ params }: Route.ClientActionArgs) {
   const { projectId, workspaceId } = params;
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found');
   const { syncItems } = await getSyncItems({ workspaceId });
   try {
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 5afad71e72..599d8a8a64 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
@@ -11,7 +11,7 @@ import type { Route } from './+types/organization.$organizationId.project.$proje
 export async function clientAction({ params }: Route.ClientActionArgs) {
   const { projectId, workspaceId } = params;
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found');
   invariant(project.remoteId, 'Project is not remote');
 
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 fbe7b1af67..60fb4d0957 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
@@ -10,7 +10,7 @@ import type { Route } from './+types/organization.$organizationId.project.$proje
 export async function clientLoader({ params }: Route.ClientLoaderArgs) {
   const { projectId, workspaceId } = params;
   try {
-    const project = await services.project.getById(projectId);
+    const project = await services.project.get(projectId);
     invariant(project, 'Project not found');
     invariant(project.remoteId, 'Project is not remote');
     const { syncItems } = await getSyncItems({ workspaceId });
@@ -68,7 +68,7 @@ export async function clientLoader({ params }: Route.ClientLoaderArgs) {
 
 export async function clientAction({ params }: Route.ClientActionArgs) {
   const { projectId, workspaceId } = params;
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found');
   invariant(project.remoteId, 'Project is not remote');
 
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.tsx
index 46fc520e9b..34e8a0962c 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.tsx
@@ -13,7 +13,7 @@ export async function clientLoader({ params }: Route.ClientLoaderArgs) {
   invariant(typeof projectId === 'string', 'Project Id is required');
 
   try {
-    const project = await services.project.getById(projectId);
+    const project = await services.project.get(projectId);
     invariant(project, 'Project not found');
 
     const remoteId = project.remoteId;
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mcp.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mcp.tsx
index 0f72b04d1d..525c1625b4 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mcp.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mcp.tsx
@@ -14,7 +14,7 @@ import { useWorkspaceLoaderData } from './organization.$organizationId.project.$
 export async function clientLoader({ params }: Route.ClientLoaderArgs) {
   const { projectId, workspaceId, organizationId } = params;
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   if (!project) {
     showResourceNotFoundToast(`Project not found: ${projectId}`);
     throw redirect(href('/organization/:organizationId/project', { organizationId }));
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx
index ffbffa98c3..1db8594248 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx
@@ -11,7 +11,7 @@ import type { Route } from './+types/organization.$organizationId.project.$proje
 export async function clientAction({ params }: Route.ClientActionArgs) {
   const { organizationId, projectId, workspaceId } = params;
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found');
 
   const workspace = await services.workspace.getById(workspaceId);
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx
index f39f81008f..f240130734 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx
@@ -59,7 +59,7 @@ export interface MockServerLoaderData {
 export async function clientLoader({ params }: Route.ClientLoaderArgs) {
   const { workspaceId, projectId, organizationId } = params;
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   if (!project) {
     showResourceNotFoundToast(`Project not found: ${projectId}`);
     throw redirect(href('/organization/:organizationId/project', { organizationId }));
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 a31bee0c7a..7c68d3fad8 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
@@ -12,7 +12,7 @@ import type { Route } from './+types/organization.$organizationId.project.$proje
 export async function clientAction({ params }: Route.ClientActionArgs) {
   const { organizationId, projectId, workspaceId } = params;
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found');
 
   const apiSpec = await services.apiSpec.getByParentId(workspaceId);
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 8768b18cb0..089f07227d 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
@@ -62,7 +62,7 @@ import type { Route } from './+types/organization.$organizationId.project.$proje
 export async function clientLoader({ params }: Route.ClientLoaderArgs) {
   const { organizationId, projectId, workspaceId } = params;
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   if (!project) {
     showResourceNotFoundToast(`Project not found: ${projectId}`);
     throw redirect(href('/organization/:organizationId/project', { organizationId }));
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 0cfc287f45..56622533e1 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
@@ -87,7 +87,7 @@ const workspaceFileIssueModalText = {
 export async function clientLoader({ params, request }: Route.ClientLoaderArgs) {
   const { organizationId, projectId, workspaceId } = params;
 
-  const activeProject = await services.project.getById(projectId);
+  const activeProject = await services.project.get(projectId);
   if (!activeProject) {
     showResourceNotFoundToast(`Project not found: ${projectId}`);
     throw redirect(href('/organization/:organizationId/project', { organizationId }));
@@ -280,7 +280,7 @@ export async function clientLoader({ params, request }: Route.ClientLoaderArgs)
     return collection;
   }
 
-  const userSession = await services.userSession.getOrCreate();
+  const userSession = await services.userSession.get();
   const isLoggedInIsCloudProjectAndIsNotGitRepo = userSession.id && activeProject.remoteId && !gitRepository;
   let vcsVersion = null;
   if (isLoggedInIsCloudProjectAndIsNotGitRepo) {
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 328fa2c992..8e3d9058e2 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
@@ -60,7 +60,7 @@ async function deleteWorkspace(workspace: Workspace | null, project: Project | n
 export async function clientAction({ request, params }: Route.ClientActionArgs) {
   const { organizationId, projectId } = params;
 
-  const project = await services.project.getById(projectId);
+  const project = await services.project.get(projectId);
   invariant(project, 'Project not found');
   const formData = await request.formData();
 
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.move.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.move.tsx
index f70dd75393..c9aa912ef5 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.move.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.move.tsx
@@ -26,7 +26,7 @@ export async function clientAction({ request }: Route.ClientActionArgs) {
     invariant(oldWorkspace, 'Workspace not found');
 
     // duplicate the workspace to the new project
-    const newProject = (await services.project.getById(newProjectId)) as Project;
+    const newProject = (await services.project.get(newProjectId)) as Project;
     const workspaceExport = await getInsomniaV5DataExport({
       workspaceId: oldWorkspace._id,
       includePrivateEnvironments: true,
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 52dfd3f685..947575f8f1 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
@@ -37,7 +37,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
   const { organizationId, projectId } = params;
   try {
     const workspaceData = (await request.json()) as NewWorkspaceData;
-    const project = await services.project.getById(projectId);
+    const project = await services.project.get(projectId);
 
     invariant(project, 'Project not found');
 
@@ -156,7 +156,7 @@ export async function clientAction({ request, params }: Route.ClientActionArgs)
 
     await database.flushChanges(flushId);
 
-    const { id } = await services.userSession.getOrCreate();
+    const { id } = await services.userSession.get();
     if (
       id &&
       !workspaceMeta.gitRepositoryId &&
@@ -336,7 +336,7 @@ async function createMockServer(
         return result.error;
       }
 
-      const { id: sessionId } = await services.userSession.getOrCreate();
+      const { id: sessionId } = await services.userSession.get();
       await createMockRoutes(result.routes, mockServer, sessionId, organizationId);
     }
 
@@ -344,7 +344,7 @@ async function createMockServer(
 
     const generationDurationMs = Date.now() - generationStartTime;
 
-    const { id } = await services.userSession.getOrCreate();
+    const { id } = await services.userSession.get();
     if (id && !workspaceMeta.gitRepositoryId) {
       await window.main.initializeWorkspaceBackendProject({
         workspaceId: workspace._id,
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 7e50a8e91f..f03892b3c4 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
@@ -62,7 +62,7 @@ export async function clientAction({ request }: Route.ClientActionArgs) {
 
   await services.workspace.update(workspace, patch);
 
-  const project = await services.project.getById(workspace.parentId);
+  const project = await services.project.get(workspace.parentId);
   invariant(project, 'Project not found');
   if (models.project.isGitProject(project)) {
     const workspaceMeta = await services.workspaceMeta.getOrCreateByParentId(workspace._id);
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx
index da9ab36a28..145efa2b4d 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx
@@ -32,7 +32,7 @@ export async function clientLoader({ params }: LoaderFunctionArgs) {
   const { organizationId } = params;
   invariant(organizationId, 'Organization ID is required');
 
-  const { id: sessionId } = await services.userSession.getOrCreate();
+  const { id: sessionId } = await services.userSession.get();
 
   if (!sessionId) {
     await logout();
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx
index 4be7aff472..da3098da94 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx
@@ -53,7 +53,7 @@ export const reportGitProjectCount = async (organizationId: string, sessionId: s
 };
 
 const createProjectImpl = async (organizationId: string, newProjectData: CreateProjectData) => {
-  const user = await services.userSession.getOrCreate();
+  const user = await services.userSession.get();
   const sessionId = user.id;
   invariant(sessionId, 'User must be logged in to create a project');
 
diff --git a/packages/insomnia/src/routes/organization._index.tsx b/packages/insomnia/src/routes/organization._index.tsx
index bd9e4563aa..1d3b8f16a6 100644
--- a/packages/insomnia/src/routes/organization._index.tsx
+++ b/packages/insomnia/src/routes/organization._index.tsx
@@ -9,7 +9,7 @@ import { invariant } from '~/utils/invariant';
 import type { Route } from './+types/organization._index';
 
 export async function clientLoader(_args: Route.ClientLoaderArgs) {
-  const { id: sessionId, accountId } = await services.userSession.getOrCreate();
+  const { id: sessionId, accountId } = await services.userSession.get();
   if (sessionId) {
     await syncOrganizations(sessionId, accountId);
 
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 45290acded..e310d9f117 100644
--- a/packages/insomnia/src/routes/organization.sync-organizations-and-projects.tsx
+++ b/packages/insomnia/src/routes/organization.sync-organizations-and-projects.tsx
@@ -23,7 +23,7 @@ export async function clientAction({ request }: Route.ClientActionArgs) {
       projectId,
       asyncTaskList = [],
     } = (await request.json()) as SyncOrgsAndProjectsActionRequest;
-    const { id: sessionId, accountId } = await services.userSession.getOrCreate();
+    const { id: sessionId, accountId } = await services.userSession.get();
 
     const taskPromiseList = [];
     if (asyncTaskList.includes(AsyncTask.SyncOrganization)) {
diff --git a/packages/insomnia/src/routes/organization.sync.tsx b/packages/insomnia/src/routes/organization.sync.tsx
index e5ccff29ac..c3656e666f 100644
--- a/packages/insomnia/src/routes/organization.sync.tsx
+++ b/packages/insomnia/src/routes/organization.sync.tsx
@@ -5,7 +5,7 @@ import { createFetcherSubmitHook } from '~/utils/router';
 import type { Route } from './+types/organization.sync';
 
 export async function clientAction(_args: Route.ClientActionArgs) {
-  const { id: sessionId, accountId } = await services.userSession.getOrCreate();
+  const { id: sessionId, accountId } = await services.userSession.get();
 
   if (sessionId) {
     await syncOrganizations(sessionId, accountId);
diff --git a/packages/insomnia/src/routes/organization.tsx b/packages/insomnia/src/routes/organization.tsx
index c93389218f..48ee45cf6c 100644
--- a/packages/insomnia/src/routes/organization.tsx
+++ b/packages/insomnia/src/routes/organization.tsx
@@ -41,7 +41,6 @@ import { InsomniaTabProvider } from '~/ui/context/app/insomnia-tab-context';
 import { RunnerProvider } from '~/ui/context/app/runner-context';
 import { useCloseConnection } from '~/ui/hooks/use-close-connection';
 import { useOrganizationPermissions } from '~/ui/hooks/use-organization-features';
-import { sortOrganizations } from '~/ui/organization-utils';
 import { AsyncTask, getInitialRouteForOrganization } from '~/utils/router';
 
 import type { Route } from './+types/organization';
@@ -53,13 +52,13 @@ export interface OrganizationLoaderData {
 }
 
 export async function clientLoader(_args: Route.ClientLoaderArgs) {
-  const { id, accountId } = await services.userSession.getOrCreate();
+  const { id, accountId } = await services.userSession.get();
   if (id) {
     const organizations = JSON.parse(localStorage.getItem(`${accountId}:organizations`) || '[]') as Organization[];
     const user = JSON.parse(localStorage.getItem(`${accountId}:user`) || '{}') as User;
     const currentPlan = JSON.parse(localStorage.getItem(`${accountId}:currentPlan`) || '{}') as CurrentPlan;
     return {
-      organizations: sortOrganizations(accountId, organizations),
+      organizations,
       user,
       currentPlan,
     };
diff --git a/packages/insomnia/src/routes/untracked-projects.tsx b/packages/insomnia/src/routes/untracked-projects.tsx
index c11093623f..1134d19da2 100644
--- a/packages/insomnia/src/routes/untracked-projects.tsx
+++ b/packages/insomnia/src/routes/untracked-projects.tsx
@@ -12,7 +12,7 @@ export interface UntrackedProjectsLoaderData {
 }
 
 export async function clientLoader(_args: Route.ClientLoaderArgs) {
-  const { accountId } = await services.userSession.getOrCreate();
+  const { accountId } = await services.userSession.get();
   const organizations = JSON.parse(localStorage.getItem(`${accountId}:organizations`) || '[]') as Organization[];
   const listOfOrganizationIds = [...organizations.map(o => o.id), models.organization.SCRATCHPAD_ORGANIZATION_ID];
 
diff --git a/packages/insomnia/src/templating/utils.ts b/packages/insomnia/src/templating/utils.ts
index 74c77f8350..2682b9b736 100644
--- a/packages/insomnia/src/templating/utils.ts
+++ b/packages/insomnia/src/templating/utils.ts
@@ -243,7 +243,7 @@ export async function maskOrDecryptVaultDataIfNecessary(vaultEnvironmentData: an
   const shouldDecrypt = renderPurpose === 'preview' || renderPurpose === 'send' || renderPurpose === 'script';
   if (typeof vaultEnvironmentData === 'object') {
     if (shouldDecrypt) {
-      const { vaultKey, vaultSalt } = await services.userSession.getOrCreate();
+      const { vaultKey, vaultSalt } = await services.userSession.get();
       const isVaultEnabled = !!vaultSalt;
       if (isVaultEnabled && vaultKey) {
         const symmetricKey = (await decryptVaultKeyFromSession(vaultKey, true)) as JsonWebKey;
diff --git a/packages/insomnia/src/ui/components/modals/__tests__/import-export.test.ts b/packages/insomnia/src/ui/components/modals/__tests__/import-export.test.ts
index 53419a1919..a130479a91 100644
--- a/packages/insomnia/src/ui/components/modals/__tests__/import-export.test.ts
+++ b/packages/insomnia/src/ui/components/modals/__tests__/import-export.test.ts
@@ -6,7 +6,6 @@ import { database as db, services } from '~/insomnia-data';
 // @vitest-environment jsdom
 describe('exportWorkspacesHAR() and exportRequestsHAR()', () => {
   beforeEach(async () => {
-    await services.project.all();
     await services.settings.getOrCreate();
   });
 
diff --git a/packages/insomnia/src/ui/organization-utils.ts b/packages/insomnia/src/ui/organization-utils.ts
index b37791f35c..60fc5d2947 100644
--- a/packages/insomnia/src/ui/organization-utils.ts
+++ b/packages/insomnia/src/ui/organization-utils.ts
@@ -1,12 +1,4 @@
-import {
-  createTeamProject,
-  fetchTeamProjects,
-  getCurrentPlan,
-  getOrganizations,
-  getUserProfile,
-  isApiError,
-  type Organization,
-} from 'insomnia-api';
+import { createTeamProject, fetchTeamProjects, getCurrentPlan, getUserProfile, isApiError } from 'insomnia-api';
 
 import { projectLock } from '~/common/project';
 import type { Project, Workspace } from '~/insomnia-data';
@@ -24,37 +16,6 @@ import {
 } from '../sync/vcs/migrate-projects-into-organization';
 export { DEFAULT_STORAGE_RULES, fetchAndCacheOrganizationStorageRule } from '~/common/organization-storage-rules';
 
-export function sortOrganizations(accountId: string, organizations: Organization[]): Organization[] {
-  const home = organizations.find(
-    organization =>
-      models.organization.isPersonalOrganization(organization) &&
-      models.organization.isOwnerOfOrganization({
-        organization,
-        accountId,
-      }),
-  );
-  const myOrgs = organizations
-    .filter(
-      organization =>
-        !models.organization.isPersonalOrganization(organization) &&
-        models.organization.isOwnerOfOrganization({
-          organization,
-          accountId,
-        }),
-    )
-    .sort((a, b) => a.name.localeCompare(b.name));
-  const notMyOrgs = organizations
-    .filter(
-      organization =>
-        !models.organization.isOwnerOfOrganization({
-          organization,
-          accountId,
-        }),
-    )
-    .sort((a, b) => a.name.localeCompare(b.name));
-  return [...(home ? [home] : []), ...myOrgs, ...notMyOrgs];
-}
-
 export async function syncCurrentPlan(sessionId: string, accountId: string) {
   const [currentPlanResult] = await Promise.allSettled([getCurrentPlan({ sessionId })]);
   if (currentPlanResult.status === 'fulfilled' && currentPlanResult.value) {
@@ -66,21 +27,19 @@ export async function syncCurrentPlan(sessionId: string, accountId: string) {
 
 export async function syncOrganizations(sessionId: string, accountId: string) {
   try {
-    const [organizationsResult, user, currentPlan] = await Promise.all([
-      getOrganizations({ sessionId }),
+    const [organizations, user, currentPlan] = await Promise.all([
+      services.organization.list(),
       getUserProfile({ sessionId }),
       getCurrentPlan({ sessionId }),
     ]);
 
-    invariant(organizationsResult && organizationsResult.organizations, 'Failed to load organizations');
+    invariant(organizations, 'Failed to load organizations');
     invariant(user && user.id, 'Failed to load user');
     invariant(currentPlan && currentPlan.planId, 'Failed to load current plan');
 
-    const { organizations } = organizationsResult;
-
     invariant(accountId, 'Account ID is not defined');
 
-    localStorage.setItem(`${accountId}:organizations`, JSON.stringify(sortOrganizations(accountId, organizations)));
+    localStorage.setItem(`${accountId}:organizations`, JSON.stringify(organizations));
     localStorage.setItem(`${accountId}:user`, JSON.stringify(user));
     localStorage.setItem(`${accountId}:currentPlan`, JSON.stringify(currentPlan));
   } catch (error) {
@@ -186,7 +145,7 @@ interface TeamProject {
 }
 
 async function getAllTeamProjects(organizationId: string) {
-  const { id: sessionId } = await services.userSession.getOrCreate();
+  const { id: sessionId } = await services.userSession.get();
   if (!sessionId) {
     return [];
   }
@@ -264,7 +223,7 @@ async function syncTeamProjects({
 }
 
 export const syncProjects = projectLock.wrapWithLock(async (organizationId: string) => {
-  const user = await services.userSession.getOrCreate();
+  const user = await services.userSession.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)) {
diff --git a/packages/insomnia/src/ui/vault-key.client.ts b/packages/insomnia/src/ui/vault-key.client.ts
index 0a6116e7c3..889d686442 100644
--- a/packages/insomnia/src/ui/vault-key.client.ts
+++ b/packages/insomnia/src/ui/vault-key.client.ts
@@ -12,13 +12,13 @@ export const vaultKeyParams = params[2048];
 export const saveVaultKey = async (accountId: string, vaultKey: string) => {
   // save encrypted vault key and vault salt to session
   const encryptedVaultKey = await window.main.secretStorage.encryptString(vaultKey);
-  await services.userSession.patch({ vaultKey: encryptedVaultKey });
+  await services.userSession.update({ vaultKey: encryptedVaultKey });
 
   await saveVaultKeyIfNecessary(accountId, vaultKey);
 };
 
 export const createVaultKey = async (type: 'create' | 'reset' = 'create') => {
-  const userSession = await services.userSession.getOrCreate();
+  const userSession = await services.userSession.get();
   const { accountId, id: sessionId } = userSession;
 
   const vaultSalt = await getRandomHex();
@@ -41,7 +41,7 @@ export const createVaultKey = async (type: 'create' | 'reset' = 'create') => {
       : resetVault({ sessionId, salt: vaultSalt, verifier }));
 
     // save encrypted vault key and vault salt to session
-    await services.userSession.patch({ vaultSalt: vaultSalt });
+    await services.userSession.update({ vaultSalt: vaultSalt });
     await saveVaultKey(accountId, base64encodedVaultKey);
     return {
       key: base64encodedVaultKey,
diff --git a/packages/insomnia/src/utils/router.ts b/packages/insomnia/src/utils/router.ts
index 44a6684a0b..ca50d851fc 100644
--- a/packages/insomnia/src/utils/router.ts
+++ b/packages/insomnia/src/utils/router.ts
@@ -47,7 +47,7 @@ export const getInitialRouteForOrganization = async ({
     const match = getMatchParams(prevOrganizationLocation);
 
     if (match && match.params.organizationId && match.params.projectId) {
-      const existingProject = await services.project.getById(match.params.projectId);
+      const existingProject = await services.project.get(match.params.projectId);
 
       if (existingProject) {
         console.log('Redirecting to last visited project', existingProject._id);
@@ -119,7 +119,7 @@ export const getInitialEntry = async () => {
 
     const hasUserLoggedInBefore = window.localStorage.getItem('hasUserLoggedInBefore');
 
-    const user = await services.userSession.getOrCreate();
+    const user = await services.userSession.get();
     if (user.id) {
       const organizations = JSON.parse(
         localStorage.getItem(`${user.accountId}:organizations`) || '[]',

From 9d1dcce441b4b3e48eba684d692b7dfeb7a82957 Mon Sep 17 00:00:00 2001
From: Jack Kavanagh <jackkav@gmail.com>
Date: Wed, 20 May 2026 11:01:39 +0100
Subject: [PATCH 7/7] feat: move plugin loading to dedicated hidden
 BrowserWindow (Phase 1) (#9889)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: reduce output verbosity for local dev and AI agent workflows

- Set npm loglevel=warn to suppress install/run progress noise
- Switch Playwright local reporter from list to dot (less output per test, CI unchanged)
- Add scripts/setup.sh for one-time local git config (compact log, short status)
- Document setup script in AGENTS.md

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* chore: remove loglevel=warn and alias suggestions

- Revert loglevel=warn from .npmrc — too broad, suppresses CI output
- Remove shell alias suggestions from setup.sh — out of scope for a repo script

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* chore: replace setup.sh with command output guidance in AGENTS.md

Removes setup.sh in favour of explicit quiet-command guidance that
benefits all agents (Claude, Copilot, Codex) without requiring a
one-time setup step.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* chore: add cx semantic code navigation guidance to AGENTS.md

cx gives agents a cost ladder (overview → symbols → definition → read)
that reduces file reads for all agents that read AGENTS.md — complementary
to CodeGraph which is Claude Code-specific.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* plan pass 2

* answer questions

* add tests

* theme tests

* more tests

* feat: move plugin loading/execution to hidden BrowserWindow (Phase 1)

All plugin API calls (getThemes, getPlugins, getActivePlugins, reloadPlugins,
getRequestActions, getRequestGroupActions, getWorkspaceActions, getDocumentActions)
are now routed through a dedicated hidden BrowserWindow with nodeIntegration:true
instead of running directly in the renderer.

IPC relay: renderer → ipcMain.handle → plugin window webContents → ipcRenderer.send
back to main → resolve renderer promise via pending-request map with 30s timeout.

Renderer-side callers updated to use window.main.plugins.* bridge.
Two new esbuild entry points added (plugin-window, plugin-window-preload).
Dev build threshold updated from 3 to 6 to account for all contexts.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* feedback

* feat: route plugin action execution through hidden BrowserWindow bridge

Add executeAction IPC method so all four plugin action dropdowns (request,
requestGroup, workspace, document) dispatch through the plugin window
instead of running context modules directly in the renderer.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* feat: route template tag listing and action execution through plugin bridge

Bridge getTemplateTags() and runTemplateTagAction() so code-editor,
one-line-editor, and tag-editor no longer import from plugins/index
or plugins/context/store in the renderer.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* feat: complete Phase 1 — all plugin execution routed through hidden BrowserWindow

Bridge template tags (getTemplateTags, runTemplateTagAction), bundle plugin
listing (getBundlePlugins), and elevated plugin actions (executePluginMainAction)
so no renderer code calls plugin index or context modules directly for execution.

Remaining renderer plugin imports are intentional: applyColorScheme/getColorScheme
(DOM utilities) and createPlugin (filesystem scaffolding), neither of which is
plugin execution.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* update plan

* fix: initialize plugin window services and add Phase 1a E2E test

- Create database.plugin-window.ts IPC proxy so the plugin window
  reads from the main process NeDB connection instead of opening a
  second one
- Initialize database + services in entry.plugin-window.ts before
  sending plugin-window-ready, fixing the silent "Service not
  initialized" crash that was masked by unawaited promises
- Add isMainWindow fallback to the page fixture so firstWindow()
  racing to return the hidden plugin window doesn't break other tests
- Add plugin-bridge.test.ts: E2E test that writes a requestAction
  plugin, reloads via the bridge, and verifies the action appears in
  the request dropdown

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix lint

* fix: only send plugin-window-ready after successful initialization

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix assertion

* add found

* better

* fix: stabilize hidden window smoke flows

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* feat: bridge request and response hooks through the plugin window

Moves requestHooks and responseHooks execution into the hidden plugin
window via the IPC bridge. The default-headers built-in runs in the
renderer (no IPC). A cached hasRequestHooks/hasResponseHooks check in
the main process avoids any plugin window round-trip per request when no
user plugins have hooks registered.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: handle non-renderer processes in plugin hook functions

_applyRequestPluginHooks and _applyResponsePluginHooks now use
window.main.plugins.* IPC only in the Electron renderer. In the main
process (OAuth2 token exchange via get-token.ts) and Node.js CLI
(insomnia-inso), they fall back to loading plugins directly via
plugins.getRequestHooks/getResponseHooks. This fixes:

- inso CLI: "window is not defined" in all run collection/test commands
- Electron: OAuth2 token exchange failing with "no access token provided"

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix unit test

* fix: increase findMainWindow timeout and skip plugin window by title

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: defer plugin window creation until after main window loads

Playwright's firstWindow() was racing with the plugin window and
sometimes returning it instead of the main app window. By deferring
createPluginWindow() to did-finish-load on the main window, the plugin
window is guaranteed to not exist yet when firstWindow() resolves.

Removes the findMainWindow polling fallback from the test fixture.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* refactor: replace any[] cast in nunjucks context menu with narrow ContextMenuTag type

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: safely stringify non-Error rejections in response hook error handler

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* feat: bridge plugin UI calls (alert/dialog/prompt/clipboard) from plugin window to main renderer

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix test

* docs

* add tests and observability

* docs

* feat: implement invokePluginMethod for plugin communication and add tests

* document switch

* fix test

* fix: move plugin killswitch from preload to renderer to prevent packaged app crash

The preload was statically importing invokePluginMethod which pulled the
entire plugin system (network stack, NeDB, plugin contexts) into the
preload bundle. In production the bundle is built fresh from source,
causing a module-level crash before window.main is set — breaking the
critical backup smoke test with "Cannot read properties of undefined
(reading 'secretStorage')".

Move the INSOMNIA_ENABLE_PLUGIN_BRIDGE killswitch into a new
renderer-bridge.ts module that lives in the Vite renderer bundle where
those deps already exist. The preload now always uses IPC for all plugin
calls. All window.main.plugins.* call sites updated to use the bridge.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* chore: eslint autofix import ordering

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 AGENTS.md                                     |  53 +
 .../insomnia-smoke-test/playwright.config.ts  |   2 +-
 .../insomnia-smoke-test/playwright/test.ts    |   2 +
 .../tests/smoke/plugin-bridge.test.ts         | 127 +++
 .../smoke/pre-request-script-window.test.ts   |  15 +-
 packages/insomnia/PLUGIN_SYSTEM_POC.md        | 922 ++++++++++++++++++
 packages/insomnia/esbuild.entrypoints.ts      |  47 +-
 packages/insomnia/scripts/build.ts            |   1 +
 .../src/entry.plugin-window-preload.ts        |  40 +
 packages/insomnia/src/entry.plugin-window.ts  |  36 +
 packages/insomnia/src/entry.preload.ts        |  39 +
 .../src/main/database.plugin-window.ts        |  23 +
 packages/insomnia/src/main/ipc/electron.ts    |  37 +-
 packages/insomnia/src/main/ipc/main.ts        |  10 +-
 .../insomnia/src/main/network/socket-io.ts    |  37 +-
 .../insomnia/src/main/network/websocket.ts    |  41 +-
 packages/insomnia/src/main/plugin-window.ts   | 316 ++++++
 packages/insomnia/src/main/window-utils.ts    |   8 +
 .../network/__tests__/plugin-hooks.test.ts    | 172 ++++
 packages/insomnia/src/network/network.ts      | 115 ++-
 packages/insomnia/src/plugin-window.html      |  11 +
 .../src/plugins/__tests__/index.test.ts       | 359 +++++++
 .../plugins/__tests__/invoke-method.test.ts   |  82 ++
 .../src/plugins/__tests__/themes.test.ts      |  86 ++
 packages/insomnia/src/plugins/bridge-types.ts | 108 ++
 packages/insomnia/src/plugins/index.ts        |  39 +-
 .../insomnia/src/plugins/invoke-method.ts     | 241 +++++
 .../insomnia/src/plugins/renderer-bridge.ts   |  52 +
 packages/insomnia/src/root.tsx                |   5 +-
 ...d-credentials.$cloudCredentialId.update.ts |   6 +-
 .../src/routes/cloud-credentials.create.tsx   |   6 +-
 .../.client/codemirror/code-editor.tsx        |   8 +-
 .../.client/codemirror/one-line-editor.tsx    |   8 +-
 .../dropdowns/request-actions-dropdown.tsx    |  28 +-
 .../request-group-actions-dropdown.tsx        |  29 +-
 .../dropdowns/workspace-card-dropdown.tsx     |  28 +-
 .../dropdowns/workspace-dropdown.tsx          |  31 +-
 .../cloud-credential-modal.tsx                |   6 +-
 .../ui/components/modals/settings-modal.tsx   |   4 +-
 .../settings/cloud-service-credentials.tsx    |  11 +-
 .../src/ui/components/settings/plugins.tsx    |  13 +-
 .../ui/components/templating/tag-editor.tsx   |  19 +-
 packages/insomnia/src/ui/hooks/theme.ts       |   5 +-
 .../ui/hooks/use-global-keyboard-shortcuts.ts |   2 +-
 .../insomnia/src/ui/renderer-listeners.ts     |  20 +-
 45 files changed, 3008 insertions(+), 242 deletions(-)
 create mode 100644 packages/insomnia-smoke-test/tests/smoke/plugin-bridge.test.ts
 create mode 100644 packages/insomnia/PLUGIN_SYSTEM_POC.md
 create mode 100644 packages/insomnia/src/entry.plugin-window-preload.ts
 create mode 100644 packages/insomnia/src/entry.plugin-window.ts
 create mode 100644 packages/insomnia/src/main/database.plugin-window.ts
 create mode 100644 packages/insomnia/src/main/plugin-window.ts
 create mode 100644 packages/insomnia/src/network/__tests__/plugin-hooks.test.ts
 create mode 100644 packages/insomnia/src/plugin-window.html
 create mode 100644 packages/insomnia/src/plugins/__tests__/index.test.ts
 create mode 100644 packages/insomnia/src/plugins/__tests__/invoke-method.test.ts
 create mode 100644 packages/insomnia/src/plugins/__tests__/themes.test.ts
 create mode 100644 packages/insomnia/src/plugins/bridge-types.ts
 create mode 100644 packages/insomnia/src/plugins/invoke-method.ts
 create mode 100644 packages/insomnia/src/plugins/renderer-bridge.ts

diff --git a/AGENTS.md b/AGENTS.md
index 5c2072a136..18246fa077 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -15,6 +15,15 @@
 - **No unsolicited formatting.** Rely on ESLint/Prettier. Do not reformat existing code.
 - **Strict scoping.** Only modify code directly related to the prompt. Do not refactor adjacent code unless asked.
 
+## Command Output
+Prefer quiet command variants to minimise output volume:
+- `git log --oneline -20` not `git log`
+- `git diff --stat` not `git diff`
+- `npm test --silent` not `npm test`
+- `tsc --noEmit 2>&1 | head -50` for type-check failures
+- Use the `Read` tool with `limit` rather than `cat` on large files
+- Use `Grep` with `head_limit` rather than unrestricted searches
+
 ## Validation Commands
 Run from repo root before considering work complete:
 
@@ -72,3 +81,47 @@ Organization
 ## Sensitive Data
 - **Vault system (AES-GCM):** For environment secrets (`EnvironmentKvPairDataType.SECRET`).
 - **Electron safeStorage:** Platform-native encryption (`window.main.secretStorage`).
+## cx — Semantic Code Navigation
+
+Prefer cx over reading files. Escalate: overview → symbols → definition/references → Read tool.
+
+### Quick reference
+
+```
+cx overview PATH                                    file or directory table of contents
+cx overview DIR --full                              directory overview with signatures
+cx symbols [--kind K] [--name GLOB] [--file PATH]   search symbols project-wide
+cx symbols --kinds [--file PATH]                     list distinct kinds with counts
+cx definition --name NAME [--from PATH] [--kind K]  get a function/type body
+cx references --name NAME [--file PATH] [--unique]   find all usages (--unique: one per caller)
+cx lang list                                         show supported languages
+cx lang add LANG [LANG...]                           install language grammars
+```
+
+Aliases: `cx o`, `cx s`, `cx d`, `cx r`
+
+Kinds: fn, struct, enum, trait, type, const, class, interface, module, event
+
+### Key patterns
+
+- Start with `cx overview .`, drill into subdirectories — cheaper than ls + reading files
+- `cx definition --name X` gives exact text for Edit tool's `old_string` without reading the whole file
+- `cx references --name X --unique` shows one row per caller — use before refactoring to check blast radius
+- After context compression, use `cx overview` / `cx definition` to re-orient — don't re-read full files
+- Check signatures for `pub`/`export` to identify public API without reading the file
+
+### Pagination
+
+Default limits: definition 3, symbols 100, references 50. When truncated, stderr shows:
+
+```
+cx: 3/32 definitions for "X" | --from PATH to narrow | --offset 3 for more | --all
+```
+
+`--offset N` pages forward, `--all` bypasses, `--limit N` overrides. Narrowing with `--from`/`--file`/`--kind` is usually better than paging.
+
+JSON: paginated → `{total, offset, limit, results: [...]}`, non-paginated → bare array.
+
+### Missing grammars
+
+If cx reports a missing grammar, install with `cx lang add <lang>`. Run `cx lang list` to see what's installed.
diff --git a/packages/insomnia-smoke-test/playwright.config.ts b/packages/insomnia-smoke-test/playwright.config.ts
index a8531d1ddb..f5d1519686 100644
--- a/packages/insomnia-smoke-test/playwright.config.ts
+++ b/packages/insomnia-smoke-test/playwright.config.ts
@@ -58,7 +58,7 @@ const config: PlaywrightTestConfig = {
       sources: true,
     },
   },
-  reporter: process.env.CI ? [['github'], ['line']] : [['list']],
+  reporter: process.env.CI ? [['github'], ['line']] : [['dot']],
   timeout: process.env.CI || isWindows ? 60 * 1000 : 20 * 1000,
   forbidOnly: !!process.env.CI,
   outputDir: 'traces',
diff --git a/packages/insomnia-smoke-test/playwright/test.ts b/packages/insomnia-smoke-test/playwright/test.ts
index 8533650ed5..4be9625908 100644
--- a/packages/insomnia-smoke-test/playwright/test.ts
+++ b/packages/insomnia-smoke-test/playwright/test.ts
@@ -153,6 +153,8 @@ export const test = baseTest.extend<{
     await electronApp.close();
   },
   page: async ({ app }, use) => {
+    // The plugin window is created after the main window's did-finish-load, so
+    // firstWindow() always returns the main app window.
     const page = await app.firstWindow({ timeout: 60_000 });
 
     await page.waitForLoadState();
diff --git a/packages/insomnia-smoke-test/tests/smoke/plugin-bridge.test.ts b/packages/insomnia-smoke-test/tests/smoke/plugin-bridge.test.ts
new file mode 100644
index 0000000000..6c37248761
--- /dev/null
+++ b/packages/insomnia-smoke-test/tests/smoke/plugin-bridge.test.ts
@@ -0,0 +1,127 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
+import { expect } from '@playwright/test';
+
+import { loadFixture } from '../../playwright/paths';
+import { test } from '../../playwright/test';
+
+const PLUGIN_NAME = 'insomnia-plugin-bridge-test';
+const ACTION_LABEL = 'Bridge Test Action';
+
+test('Plugin bridge routes requestAction execution through hidden BrowserWindow', async ({ page, app, dataPath }) => {
+  // Write a minimal plugin with a requestAction to the data-path plugins directory.
+  const pluginDir = path.join(dataPath, 'plugins', PLUGIN_NAME);
+  fs.mkdirSync(pluginDir, { recursive: true });
+  fs.writeFileSync(
+    path.join(pluginDir, 'package.json'),
+    // The 'insomnia' key is required — the loader skips packages that lack it.
+    JSON.stringify({ name: PLUGIN_NAME, version: '1.0.0', main: 'index.js', insomnia: {} }),
+  );
+  fs.writeFileSync(
+    path.join(pluginDir, 'index.js'),
+    `module.exports.requestActions = [{ label: '${ACTION_LABEL}', action: async () => {} }];`,
+  );
+
+  // Import a collection so we have a request to target.
+  const fixture = await loadFixture('simple.yaml');
+  await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), fixture);
+  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();
+
+  // Reload plugins through the bridge, awaiting completion.  This ensures the
+  // hidden BrowserWindow has started and the test plugin is registered before we
+  // check the UI.  page.evaluate awaits the returned Promise.
+  await page.evaluate(() => (window as any).main.plugins.reloadPlugins());
+
+  // Open the request actions dropdown for 'example http'.
+  // onOpen calls window.main.plugins.getRequestActions() through the bridge.
+  const requestRow = page.getByLabel('Request Collection').getByRole('row', { name: 'example http' });
+  await requestRow.click();
+  await requestRow.getByLabel('Request Actions').click();
+
+  // The plugin action must appear in the dropdown, proving end-to-end bridge execution.
+  await expect.soft(page.getByRole('menuitemradio', { name: ACTION_LABEL })).toBeVisible();
+});
+
+test('Plugin bridge surfaces errors from plugins that throw or reject', async ({ page, dataPath }) => {
+  const pluginName = 'insomnia-plugin-bridge-failure';
+  const pluginDir = path.join(dataPath, 'plugins', pluginName);
+  fs.mkdirSync(pluginDir, { recursive: true });
+  fs.writeFileSync(
+    path.join(pluginDir, 'package.json'),
+    JSON.stringify({ name: pluginName, version: '1.0.0', main: 'index.js', insomnia: {} }),
+  );
+  // Three failure shapes the bridge must normalize: sync throw, async reject with Error, async reject with non-Error.
+  fs.writeFileSync(
+    path.join(pluginDir, 'index.js'),
+    `
+      module.exports.requestActions = [
+        { label: 'Sync Throw', action: () => { throw new Error('sync-boom'); } },
+        { label: 'Async Reject Error', action: async () => { throw new Error('async-boom'); } },
+        { label: 'Async Reject Non-Error', action: async () => { return Promise.reject('plain-string'); } },
+      ];
+    `,
+  );
+
+  // Wait until the renderer has settled on the project route — otherwise an
+  // in-flight navigation destroys the evaluate execution context.
+  await page.getByLabel('Import').waitFor();
+  await page.evaluate(() => (window as any).main.plugins.reloadPlugins());
+
+  const results = await page.evaluate(async () => {
+    const main = (window as any).main;
+    const actions = await main.plugins.getRequestActions();
+    const outcomes: { label: string; ok: boolean; message: string | null }[] = [];
+    for (const action of actions.filter((a: any) => /Sync Throw|Async Reject/.test(a.label))) {
+      try {
+        await main.plugins.executeAction({
+          type: 'request',
+          pluginName: action.pluginName,
+          label: action.label,
+          projectId: '',
+          domainData: {},
+        });
+        outcomes.push({ label: action.label, ok: true, message: null });
+      } catch (err: any) {
+        outcomes.push({ label: action.label, ok: false, message: String(err?.message ?? err) });
+      }
+    }
+    return outcomes;
+  });
+
+  // Every failure shape must surface as a rejection to the renderer — not as a hang and not as a silent ok.
+  expect.soft(results.find(r => r.label === 'Sync Throw')?.ok).toBe(false);
+  expect.soft(results.find(r => r.label === 'Async Reject Error')?.ok).toBe(false);
+  expect.soft(results.find(r => r.label === 'Async Reject Non-Error')?.ok).toBe(false);
+
+  const metrics = await page.evaluate(() => (window as any).main.plugins.getBridgeMetrics());
+  // executeAction must have observed at least the three error outcomes we just produced.
+  expect.soft(metrics.perMethod.executeAction?.error ?? 0).toBeGreaterThanOrEqual(3);
+});
+
+test('Plugin bridge handles concurrent invocations without cross-talk', async ({ page, dataPath }) => {
+  const pluginName = 'insomnia-plugin-bridge-concurrent';
+  const pluginDir = path.join(dataPath, 'plugins', pluginName);
+  fs.mkdirSync(pluginDir, { recursive: true });
+  fs.writeFileSync(
+    path.join(pluginDir, 'package.json'),
+    JSON.stringify({ name: pluginName, version: '1.0.0', main: 'index.js', insomnia: {} }),
+  );
+  fs.writeFileSync(path.join(pluginDir, 'index.js'), 'module.exports.requestActions = [];');
+
+  await page.getByLabel('Import').waitFor();
+  await page.evaluate(() => (window as any).main.plugins.reloadPlugins());
+
+  // Fire N concurrent metadata invocations.  Each call assigns its own request id,
+  // and the bridge result handler must route results back to the correct promise.
+  const completed = await page.evaluate(async () => {
+    const main = (window as any).main;
+    const promises = Array.from({ length: 20 }, () => main.plugins.getRequestActions());
+    const results = await Promise.all(promises);
+    return results.every(r => Array.isArray(r)) ? results.length : -1;
+  });
+  expect.soft(completed).toBe(20);
+});
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 3b2eafa6c3..1d615557f2 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
@@ -1,8 +1,18 @@
-import { expect } from '@playwright/test';
+import { type ElectronApplication, expect } from '@playwright/test';
 
 import { loadFixture } from '../../playwright/paths';
 import { test } from '../../playwright/test';
 
+const findWindowByTitle = async (app: ElectronApplication, title: string) => {
+  for (const window of await app.windows()) {
+    if ((await window.title().catch(() => '')) === title) {
+      return window;
+    }
+  }
+
+  throw new Error(`Window with title "${title}" not found`);
+};
+
 test.describe('test hidden window handling', () => {
   test('can cancel pre-request script', async ({ app, page }) => {
     test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
@@ -64,8 +74,7 @@ test.describe('test hidden window handling', () => {
     await page.getByRole('tab', { name: 'Console' }).click();
     await page.getByRole('tab', { name: 'Preview' }).click();
 
-    const windows = await app.windows();
-    const hiddenWindow = windows[1];
+    const hiddenWindow = await findWindowByTitle(app, 'Hidden Browser Window');
     hiddenWindow.close();
 
     await page.getByTestId('settings-button').click();
diff --git a/packages/insomnia/PLUGIN_SYSTEM_POC.md b/packages/insomnia/PLUGIN_SYSTEM_POC.md
new file mode 100644
index 0000000000..8ed6c84250
--- /dev/null
+++ b/packages/insomnia/PLUGIN_SYSTEM_POC.md
@@ -0,0 +1,922 @@
+# Plugin System POC Outline
+
+## Current PR review scope
+
+This branch contains some stacked prerequisite changes alongside the Phase 1a plugin bridge work.
+
+For review, focus primarily on:
+
+- `src/main/plugin-window.ts`
+- `src/entry.plugin-window.ts`
+- `src/entry.plugin-window-preload.ts`
+- `src/entry.preload.ts`
+- `src/plugins/*`
+- `packages/insomnia-smoke-test/tests/smoke/plugin-bridge.test.ts`
+
+Other changes in the branch are supporting or preparatory work and can be reviewed more lightly in the context of Phase 1a.
+
+## Goal
+
+Design a new plugin system for the Electron app that supports:
+
+- `rendererFunctions` for UI-safe extension points in the renderer
+- `mainFunctions` for privileged capabilities that must run in the main process
+- a sandbox model that keeps third-party plugins off direct Electron and Node APIs unless explicitly allowed
+
+The migration is split into phases to avoid breaking existing plugin behaviour:
+
+- **Phase 1a:** improve the legacy behaviour test baseline and route all plugin execution through an IPC bridge to a hidden BrowserWindow with `nodeIntegration: true`. No plugin code is moved yet — the renderer still loads plugins, but all invocations cross the bridge. _(current PR)_
+- **Phase 1b:** move all plugin code to run exclusively inside the hidden BrowserWindow. Plugin context modules (`plugins/context/`, `plugins/index.ts`) are removed from the main renderer bundle entirely. The renderer becomes a pure client of the bridge.
+- **Phase 1c:** disable `nodeIntegration` in the main BrowserWindow. Tackle the remaining renderer-side Node.js dependencies together: direct Electron imports, `fs` operations, `process.env` access, dynamic `require('electron')`, and `node:crypto`/`node:os` usage.
+- **Phase 2:** replace the hidden window's `nodeIntegration: true` runtime with a stricter sandbox (`contextIsolation: true`, capability-based permissions). Plugin authors migrate to the new API surface.
+
+## Why now
+
+The app already has:
+
+- plugin discovery and loading in `src/plugins/index.ts`
+- preload bridge patterns in `src/entry.preload.ts`
+- IPC handler registration in `src/entry.main.ts` and `src/main/ipc/*`
+- an ongoing renderer hardening effort in `NODE_INTEGRATION_MIGRATION_PR_PLAN.md`
+
+This makes a capability-based plugin redesign a natural fit for the direction of the architecture, but not for the current runtime shape. Today the plugin system is still heavily renderer-coupled.
+
+## Current state
+
+Today plugins primarily contribute exports like:
+
+- `templateTags`
+- `requestHooks`
+- `responseHooks`
+- `requestActions`
+- `requestGroupActions`
+- `workspaceActions`
+- `documentActions`
+
+There is also an internal-only `unsafePluginMainActions` path for bundled plugins. That proves the app already needs main-process plugin execution, but the current shape is too narrow and too trusted for a general public plugin API.
+
+Just as importantly, current plugin consumption is still renderer-heavy:
+
+- parts of plugin discovery/loading can run in renderer contexts
+- themes are queried directly from UI hooks
+- action plugins are fetched and executed directly from UI components
+- plugin context helpers currently expose renderer-bound APIs like dialogs, clipboard, and prompt flows
+
+This plan is therefore a redesign from the current state, not a small cleanup of an already-main-owned system.
+
+## POC outcome
+
+Define a plugin API and execution model that:
+
+1. keeps plugin lifecycle out of the app UI renderer
+2. routes privileged work through preload and IPC
+3. allows fine-grained permission checks for `mainFunctions`
+4. remains compatible with future `contextIsolation: true`
+
+## Ownership model
+
+### Target state
+
+Plugin discovery, manifest validation, trust checks, and function registration should be owned by the main process.
+
+The app UI renderer should not load plugin packages directly. It should only:
+
+- query which plugin capabilities are available
+- invoke approved functions through a narrow bridge
+- receive serialized results and metadata
+
+If `rendererFunctions` exist, they should run in a dedicated sandboxed plugin host, not inside the normal app UI runtime.
+
+### Current gap from target state
+
+This is not how the app works today. The current system still allows plugin enumeration and execution in UI code.
+
+#### Phase 1 move
+
+Phase 1 moves the system in three steps.
+
+**Phase 1a** (current PR): adds the bridge and routes execution through it, but plugin code still lives in the renderer bundle:
+
+```text
+renderer loads plugins -> renderer calls bridge -> hidden window re-executes via its own copy of plugin code
+```
+
+**Phase 1b**: removes plugin code from the renderer bundle entirely so only the hidden window owns it:
+
+```text
+hidden plugin window loads plugins -> renderer requests execution via IPC bridge -> hidden window executes and returns result
+```
+
+**Phase 1c**: disables `nodeIntegration` in the main window, eliminating residual Node.js usage in the renderer (direct `fs`, `require('electron')`, `process.env`, `node:crypto`, etc.).
+
+Plugin trust level is unchanged across all of Phase 1. The hidden window retains `nodeIntegration: true` throughout.
+
+#### Phase 2 move
+
+Phase 2 then moves to the full target state:
+
+```text
+main discovers and registers plugins -> hidden sandboxed window executes via context API -> renderer requests through bridge only
+```
+
+## Proposed plugin shape
+
+```ts
+export interface InsomniaPlugin {
+  name: string;
+  version: string;
+  rendererFunctions?: RendererFunctionDefinition[];
+  mainFunctions?: MainFunctionDefinition[];
+}
+
+export interface RendererFunctionDefinition<Args = unknown, Result = unknown> {
+  name: string;
+  description?: string;
+  handler: (context: RendererPluginContext, args: Args) => Result | Promise<Result>;
+}
+
+export interface MainFunctionDefinition<Args = unknown, Result = unknown> {
+  name: string;
+  description?: string;
+  permissions?: PluginPermission[];
+  handler: (context: MainPluginContext, args: Args) => Result | Promise<Result>;
+}
+```
+
+## Execution model
+
+### `rendererFunctions`
+
+- Registered by the main process and executed in a dedicated sandboxed plugin host
+- Intended for UI workflows, request shaping, data transforms, and app-level orchestration
+- Must not access Electron, Node builtins, or raw IPC directly
+- Can call approved bridge APIs exposed through a plugin context
+- Must not rely on direct React component state, direct database model mutation, or window-scoped UI helpers
+
+### `mainFunctions`
+
+- Registered in the main process as named plugin capabilities
+- Invoked from the renderer through a single preload bridge such as:
+
+```ts
+window.plugins.invokeMain(pluginName, functionName, args);
+```
+
+- Must pass permission checks before execution
+- Return serialized results only
+
+## Recommended routing
+
+### Control plane
+
+```text
+plugin package on disk -> main process discovery -> manifest validation -> function registry
+```
+
+### Renderer function path
+
+```text
+UI -> preload bridge -> IPC -> sandboxed plugin host -> rendererFunction
+```
+
+### Main function path
+
+```text
+UI -> preload bridge -> IPC -> plugin main registry -> mainFunction
+```
+
+This keeps plugin loading and trust decisions out of the UI while still matching the existing preload and IPC pattern in `src/entry.preload.ts`.
+
+## inso CLI and `process.type` guards
+
+Many modules in `src/plugins/` contain branches guarded by `process.type === 'renderer'`. These are **not** general renderer-detection guards — they exist because the inso CLI reuses the same code paths as the Electron renderer but loads plugin implementations directly rather than going through the IPC bridge.
+
+In Electron the check is true and the code reaches IPC-bound paths. In inso (a Node.js process with no Electron renderer) the check is false and the code falls back to direct module imports.
+
+This has two consequences for Phase 1b:
+
+1. **Do not remove these guards.** Stripping them to simplify the hidden window code will break inso silently. The guards must be preserved in any shared module that inso also imports.
+2. **The hidden window is itself a renderer (`process.type === 'renderer'` is true).** Any code running there that hits these branches will follow the IPC path — which is correct for the app, but means the guard alone is not a reliable way to distinguish "app renderer" from "hidden plugin window." If Phase 1b needs to distinguish between the two contexts, use a dedicated flag (e.g. a custom `window.__PLUGIN_WINDOW__` set by the hidden window's preload) rather than relying on `process.type`.
+
+## Host decision
+
+The plugin host for `rendererFunctions` is a **dedicated hidden BrowserWindow**.
+
+### Phase 1 configuration
+
+```
+nodeIntegration: true
+contextIsolation: false
+show: false
+webPreferences: { backgroundThrottling: false }
+```
+
+This is deliberately permissive. It matches the trust level plugins already have today (full renderer access), but moves them out of the app UI window. Existing plugins run unchanged.
+
+### Why hidden BrowserWindow over alternatives for Phase 1
+
+| Option                                       | Phase 1 suitability | Notes                                                                    |
+| -------------------------------------------- | ------------------- | ------------------------------------------------------------------------ |
+| Hidden BrowserWindow (nodeIntegration: true) | Best                | Full Node/Electron compat, easy IPC, matches current plugin expectations |
+| Worker                                       | Poor                | No Node builtins, breaks most existing plugins                           |
+| Utility process                              | Poor                | No DOM, breaks renderer-oriented plugin APIs                             |
+| Second full window                           | Overkill            | Hidden window achieves the same isolation with less overhead             |
+
+### Phase 2 configuration
+
+Once plugins are fully isolated in the hidden window, Phase 2 tightens the window:
+
+```
+nodeIntegration: false
+contextIsolation: true
+sandbox: true
+```
+
+Plugin capabilities are then re-exposed through a controlled preload bridge only.
+
+### Impact on design
+
+- Module loading: Node `require()` in Phase 1; bundled/ESM modules via preload in Phase 2
+- Serialization: IPC boundary between hidden window and main process enforces JSON serialization from day one
+- UI helpers: dialog/prompt calls in Phase 1 route through IPC to the main renderer; in Phase 2 they become explicit bridge APIs
+- Startup cost: hidden window is created eagerly at app startup and kept alive, not spawned per call
+
+## Sandbox model
+
+> Phase 1 does not enforce this model. The hidden window runs with `nodeIntegration: true` and plugins retain full trust. The sandbox model below is the Phase 2 target.
+
+### Default sandbox
+
+Third-party plugins should run with:
+
+- no direct `electron` import
+- no direct Node builtin imports
+- no access to `ipcRenderer`
+- no access to unrestricted `window.main`
+- no direct loading by the app UI renderer
+
+Instead, they receive a constrained context object:
+
+```ts
+type RendererPluginContext = {
+  app: {
+    getInfo(): Promise<AppInfo>;
+  };
+  requests: {
+    getById(id: string): Promise<Request | null>;
+  };
+  plugins: {
+    invokeMain(pluginName: string, functionName: string, args?: unknown): Promise<unknown>;
+  };
+};
+```
+
+This context should be intentionally smaller than the current plugin context surface. In particular, renderer-hosted plugins should not assume direct access to:
+
+- prompt and modal helpers
+- clipboard helpers
+- direct request/workspace model mutation
+- unrestricted store or network helpers without bridge review
+
+### Main sandbox
+
+`mainFunctions` should not mean "full trust". They should run behind:
+
+- plugin registration allowlist
+- per-function permission metadata
+- argument validation
+- structured result serialization
+- explicit logging for invocation and failure
+
+### Permission examples
+
+```ts
+type PluginPermission =
+  | 'filesystem.read'
+  | 'filesystem.write'
+  | 'network.fetch'
+  | 'shell.openExternal'
+  | 'secrets.read'
+  | 'secrets.write';
+```
+
+The first POC should likely keep this list small.
+
+## Mutation and command protocol required for legacy action migration
+
+The plan assumes medium-risk legacy action features can migrate onto `rendererFunctions`, but that is only realistic if the new system defines how plugins request side effects.
+
+Today many action plugins effectively rely on direct execution with live model objects and rich helper context. A separate host cannot preserve that model safely.
+
+Before migrating `requestActions`, `requestGroupActions`, `workspaceActions`, or even `documentActions`, the new system needs an explicit protocol for things like:
+
+- request mutations
+- workspace mutations
+- user-visible commands
+- persistence requests
+- error and confirmation flows
+
+The likely shape is a DTO / command / patch model, for example:
+
+```ts
+type PluginCommand =
+  | { type: 'update-request'; requestId: string; patch: unknown }
+  | { type: 'update-workspace'; workspaceId: string; patch: unknown }
+  | { type: 'show-notification'; level: 'info' | 'warning' | 'error'; message: string };
+```
+
+Pass 1 does not need to finalize the full protocol, but it should prove at least one realistic command flow end-to-end.
+
+### Concrete migration example: `documentActions`
+
+One low-risk example for the eventual Phase 2 command model is `documentActions`.
+
+The flow would look like:
+
+1. the UI triggers `window.plugins.invokeRenderer(pluginName, 'documentAction.rename', { documentId })`
+2. the hidden plugin host executes the plugin function with a constrained context
+3. the plugin returns a structured command such as `{ type: 'update-document', documentId, patch: { name: 'New Name' } }`
+4. the host applies the command through the approved bridge and returns success metadata to the caller
+
+This is intentionally narrow, but it demonstrates that action-style plugins can move off direct model mutation without requiring Phase 1 to solve the full mutation protocol.
+
+## How this works with Electron sandboxing
+
+If the app continues toward `contextIsolation: true`, the model becomes:
+
+1. preload exposes a minimal `window.plugins` bridge
+2. main owns plugin loading and registration
+3. `rendererFunctions` run in a separate isolated plugin host
+4. privileged work always crosses the preload boundary
+5. main-process plugin handlers remain the only place with privileged Electron access
+6. the app UI renderer never imports plugin packages directly
+
+That means the plugin system should be designed so the renderer is a client of the plugin system, not the owner of plugin loading, even if the current app still has `nodeIntegration: true` in places.
+
+## Suggested preload API
+
+```ts
+type PluginBridgeAPI = {
+  invokeMain: (pluginName: string, functionName: string, args?: unknown) => Promise<unknown>;
+  invokeRenderer: (pluginName: string, functionName: string, args?: unknown) => Promise<unknown>;
+  listFunctions: () => Promise<
+    {
+      pluginName: string;
+      mainFunctions: string[];
+      rendererFunctions: string[];
+    }[]
+  >;
+};
+```
+
+This keeps the public renderer surface narrow and auditable.
+
+## Suggested main-process pieces
+
+- `src/plugins/registry.ts`
+  - normalize plugin exports
+  - register `rendererFunctions` and `mainFunctions`
+- `src/plugins/plugin-host.ts`
+  - manage the sandboxed host used for `rendererFunctions`
+- `src/main/ipc/plugins.ts`
+  - IPC entry point for plugin invocation
+- `src/entry.preload.ts`
+  - expose `window.plugins`
+- `src/global.d.ts`
+  - type the new preload bridge
+
+## Validation and safety rules
+
+- Function names must be unique per plugin
+- Main invocation payloads must be JSON-serializable
+- Renderer invocation payloads must be JSON-serializable
+- Errors should be normalized before crossing IPC
+- Plugin permissions should be visible in settings
+- Disabled plugins should not register either renderer or main functions
+- The UI renderer must not import or execute plugin packages directly
+- The registry must detect mixed legacy/new export shapes and apply explicit coexistence rules
+
+## Design decisions
+
+1. **Should public plugins ever get `mainFunctions`, or should that be opt-in behind a trust prompt?**
+   Deferred to Phase 2. Phase 1 does not introduce `mainFunctions` for public plugins.
+
+2. **Should `mainFunctions` run in the main process directly, or in a dedicated utility process?**
+   Main process for now. The utility process option remains open for a later pass if the trust surface warrants it.
+
+3. **Should plugin permissions be granted per plugin, per function, or per capability group?**
+   Deferred to Phase 2 when the permission model is introduced.
+
+4. **Should bundled first-party plugins keep a separate trusted path?**
+   No. Bundled plugins are already co-located and implicitly trusted by virtue of being shipped with the app. No separate path is needed.
+
+5. **What is the concrete host for `rendererFunctions`?**
+   A dedicated hidden BrowserWindow. Phase 1 uses `nodeIntegration: true` to preserve existing behaviour. Phase 2 revisits the configuration to meet sandboxing requirements (see [Host decision](#host-decision)).
+
+6. **What is the minimum viable mutation / command protocol for migrating legacy actions?**
+   Deferred to Phase 2. In Phase 1, plugins run with `nodeIntegration: true` and can still call back to main via IPC using existing mechanisms, so direct model mutation is preserved. Phase 2 introduces the sandbox that removes direct model access, and at that point a command/patch protocol becomes necessary — plugins will return structured commands (e.g. `{ type: 'update-request', requestId, patch }`) rather than mutating models in place.
+
+## POC phases
+
+### Phase 1a: bridge and baseline (current PR)
+
+**Goal:** establish a legacy behaviour test baseline and route all plugin invocations through an IPC bridge to a hidden BrowserWindow. Plugin code still exists in the renderer bundle — this phase proves the bridge, not the isolation.
+
+#### What changes
+
+- Legacy behaviour baseline tests written for all plugin export types (happy path + error path)
+- Hidden BrowserWindow created and managed from main (`nodeIntegration: true`, `show: false`)
+- IPC bridge added so all renderer-side plugin invocations cross to the hidden window before executing
+- Renderer-side plugin calls redirected through the bridge; the hidden window runs the actual plugin code
+
+#### What does not change
+
+- Plugin code is still bundled with the renderer (duplication, not isolation)
+- Plugin export shape (`templateTags`, `requestHooks`, `responseHooks`, etc.) is unchanged
+- Plugin authors do not need to update anything
+- No permission model enforced
+
+#### Deliverables
+
+1. Legacy behaviour baseline tests green in CI
+2. Hidden plugin window created and managed from main
+3. IPC bridge routing all renderer plugin invocations to the hidden window
+4. Zero behavioural regressions against baseline
+5. Bridge observability: per-invocation structured logs (`[plugin-bridge] invoke method=… outcome=… duration_ms=…`), startup timing (`window_ready startup_ms=…`), crash events (`window_crash reason=…`), and a snapshot accessor (`window.main.plugins.getBridgeMetrics()` → `plugins.getBridgeMetrics` IPC handler) exposing per-method `{ok, error, timeout, avgDurationMs, maxDurationMs}` and window counters
+
+#### What Phase 1a actually proves vs defers
+
+Phase 1a is a transport and hosting proof. Reviewers should read the deliverables narrowly:
+
+**Proven by Phase 1a**
+
+- The IPC bridge can carry every existing plugin capability shape (template tags, request/response hooks, request/group/workspace/document actions, bundled main actions, theme listing) end-to-end with serializable arguments and results
+- The hidden BrowserWindow lifecycle (creation deferred until main window loads, ready signalling, reload, teardown) is viable on darwin/win32/linux
+- Failure shapes from plugin code (sync throw, async reject with `Error`, async reject with non-`Error`) surface as rejections on the renderer side rather than as hangs or silent successes
+- Concurrent invocations are routed back to the correct caller (per-request `id` in `pluginRequests`)
+
+**Not proven, still risky after Phase 1a**
+
+- _Action mutation semantics._ Request/workspace/document actions still mutate models through the renderer-side context object. The bridge serializes inputs and outputs, but no mutation contract is enforced. Side-effect ordering between an action's UI calls (`alert`/`prompt`) and its model writes is unchanged from the legacy runtime — and untested under the new transport.
+- _Template tags._ Listing and `runTemplateTagAction` are bridged, but Nunjucks rendering still executes in the existing template worker. Isolation of tag execution is unchanged in 1a.
+- _inso CLI compatibility._ inso does not use the bridge. Any divergence between app-side and CLI-side plugin behaviour is unaddressed here and only surfaces in Phase 1b when `process.type` guards are touched.
+- _True isolation._ The hidden window runs with `nodeIntegration: true` and `contextIsolation: false`. Plugins are still trusted with full Node access. Sandbox claims belong to Phase 1c (renderer hardening) and Phase 2 (plugin window hardening), not 1a.
+- _Final plugin API._ Plugin authors see no API change. The `rendererFunctions`/`mainFunctions`/permission shape from this document is design-only until Phase 2.
+- _Crash recovery._ `render-process-gone` increments a counter and rejects in-flight requests, but there is no auto-restart loop. A crashed plugin window will be recreated lazily on the next invocation; held subscriptions and warm caches are lost. Acceptable for 1a but worth validating in production telemetry before relying on it.
+
+#### Phase 1a rollback switch
+
+Phase 1a keeps the legacy renderer plugin execution path available behind a boot-time environment flag:
+
+INSOMNIA_ENABLE_PLUGIN_BRIDGE=false
+
+When unset or set to any other value, plugin calls use the hidden plugin window bridge.
+When set to false, window.main.plugins.\* falls back to the legacy in-renderer execution path for the current app session.
+
+This switch is intended as a developer and rollout safety valve during Phase 1a. It is not a user-facing feature and should be removed once the bridge path is fully validated.
+
+### Phase 1b: full plugin isolation in hidden window
+
+**Goal:** remove plugin code from the main renderer bundle entirely. The hidden window is the sole owner of plugin discovery, loading, and execution.
+
+#### What changes
+
+- `src/plugins/index.ts` and all plugin context modules (`plugins/context/`) removed from the renderer bundle
+- Renderer has no direct import of plugin packages; it communicates only through the IPC bridge
+- Plugin context modules that have `process.type === 'renderer'` guards must be audited carefully — see [inso CLI and `process.type` guards](#inso-cli-and-processtype-guards). Guards must be preserved for inso compatibility; any disambiguation between "app renderer" and "hidden plugin window" should use a dedicated flag, not `process.type`
+
+#### What does not change
+
+- Hidden window still runs with `nodeIntegration: true`
+- Plugin export shape and author-visible behaviour unchanged
+- inso CLI plugin paths unchanged
+
+#### Deliverables
+
+1. Renderer bundle contains no plugin module imports
+2. All baseline tests still pass
+3. inso CLI smoke-tested to confirm no regressions from `process.type` guard changes
+
+### Phase 1c: disable `nodeIntegration` in the main window
+
+**Goal:** harden the main BrowserWindow by removing its reliance on Node.js integration. This requires eliminating residual Node.js API usage in the renderer.
+
+#### What changes (grouped by effort)
+
+| Area                                 | Files                                                                                             | Fix                                                                                               |
+| ------------------------------------ | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
+| Direct `import electron` in renderer | `routes/auth.clear-vault-key.tsx`                                                                 | Replace `ipcRenderer.emit` with `window.main` equivalent                                          |
+| `process.env` in renderer            | `common/constants.ts`, `settings/plugins.tsx`                                                     | Expose `INSOMNIA_DATA_PATH` and `PORTABLE_EXECUTABLE_DIR` via preload                             |
+| `fs` in response/network/scripts     | `models/helpers/response-operations.ts`, `script-executor.ts`, `network/grpc/write-proto-file.ts` | New IPC handlers in `src/main/ipc/`, exposed via preload                                          |
+| Dynamic `require('electron')`        | `network/network.ts`                                                                              | Replace with static imports or `window.main`                                                      |
+| `node:crypto` / `node:os`            | `sync/delta/diff.ts`, `sync/git/providers/gitlab.ts`, `templating/base-extension.ts`              | Replace with Web Crypto API (`globalThis.crypto.subtle`) where possible; IPC bridge for remainder |
+
+These changes should land together in one PR where practical, since they all share the same prerequisite (Phase 1b complete) and the same goal (nodeIntegration: false on the main window).
+
+#### What does not change
+
+- Hidden window retains `nodeIntegration: true` — Phase 2 tightens that
+- Plugin author behaviour unchanged
+- inso CLI unaffected (Node.js process, no Electron renderer)
+
+### Phase 2: sandbox hardening
+
+**Goal:** replace the hidden window's `nodeIntegration: true` runtime with a strict sandbox. Introduce capability-based permissions, the new `rendererFunctions`/`mainFunctions` API shape, and `contextIsolation: true`.
+
+#### What changes
+
+- Hidden plugin window rebuilt with `nodeIntegration: false`, `contextIsolation: true`, `sandbox: true`
+- Plugin API context object replaces direct Node/Electron access
+- Permission metadata and enforcement added for `mainFunctions`
+- Legacy plugin exports mapped onto new API shape or deprecated with explicit warnings
+- Settings UI for trust and permissions
+
+#### Relationship to Phase 1
+
+Phase 1 proves the IPC boundary and host lifecycle. Phase 2 tightens what crosses that boundary. Because networking is already in main after Phase 1, the remaining surface to lock down is constrained to the plugin context object.
+
+## Recommendation
+
+Start with a narrow POC:
+
+- keep plugin discovery and loading in main
+- run `rendererFunctions` in a separate host, not in the app UI renderer
+- allow `mainFunctions` only for bundled plugins or explicitly trusted plugins
+- expose one new preload bridge instead of many plugin-specific bridges
+
+That keeps the first iteration aligned with the app's existing preload and IPC architecture while leaving room for a more isolated runtime later.
+
+## Explicit deprecation stance
+
+This plan assumes explicit deprecations are acceptable.
+
+That means the new plugin system does not need to preserve all current plugin features in the first release. It should instead:
+
+1. ship a clean new architecture for the low-risk features first
+2. mark high-risk legacy features as deprecated early
+3. provide a migration path for medium-risk legacy features in a second pass
+4. leave high-risk legacy features on the old runtime until there is a dedicated replacement or a formal removal plan
+
+## Migration difficulty summary
+
+### Low-risk features
+
+- `themes`
+
+### Low-medium-risk features
+
+- `documentActions`
+
+### Medium-risk features
+
+- `requestActions`
+- `requestGroupActions`
+- `workspaceActions`
+- `unsafePluginMainActions`
+- plugin data store APIs
+
+### High-risk features
+
+- `requestHooks`
+- `responseHooks`
+- `templateTags`
+- renderer/worker dialog helpers
+- network and response-body helpers tied to the current request pipeline
+
+## Proposed delivery model
+
+### Phase 1: lift and shift (1a → 1b → 1c)
+
+The first phase moves plugin execution out of the app UI renderer without changing any plugin-visible behaviour. It is the prerequisite for all sandbox hardening work. It is delivered in three sub-phases.
+
+#### Phase 1a goals (current PR)
+
+- legacy behaviour baseline tests green in CI for all plugin export types
+- all plugin invocations cross the IPC bridge to the hidden window
+- zero behavioural regressions
+
+#### Phase 1b goals
+
+- plugin code removed from the main renderer bundle entirely
+- hidden BrowserWindow is sole owner of plugin discovery, loading, and execution
+- `process.type` guards in shared modules preserved for inso CLI compatibility (see [inso CLI and `process.type` guards](#inso-cli-and-processtype-guards))
+
+#### Phase 1c goals
+
+- `nodeIntegration: false` set on the main BrowserWindow
+- all residual renderer-side Node.js API usage eliminated (direct Electron imports, `fs`, `process.env`, dynamic `require`, `node:crypto`/`node:os`)
+- delivered as a single PR where practical, since all items share the same prerequisite (1b) and goal
+
+#### Out of scope for all of Phase 1
+
+- new plugin API surface or export shapes
+- permission model or trust gates
+- sandbox hardening on the hidden window
+- deprecation warnings
+
+#### Success criteria (Phase 1 complete)
+
+- all existing plugins work without modification
+- app UI renderer contains no direct `require()` or import of plugin packages
+- all plugin invocations cross the IPC bridge
+- main BrowserWindow runs with `nodeIntegration: false`
+- inso CLI plugin behaviour unchanged
+
+### Phase 2: sandbox hardening and new API surface
+
+The second phase tightens the hidden window, introduces the new API shape, and migrates legacy features.
+
+#### Goals
+
+- hidden window runs with `contextIsolation: true` and `nodeIntegration: false`
+- plugins access capabilities through a controlled context object only
+- new `rendererFunctions` / `mainFunctions` export shape is live
+- low-risk and medium-risk legacy features are migrated or deprecated
+
+#### In scope
+
+- hidden window rebuilt with strict sandbox settings
+- plugin context API (`RendererPluginContext`, `MainPluginContext`)
+- permission metadata and enforcement for `mainFunctions`
+- `themes`
+- `documentActions`
+- `requestActions`, `requestGroupActions`, `workspaceActions`
+- `unsafePluginMainActions` → `mainFunctions`
+- plugin data store bridge
+- settings UI for trust and permissions
+- migration docs for plugin authors
+- initial mutation / command protocol for action-style features
+
+#### Still out of scope
+
+- `requestHooks`
+- `responseHooks`
+- `templateTags`
+- full Nunjucks sandbox convergence
+
+#### Recommended compatibility strategy
+
+- support legacy and new plugin exports side-by-side for one transition window
+- map action-style exports onto new `rendererFunctions` internally where practical
+- convert bundled `unsafePluginMainActions` first as the lowest-risk privileged migration
+- add warnings that legacy exports are deprecated and will move to new API shape
+- do not migrate hook- or templating-driven features until a dedicated replacement design exists
+
+## Coexistence rules
+
+Legacy and new exports may need to coexist during migration, but the registry should make that behavior explicit.
+
+Recommended rules:
+
+1. A plugin may export legacy-only or new-only APIs with no warning.
+2. A plugin exporting both legacy and new APIs should load, but should receive a migration warning.
+3. New APIs should not silently shadow legacy APIs with the same user-facing purpose.
+4. The registry should log exactly which exports were accepted, deprecated, or ignored.
+5. The settings UI and docs should expose the plugin's current mode: legacy, mixed, or new.
+
+## Legacy feature mapping
+
+| Current feature           | Phase 1 treatment             | Phase 2 treatment           | Notes                                                 |
+| ------------------------- | ----------------------------- | --------------------------- | ----------------------------------------------------- |
+| `themes`                  | moved to hidden window, works | declarative plugin metadata | Keep data-only                                        |
+| `documentActions`         | moved to hidden window, works | `rendererFunctions`         | Lower risk than other actions                         |
+| `requestActions`          | moved to hidden window, works | `rendererFunctions`         | Needs DTO or mutation-patch wrapper in Phase 2        |
+| `requestGroupActions`     | moved to hidden window, works | `rendererFunctions`         | Same as request actions                               |
+| `workspaceActions`        | moved to hidden window, works | `rendererFunctions`         | Same as request actions                               |
+| `unsafePluginMainActions` | moved to hidden window, works | `mainFunctions`             | Best first migration candidate for privileged actions |
+| plugin store APIs         | moved to hidden window, works | plugin bridge/context APIs  | Good fit for explicit capability APIs                 |
+| `requestHooks`            | moved to hidden window, works | deprecated / later redesign | Do not force into Phase 2                             |
+| `responseHooks`           | moved to hidden window, works | deprecated / later redesign | Do not force into Phase 2                             |
+| `templateTags`            | moved to hidden window, works | separate redesign track     | Keep separate from first two phases                   |
+
+## Deprecation plan
+
+### Long-tail deprecations, not immediate removals
+
+These features should be marked deprecated when the new architecture lands, but should remain on a separate legacy track until a replacement exists:
+
+- `requestHooks`
+- `responseHooks`
+- `templateTags`
+- any plugin feature that relies on unrestricted renderer Node access
+
+The plan should not assume these features can be removed in the first two passes.
+
+### Supported in transition
+
+These can continue to work while the new system is introduced, but should gain migration guidance:
+
+- `themes`
+- `documentActions`
+- `requestActions`
+- `requestGroupActions`
+- `workspaceActions`
+- bundled `unsafePluginMainActions`
+
+### Runtime behavior
+
+- unsupported legacy exports in the new runtime should log a clear warning
+- deprecated exports on the old runtime should log a migration warning
+- docs should include a feature matrix: supported, deprecated, unsupported, planned
+- hook and templating features should remain explicitly "legacy-supported" until a replacement plan is approved
+
+## Pre-Phase 1: legacy behaviour baseline
+
+Phase 1 must not break existing plugin behaviour. Before any structural changes are made, a test baseline must exist that covers how legacy plugin functions are invoked today and how errors are handled. Phase 1 does not begin until this baseline is in place and passing.
+
+### What to capture
+
+For each plugin export type, the baseline must cover:
+
+| Export type               | Invocation shape                                 | Return value shape     | Error behaviour                                                  |
+| ------------------------- | ------------------------------------------------ | ---------------------- | ---------------------------------------------------------------- |
+| `templateTags`            | `render(context)` called with a mock tag context | rendered string        | thrown errors propagate to the template engine as a render error |
+| `requestHooks`            | `hook(context)` called before request dispatch   | void / mutates context | thrown errors abort the request with an error message            |
+| `responseHooks`           | `hook(context)` called after response received   | void / mutates context | thrown errors are logged; response is still returned             |
+| `requestActions`          | menu item triggers `action(context)`             | void                   | thrown errors shown as a notification                            |
+| `requestGroupActions`     | same as requestActions                           | void                   | same                                                             |
+| `workspaceActions`        | same as requestActions                           | void                   | same                                                             |
+| `documentActions`         | same as requestActions                           | void                   | same                                                             |
+| `unsafePluginMainActions` | invoked by name with args                        | serializable result    | thrown errors returned as structured error to caller             |
+| `themes`                  | queried by name for CSS vars                     | theme object           | missing theme falls back to default                              |
+
+### What to write
+
+1. **Unit tests for each export type** — test the current invocation path in isolation. Use a minimal fixture plugin (inline object, not a real package). Assert the return value and that a thrown error produces the expected downstream behaviour (abort, notification, fallback, etc.).
+
+2. **Error propagation tests** — explicitly test the error path for each export type:
+   - synchronous throw
+   - rejected promise
+   - non-Error thrown value (e.g. a plain string)
+
+   Assert the error reaches the right handler and does not crash the app.
+
+3. **IPC contract snapshot** — once the baseline tests pass, document the exact IPC message shapes that Phase 1 will introduce for each export type. These become the acceptance criteria for the Phase 1 IPC bridge: if a message shape changes, the test must be updated intentionally, not silently.
+
+### Success criteria for baseline
+
+- All export types have at least one happy-path test and one error-path test
+- Tests run in CI without requiring a live Electron renderer (use unit test mocks for IPC/context)
+- The test suite passes on the current `develop` branch before any Phase 1 work begins
+- Any Phase 1 change that causes a baseline test to fail is treated as a regression, not an acceptable trade-off
+
+### Where to put the tests
+
+Co-locate unit tests with the plugin execution code in `packages/insomnia/src/plugins/`. Name them `*.test.ts` following the existing Vitest convention. The baseline tests are not a one-off — they remain in the suite permanently as the regression guard for the hidden window migration and for Phase 2 sandbox hardening.
+
+## Concrete implementation slices
+
+### Phase 1 slices
+
+#### Phase 1a slices (current PR)
+
+1. **Baseline tests**
+   - write unit tests for each plugin export type covering happy path and error path
+   - tests must pass on `develop` before any structural changes
+
+2. **Hidden plugin window**
+   - create and manage a hidden BrowserWindow from main (`nodeIntegration: true`, `show: false`)
+   - define window lifecycle: created eagerly at app startup, kept alive until app exit
+   - add IPC channel for plugin invocation and result return
+
+3. **Bridge routing**
+   - add IPC handler in hidden window for each current plugin capability type
+   - redirect all app UI renderer plugin invocations through the bridge
+   - plugin code still bundled with renderer at this stage (duplication, not isolation)
+
+4. **Verification**
+   - run baseline tests against the new routing; confirm zero regressions
+
+#### Phase 1b slices
+
+1. **Bundle separation**
+   - remove `src/plugins/index.ts` and `plugins/context/` from the renderer bundle
+   - audit all `process.type === 'renderer'` guards in shared modules — preserve them for inso; use `window.__PLUGIN_WINDOW__` or equivalent to distinguish hidden window from app renderer if needed
+   - confirm renderer has zero direct plugin imports
+
+2. **inso validation**
+   - run inso CLI smoke tests to confirm `process.type` guard changes introduced no regressions
+
+#### Phase 1c slices
+
+1. **Remove direct Electron imports** — `routes/auth.clear-vault-key.tsx`: replace `ipcRenderer.emit` with `window.main`
+2. **Expose env vars via preload** — `common/constants.ts`, `settings/plugins.tsx`: add `INSOMNIA_DATA_PATH` and `PORTABLE_EXECUTABLE_DIR` to preload bridge
+3. **Bridge `fs` operations** — `models/helpers/response-operations.ts`, `script-executor.ts`, `network/grpc/write-proto-file.ts`: new IPC handlers in `src/main/ipc/`
+4. **Remove dynamic `require('electron')`** — `network/network.ts`: replace with static imports or `window.main`
+5. **Replace Node crypto/os** — `sync/delta/diff.ts`, `sync/git/providers/gitlab.ts`, `templating/base-extension.ts`: use `globalThis.crypto.subtle`; IPC bridge for remainder
+6. **Flip the flag** — set `nodeIntegration: false` on the main BrowserWindow and run full test suite
+
+### Phase 2 slices
+
+1. **Window hardening**
+   - rebuild hidden window with `nodeIntegration: false`, `contextIsolation: true`, `sandbox: true`
+   - add plugin preload that exposes the context object only
+
+2. **Registry layer**
+   - add new plugin type definitions for `rendererFunctions` and `mainFunctions`
+   - normalize legacy plugin exports onto new shape where possible
+   - detect mixed-mode plugins and emit coexistence warnings
+
+3. **Renderer host**
+   - expose minimal `RendererPluginContext` to plugin code
+   - route context API calls through IPC to main
+
+4. **Main runtime**
+   - create `mainFunctions` registry
+   - add IPC invocation path with permission enforcement
+   - enforce trust gate
+
+5. **Legacy migration**
+   - migrate `themes`, `documentActions`, action-style exports
+   - move `unsafePluginMainActions` onto `mainFunctions`
+   - define mutation/command protocol for action-style side effects
+
+6. **Operationalization**
+   - settings UI for trust and permissions
+   - migration guide for plugin authors
+   - runtime deprecation warnings for legacy exports
+
+## Recommended sequencing
+
+### Phase 1
+
+**Phase 1a (current PR)** 0. Write and pass legacy behaviour baseline tests. Do not proceed until green in CI.
+
+1. Create hidden plugin window in main; verify it can load a plugin module.
+2. Add IPC bridge; redirect all renderer plugin invocations through it.
+3. Run full test suite; confirm zero regressions.
+
+**Phase 1b** 4. Remove plugin code from the renderer bundle entirely. 5. Audit and preserve all `process.type === 'renderer'` guards for inso; add `window.__PLUGIN_WINDOW__` flag if disambiguation is needed. 6. Run inso CLI smoke tests to confirm no regressions.
+
+**Phase 1c** 7. Remove direct `import electron` and `require('electron')` from renderer. 8. Expose required `process.env` vars via preload. 9. Bridge `fs` operations in response/network/scripts via new IPC handlers. 10. Replace `node:crypto`/`node:os` with Web Crypto or IPC bridges. 11. Set `nodeIntegration: false` on the main BrowserWindow; run full test suite.
+
+### Phase 2
+
+6. Rebuild hidden window with `contextIsolation: true`, `nodeIntegration: false`.
+7. Introduce plugin context API; prove one `rendererFunctions` call end-to-end.
+8. Add `mainFunctions` registry and IPC invocation; prove one privileged call end-to-end.
+9. Convert one bundled `unsafePluginMainActions` to `mainFunctions`.
+10. Add `themes` and `documentActions` on the new API.
+11. Define and prototype the mutation / command protocol.
+12. Migrate `requestActions`, `requestGroupActions`, `workspaceActions`.
+13. Publish deprecation guidance for `requestHooks`, `responseHooks`, `templateTags`.
+
+## Key decisions for this plan
+
+**Phase 1 must not break existing plugins.** The hidden window with `nodeIntegration: true` is an intentional trade-off: it buys the structural separation needed to later apply the sandbox, without requiring plugin authors to change anything first. Any breakage in Phase 1 is a regression, not an accepted trade-off.
+
+**Phase 1 is three sub-phases, not one.** 1a proves the bridge; 1b achieves true isolation; 1c hardens the main window. Each is a separate PR. 1c items should land together where practical since they share the same prerequisite and goal.
+
+**`process.type === 'renderer'` guards are for inso, not just renderer detection.** The inso CLI reuses renderer code paths but loads implementations directly rather than via IPC. These guards must be preserved in shared modules during Phase 1b. See [inso CLI and `process.type` guards](#inso-cli-and-processtype-guards).
+
+**Phase 2 is where the new API surface lands.** The `rendererFunctions` / `mainFunctions` shapes, permission model, and settings UI belong in Phase 2. They should not block Phase 1 delivery.
+
+**Hook and templating features stay on the legacy path.** `requestHooks`, `responseHooks`, and `templateTags` move to the hidden window in Phase 1 (preserved, not redesigned), and remain on a separate redesign track after Phase 2 with explicit deprecation messaging.
+
+## What Remains to Disable nodeIntegration in the Renderer (Phase 2)
+
+## Blockers (must fix before flipping the switch)
+
+1. createPlugin uses Node.js fs/path directly in the renderer
+
+packages/insomnia/src/plugins/create.ts imports fs and path from Node and is called directly from two renderer entry points: the create-plugin modal and root.tsx (theme installation). This is the most straightforward fix — move the filesystem writes to an IPC handler  
+ in the main process and call it via window.main.
+
+2. Template tag extensions still run inside the renderer's Web Worker
+
+This is the largest remaining piece. Nunjucks rendering runs in a Web Worker (ui/worker/templating-handler.ts), but the plugin template tag extensions (base-extension-worker.ts) are instantiated and executed inside that worker, which lives inside the renderer process.
+The worker already has nodeIntegrationInWorker: false, so the web worker is sandboxed — but the template tag plugin code still lives on the renderer side of the fence. For nodeIntegration: false on the renderer, all plugin code (including template tags) needs to move
+out.
+
+The cleanest solution — and the one you're already thinking about — is to move the entire templating pipeline into the plugin window. Template tags and request/action plugins would then share the same Node.js process and DB proxy. The custom  
+ insomnia-templating-worker-database:// protocol (currently used by the web worker to reach the main process for DB calls, network requests, file reads, etc.) could be replaced entirely with the existing IPC database proxy. The renderer side becomes a thin caller:
+serialize the render context, send it over IPC, get back a rendered string.
+
+3. webviewTag: true on the main window
+
+response-web-view.tsx uses Electron's <webview> tag to render HTML response previews. The webviewTag: true setting in window-utils.ts:204 must remain until this is replaced. With contextIsolation: true the webview still functions, but it's a meaningful attack surface —
+a malicious API response could attempt to exploit the webview. The right long-term replacement is a sandboxed <iframe srcdoc> (no src, no allow attributes), which achieves the same preview without a privileged Electron component.
+
+---
+
+## Minor Cleanup (not blockers, but needed for correctness)
+
+- packages/insomnia/src/network/cancellation.ts:52 — the process.type === 'renderer' branch guard can be deleted once the renderer no longer has process in scope; the non-renderer branch there is unreachable from the renderer anyway.
+
+---
+
+## Suggested Phase 2 Work Order
+
+┌─────┬───────────────────────────────────────────┬──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐  
+ │ # │ Task │ Approach │
+├─────┼───────────────────────────────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤  
+ │ 1 │ Move createPlugin to main process │ Add IPC handler, replace fs/path calls with window.main.createPlugin(...) │
+├─────┼───────────────────────────────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤  
+ │ 2 │ Move templating pipeline to plugin window │ The plugin window replaces the web worker; renderer calls window.main.plugins.renderTemplate(context) over IPC; drop the insomnia-templating-worker-database:// protocol │  
+ ├─────┼───────────────────────────────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤  
+ │ 3 │ Replace <webview> with sandboxed <iframe> │ Removes the last reason for webviewTag: true │  
+ ├─────┼───────────────────────────────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤  
+ │ 4 │ Flip the switch │ Set nodeIntegration: false, contextIsolation: true on the main renderer window │  
+ └─────┴───────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+
+The templating migration (item 2) is the most work but also the most architecturally coherent outcome — all plugin code (actions, hooks, template tags) runs in one place with one shared DB proxy, one Node.js context, and one IPC boundary back to the renderer.
diff --git a/packages/insomnia/esbuild.entrypoints.ts b/packages/insomnia/esbuild.entrypoints.ts
index 5c09b11994..e70b57c794 100644
--- a/packages/insomnia/esbuild.entrypoints.ts
+++ b/packages/insomnia/esbuild.entrypoints.ts
@@ -73,6 +73,31 @@ export default async function build(options: Options) {
     },
   };
 
+  const pluginWindowBuildOptions: BuildOptions = {
+    entryPoints: ['./src/entry.plugin-window.ts'],
+    outfile: path.join(outdir, 'entry.plugin-window.min.js'),
+    target: 'esnext',
+    bundle: true,
+    platform: 'node',
+    sourcemap: true,
+    format: 'cjs',
+    external: ['electron'],
+    loader: {
+      '.node': 'copy',
+    },
+  };
+
+  const pluginWindowPreloadBuildOptions: BuildOptions = {
+    entryPoints: ['./src/entry.plugin-window-preload.ts'],
+    outfile: path.join(outdir, 'entry.plugin-window-preload.min.js'),
+    target: 'esnext',
+    bundle: true,
+    platform: 'node',
+    sourcemap: true,
+    format: 'cjs',
+    external: ['electron'],
+  };
+
   const mainBuildOptions: BuildOptions = {
     entryPoints: ['./src/entry.main.ts'],
     outfile: path.join(outdir, 'entry.main.min.js'),
@@ -132,11 +157,11 @@ export default async function build(options: Options) {
         });
         build.onEnd(() => {
           buildCount++;
-          // first build after main/preload/hiddenWindows is built
-          if (buildCount === 3) {
+          // first build after main/preload/hiddenWindows/pluginWindows is built
+          if (buildCount === 6) {
             console.log('[Dev Build] Build complete, start Electron');
             startElectron();
-          } else if (buildCount > 3) {
+          } else if (buildCount > 6) {
             console.log(`[Dev Build] Finish rebuilding ${scriptName}, restarting Electron`);
             restartElectronProcess();
           } else {
@@ -161,6 +186,14 @@ export default async function build(options: Options) {
       ...hiddenBrowserWindowPreloadBuildOptions,
       plugins: [restartElectronPlugin('hidden-browser-window-preload')],
     });
+    const pluginWindowContext = await esbuild.context({
+      ...pluginWindowBuildOptions,
+      plugins: [restartElectronPlugin('plugin-window')],
+    });
+    const pluginWindowPreloadContext = await esbuild.context({
+      ...pluginWindowPreloadBuildOptions,
+      plugins: [restartElectronPlugin('plugin-window-preload')],
+    });
 
     const restartElectronProcess = () => {
       console.log('[Dev Build] Start restarting Electron');
@@ -180,13 +213,17 @@ export default async function build(options: Options) {
     const hiddenWindowWatch = await hiddenBrowserWindowContext.watch();
     const mainWatch = await mainContext.watch();
     const hiddenWindowPreloadWatch = await hiddenPreloadContext.watch();
-    return Promise.all([preloadWatch, hiddenWindowPreloadWatch, mainWatch, hiddenWindowWatch]);
+    const pluginWindowWatch = await pluginWindowContext.watch();
+    const pluginWindowPreloadWatch = await pluginWindowPreloadContext.watch();
+    return Promise.all([preloadWatch, hiddenWindowPreloadWatch, mainWatch, hiddenWindowWatch, pluginWindowWatch, pluginWindowPreloadWatch]);
   }
   const preload = esbuild.build(preloadBuildOptions);
   const hiddenBrowserWindow = esbuild.build(hiddenBrowserWindowBuildOptions);
   const hiddenBrowserWindowPreload = esbuild.build(hiddenBrowserWindowPreloadBuildOptions);
+  const pluginWindow = esbuild.build(pluginWindowBuildOptions);
+  const pluginWindowPreload = esbuild.build(pluginWindowPreloadBuildOptions);
   const main = esbuild.build(mainBuildOptions);
-  return Promise.all([main, preload, hiddenBrowserWindow, hiddenBrowserWindowPreload]).catch(err => {
+  return Promise.all([main, preload, hiddenBrowserWindow, hiddenBrowserWindowPreload, pluginWindow, pluginWindowPreload]).catch(err => {
     console.error('[Build] Build failed:', err);
   });
 }
diff --git a/packages/insomnia/scripts/build.ts b/packages/insomnia/scripts/build.ts
index 827bdf4c5f..c68eba603b 100644
--- a/packages/insomnia/scripts/build.ts
+++ b/packages/insomnia/scripts/build.ts
@@ -58,6 +58,7 @@ export const start = async () => {
     path.join(buildFolder, 'main/mcp-generate-sampling-response.mjs'),
   );
   await copyFiles('../src/hidden-window.html', path.join(buildFolder, 'hidden-window.html'));
+  await copyFiles('../src/plugin-window.html', path.join(buildFolder, 'plugin-window.html'));
 
   console.log('[build] Complete!');
 };
diff --git a/packages/insomnia/src/entry.plugin-window-preload.ts b/packages/insomnia/src/entry.plugin-window-preload.ts
new file mode 100644
index 0000000000..a84e54c148
--- /dev/null
+++ b/packages/insomnia/src/entry.plugin-window-preload.ts
@@ -0,0 +1,40 @@
+import { ipcRenderer } from 'electron';
+
+// Provide window.app so plugin-loading code (which checks process.type === 'renderer')
+// can resolve the userData path without needing the main renderer's full preload.
+window.app = {
+  getPath: (name: string) => ipcRenderer.sendSync('getPath', name) as string,
+  getAppPath: () => ipcRenderer.sendSync('getAppPath') as string,
+  process: { platform: process.platform as NodeJS.Platform },
+};
+
+// Bridge plugin UI calls to the main renderer window via IPC.
+// The plugin window has no visible DOM; these methods forward to the main renderer.
+window.showAlert = (options?: Record<string, any>) => {
+  ipcRenderer.send('plugin-ui-alert', options ?? {});
+};
+
+window.showWrapper = (options?: Record<string, any>) => {
+  ipcRenderer.send('plugin-ui-dialog', options ?? {});
+};
+
+window.showPrompt = (options?: Record<string, any>) => {
+  const { onComplete, onHide, ...serializableOptions } = options ?? {};
+  ipcRenderer.invoke('plugin-ui-prompt', serializableOptions).then((value: string | null) => {
+    if (value !== null && value !== undefined) {
+      onComplete?.(value);
+    }
+    onHide?.();
+  });
+};
+
+window.dialog = {
+  showSaveDialog: (opts: any) => ipcRenderer.invoke('showSaveDialog', opts),
+  showOpenDialog: (opts: any) => ipcRenderer.invoke('showOpenDialog', opts),
+};
+
+window.clipboard = {
+  readText: () => ipcRenderer.sendSync('readText') as string,
+  writeText: (text: string) => { ipcRenderer.send('writeText', text); },
+  clear: () => { ipcRenderer.send('clear'); },
+};
diff --git a/packages/insomnia/src/entry.plugin-window.ts b/packages/insomnia/src/entry.plugin-window.ts
new file mode 100644
index 0000000000..e576038d48
--- /dev/null
+++ b/packages/insomnia/src/entry.plugin-window.ts
@@ -0,0 +1,36 @@
+import { ipcRenderer } from 'electron';
+
+import { initDatabase, initServices } from '~/insomnia-data';
+import { servicesNodeImpl } from '~/insomnia-data/node';
+
+import { pluginWindowDatabase } from './main/database.plugin-window';
+import { invokePluginMethod } from './plugins/invoke-method';
+
+interface PluginInvokeMessage {
+  id: string;
+  method: Parameters<typeof invokePluginMethod>[0];
+  args: unknown;
+}
+
+ipcRenderer.on('plugin-invoke', async (_event, { id, method, args }: PluginInvokeMessage) => {
+  try {
+    const result = await invokePluginMethod(method, args);
+    ipcRenderer.send('plugin-invoke-result', { id, result });
+  } catch (error) {
+    const errMsg = error instanceof Error ? error.message : String(error);
+    console.error(`[plugin-window] Error in ${(error as any)?.method ?? method}: ${errMsg}`);
+    ipcRenderer.send('plugin-invoke-result', { id, error: errMsg });
+  }
+});
+
+// Initialize database (via IPC proxy) and services before signalling readiness.
+// getPlugins() calls services.settings.get(), which requires this to be done first.
+(async () => {
+  try {
+    await initDatabase(pluginWindowDatabase);
+    initServices(servicesNodeImpl);
+    ipcRenderer.send('plugin-window-ready');
+  } catch (err) {
+    console.error('[plugin-window] Initialization failed:', err);
+  }
+})();
diff --git a/packages/insomnia/src/entry.preload.ts b/packages/insomnia/src/entry.preload.ts
index 6ad8416d4e..ef8ba26dee 100644
--- a/packages/insomnia/src/entry.preload.ts
+++ b/packages/insomnia/src/entry.preload.ts
@@ -17,10 +17,27 @@ import type { CurlBridgeAPI } from './main/network/curl';
 import type { McpBridgeAPI } from './main/network/mcp';
 import type { SocketIOBridgeAPI } from './main/network/socket-io';
 import type { WebSocketBridgeAPI } from './main/network/websocket';
+import type {
+  ApplyRequestHooksArgs,
+  ApplyResponseHooksArgs,
+  ExecutePluginActionArgs,
+  ExecutePluginMainActionArgs,
+  PluginsBridgeAPI,
+  RunTemplateTagActionArgs,
+} from './plugins/bridge-types';
+import type { PluginInvokeMethod } from './plugins/invoke-method';
 import type { RenderedRequest } from './templating/types';
 import { invariant } from './utils/invariant';
 const ports = new Map<'hiddenWindowPort', MessagePort>();
 
+type PluginMethodResult<T extends PluginInvokeMethod> = T extends keyof PluginsBridgeAPI
+  ? Awaited<ReturnType<PluginsBridgeAPI[T]>>
+  : never;
+
+const invokePluginBridgeMethod = <T extends PluginInvokeMethod>(method: T, args?: unknown): Promise<PluginMethodResult<T>> => {
+  return invokeWithNormalizedError(`plugins.${method}`, args) as Promise<PluginMethodResult<T>>;
+};
+
 const webSocket: WebSocketBridgeAPI = {
   open: options => invokeWithNormalizedError('webSocket.open', options),
   close: options => ipcRenderer.send('webSocket.close', options),
@@ -344,6 +361,28 @@ const main: Window['main'] = {
     invokeWithNormalizedError('generateCommitsFromDiff', input),
   generateMcpSamplingResponse: (parameters: Parameters<GenerateMcpSamplingResponseFunction>[0]) =>
     invokeWithNormalizedError('generateMcpSamplingResponse', parameters),
+  plugins: {
+    getThemes: () => invokePluginBridgeMethod('getThemes'),
+    getPlugins: () => invokePluginBridgeMethod('getPlugins'),
+    getActivePlugins: () => invokePluginBridgeMethod('getActivePlugins'),
+    reloadPlugins: () => invokePluginBridgeMethod('reloadPlugins'),
+    getRequestActions: () => invokePluginBridgeMethod('getRequestActions'),
+    getRequestGroupActions: () => invokePluginBridgeMethod('getRequestGroupActions'),
+    getWorkspaceActions: () => invokePluginBridgeMethod('getWorkspaceActions'),
+    getDocumentActions: () => invokePluginBridgeMethod('getDocumentActions'),
+    executeAction: (args: ExecutePluginActionArgs) => invokePluginBridgeMethod('executeAction', args),
+    getTemplateTags: () => invokePluginBridgeMethod('getTemplateTags'),
+    runTemplateTagAction: (args: RunTemplateTagActionArgs) => invokePluginBridgeMethod('runTemplateTagAction', args),
+    getBundlePlugins: () => invokePluginBridgeMethod('getBundlePlugins'),
+    executePluginMainAction: (args: ExecutePluginMainActionArgs) => invokePluginBridgeMethod('executePluginMainAction', args),
+    hasRequestHooks: () => invokePluginBridgeMethod('hasRequestHooks'),
+    hasResponseHooks: () => invokePluginBridgeMethod('hasResponseHooks'),
+    applyRequestHooks: (args: ApplyRequestHooksArgs) => invokePluginBridgeMethod('applyRequestHooks', args),
+    applyResponseHooks: (args: ApplyResponseHooksArgs) => invokePluginBridgeMethod('applyResponseHooks', args),
+    getBridgeMetrics: () => invokeWithNormalizedError('plugins.getBridgeMetrics'),
+  },
+  notifyPluginPromptResult: (id: string, value: string | null) =>
+    ipcRenderer.send('plugin-ui-prompt-result', { id, value }),
 };
 
 ipcRenderer.on('hidden-browser-window-response-listener', event => {
diff --git a/packages/insomnia/src/main/database.plugin-window.ts b/packages/insomnia/src/main/database.plugin-window.ts
new file mode 100644
index 0000000000..919199911e
--- /dev/null
+++ b/packages/insomnia/src/main/database.plugin-window.ts
@@ -0,0 +1,23 @@
+import { ipcRenderer } from 'electron';
+
+import type { IDatabase } from '~/insomnia-data';
+
+// Routes all database calls to the main process via the 'database.invoke' IPC handler
+// that mainDatabase registers on startup.  The plugin window must not open a second
+// NeDB connection to the same files, so this proxy is the correct approach.
+export const pluginWindowDatabase: IDatabase = new Proxy({} as IDatabase, {
+  get(_target, fnName) {
+    if (typeof fnName === 'symbol') {
+      return;
+    }
+    if (fnName === 'init') {
+      // Main process already initialised the database.
+      return async () => {};
+    }
+    if (fnName === 'flushChanges') {
+      // The plugin window never needs to broadcast db.changes to other windows.
+      return async () => ({ changes: [], deletedIds: [] });
+    }
+    return (...args: unknown[]) => ipcRenderer.invoke('database.invoke', fnName, ...args);
+  },
+});
diff --git a/packages/insomnia/src/main/ipc/electron.ts b/packages/insomnia/src/main/ipc/electron.ts
index 64cd849ef5..7e8d584033 100644
--- a/packages/insomnia/src/main/ipc/electron.ts
+++ b/packages/insomnia/src/main/ipc/electron.ts
@@ -14,7 +14,6 @@ import { fnOrString } from '../../common/misc';
 import {
   type NunjucksParsedTagArg,
   type NunjucksTagContextMenuAction,
-  type PluginTemplateTag,
 } from '../../templating/types';
 import type { extractNunjucksTagFromCoords } from '../../templating/utils';
 import { invariant } from '../../utils/invariant';
@@ -120,6 +119,20 @@ export type HandleChannels =
   | 'multipartBufferToArray'
   | 'onDefaultBrowserOAuthRedirect'
   | 'open-channel-to-hidden-browser-window'
+  | 'plugins.executeAction'
+  | 'plugins.getBundlePlugins'
+  | 'plugins.executePluginMainAction'
+  | 'plugins.getTemplateTags'
+  | 'plugins.runTemplateTagAction'
+  | 'plugins.getActivePlugins'
+  | 'plugins.getDocumentActions'
+  | 'plugins.getPlugins'
+  | 'plugins.getRequestActions'
+  | 'plugins.getRequestGroupActions'
+  | 'plugins.getThemes'
+  | 'plugins.getWorkspaceActions'
+  | 'plugins.reloadPlugins'
+  | 'plugin-ui-prompt'
   | 'openPath'
   | 'parseImport'
   | 'readCurlResponse'
@@ -179,6 +192,8 @@ export type MainOnChannels =
   | 'path.resolve'
   | 'readText'
   | 'restart'
+  | 'plugin-invoke-result'
+  | 'plugin-window-ready'
   | 'set-hidden-window-busy-status'
   | 'setMenuBarVisibility'
   | 'show-nunjucks-context-menu'
@@ -202,11 +217,15 @@ export type MainOnChannels =
   | 'sync.cancelConflict'
   | 'sync.resolveConflict'
   | 'mcp.sendMCPRequest'
+  | 'plugin-ui-prompt-result'
   | 'writeText';
 
 export type RendererOnChannels =
   | 'contextMenuCommand'
   | 'db.changes'
+  | 'plugin-ui-alert'
+  | 'plugin-ui-dialog'
+  | 'plugin-ui-prompt'
   | 'grpc.data'
   | 'grpc.end'
   | 'grpc.error'
@@ -240,6 +259,16 @@ export const ipcMainOnce = (
   listener: (event: IpcMainEvent, ...args: any[]) => Promise<void> | any,
 ) => ipcMain.once(channel, listener);
 
+interface ContextMenuTag {
+  templateTag: {
+    name: string;
+    displayName: string | (() => string);
+    args?: NunjucksParsedTagArg[];
+    needsEnterprisePlan?: boolean;
+  };
+}
+
+
 const getTemplateValue = (arg: NunjucksParsedTagArg) => {
   if (arg.defaultValue === undefined) {
     return "''";
@@ -258,7 +287,7 @@ export function registerElectronHandlers() {
       options: {
         key: string;
         nunjucksTag: ReturnType<typeof extractNunjucksTagFromCoords>;
-        pluginTemplateTags?: { templateTag: PluginTemplateTag }[];
+        pluginTemplateTags?: { templateTag: Record<string, unknown> }[];
       },
     ) => {
       const { key, nunjucksTag, pluginTemplateTags = [] } = options;
@@ -303,7 +332,7 @@ export function registerElectronHandlers() {
               },
               { type: 'separator' },
             ];
-        const localTemplate: MenuItemConstructorOptions[] = [...localTemplateTags, ...pluginTemplateTags]
+        const localTemplate: MenuItemConstructorOptions[] = ([...localTemplateTags, ...pluginTemplateTags] as ContextMenuTag[])
           // sort alphabetically
           .sort((a, b) => fnOrString(a.templateTag.displayName).localeCompare(fnOrString(b.templateTag.displayName)))
           .map(l => {
@@ -330,7 +359,7 @@ export function registerElectronHandlers() {
                     submenu: actions?.options?.map(action => ({
                       label: fnOrString(action.displayName),
                       click: () => {
-                        const additionalTagFields = additionalArgs.length
+                        const additionalTagFields = additionalArgs?.length
                           ? ', ' + additionalArgs.map(getTemplateValue).join(', ')
                           : '';
                         const displayName = action.displayName;
diff --git a/packages/insomnia/src/main/ipc/main.ts b/packages/insomnia/src/main/ipc/main.ts
index d5ea14087b..2e4cd0afce 100644
--- a/packages/insomnia/src/main/ipc/main.ts
+++ b/packages/insomnia/src/main/ipc/main.ts
@@ -36,7 +36,8 @@ import type {
 } from '~/plugins/types';
 
 import type { HiddenBrowserWindowBridgeAPI } from '../../entry.hidden-window';
-import type { PluginTemplateTag, RenderedRequest } from '../../templating/types';
+import type { PluginsBridgeAPI } from '../../plugins/bridge-types';
+import type { RenderedRequest } from '../../templating/types';
 import type { AnalyticsEvent } from '../analytics';
 import { setCurrentOrganizationId, trackAnalyticsEvent, trackPageView } from '../analytics';
 import {
@@ -63,6 +64,7 @@ import {
 } from '../network/request-timing';
 import type { SocketIOBridgeAPI } from '../network/socket-io';
 import type { WebSocketBridgeAPI } from '../network/websocket';
+import { registerPluginIpcHandlers } from '../plugin-window';
 import { ipcMainHandle, ipcMainOn, type RendererOnChannels } from './electron';
 import type { electronStorageBridgeAPI } from './electron-storage';
 import extractPostmanDataDumpHandler from './extract-postman-data-dump';
@@ -192,7 +194,7 @@ export interface RendererToMainBridgeAPI {
   showNunjucksContextMenu: (options: {
     key: string;
     nunjucksTag?: { template: string; range: MarkerRange };
-    pluginTemplateTags?: { templateTag: PluginTemplateTag }[];
+    pluginTemplateTags?: { templateTag: Record<string, unknown> }[];
   }) => void;
   showContextMenu: (options: {
     key: string;
@@ -237,6 +239,8 @@ export interface RendererToMainBridgeAPI {
     | { response: undefined; error: string }
   >;
   syncNewWorkspaceIfNeeded: typeof syncNewWorkspaceIfNeeded;
+  plugins: PluginsBridgeAPI;
+  notifyPluginPromptResult: (id: string, value: string | null) => void;
 }
 
 export function registerMainHandlers() {
@@ -664,4 +668,6 @@ export function registerMainHandlers() {
       });
     });
   });
+
+  registerPluginIpcHandlers();
 }
diff --git a/packages/insomnia/src/main/network/socket-io.ts b/packages/insomnia/src/main/network/socket-io.ts
index b44fee09a7..b0b245686b 100644
--- a/packages/insomnia/src/main/network/socket-io.ts
+++ b/packages/insomnia/src/main/network/socket-io.ts
@@ -95,6 +95,15 @@ const protocolName = 'socketIO';
 const getEventNotificationChannel = (responseId: string) =>
   `${protocolName}.${responseId}.${REALTIME_EVENTS_CHANNELS.NEW_EVENT}`;
 
+const sendToOpenWindows = (channel: string, ...args: unknown[]) => {
+  for (const window of BrowserWindow.getAllWindows()) {
+    if (window.isDestroyed() || window.webContents.isDestroyed()) {
+      continue;
+    }
+    window.webContents.send(channel, ...args);
+  }
+};
+
 const writeEventLogAndNotify = ({
   requestId,
   data,
@@ -105,17 +114,17 @@ const writeEventLogAndNotify = ({
   clearRequestIdMap?: boolean;
 }) => {
   eventLogFileStreams.get(requestId)?.write(data, () => {
+    const resId = requestIdToResponseIdMap.get(requestId);
+    if (!resId) {
+      return;
+    }
+
     // notify all renderers of new event has been received
-    for (const window of BrowserWindow.getAllWindows()) {
-      const resId = requestIdToResponseIdMap.get(requestId);
-      if (resId) {
-        const notifyChannel = getEventNotificationChannel(resId);
-        notifyChannel && window.webContents.send(notifyChannel);
-        if (clearRequestIdMap) {
-          // clean up maps after last event has been written to file
-          requestIdToResponseIdMap.delete(requestId);
-        }
-      }
+    const notifyChannel = getEventNotificationChannel(resId);
+    sendToOpenWindows(notifyChannel);
+    if (clearRequestIdMap) {
+      // clean up maps after last event has been written to file
+      requestIdToResponseIdMap.delete(requestId);
     }
   });
 };
@@ -329,9 +338,7 @@ const openSocketIOConnection = async (
     const openedEvents = request.eventListeners.filter(event => event.isOpen && event.eventName);
 
     socket.on('connect', async () => {
-      for (const window of BrowserWindow.getAllWindows()) {
-        window.webContents.send(readyStateChannel, socket.connected);
-      }
+      sendToOpenWindows(readyStateChannel, socket.connected);
 
       const openEvent: SocketIOpenEvent = {
         _id: uuidV4(),
@@ -385,9 +392,7 @@ const openSocketIOConnection = async (
         timestamp: Date.now(),
       };
       deleteRequestMaps(request._id, reason, closeEvent);
-      for (const window of BrowserWindow.getAllWindows()) {
-        window.webContents.send(readyStateChannel, socket.connected);
-      }
+      sendToOpenWindows(readyStateChannel, socket.connected);
     });
 
     socket.on('connect_error', error => {
diff --git a/packages/insomnia/src/main/network/websocket.ts b/packages/insomnia/src/main/network/websocket.ts
index 1e3e8aee75..6c29d3da35 100644
--- a/packages/insomnia/src/main/network/websocket.ts
+++ b/packages/insomnia/src/main/network/websocket.ts
@@ -84,6 +84,15 @@ const timelineFileStreams = new Map<string, fs.WriteStream>();
 const getEventNotificationChannel = (responseId: string) =>
   `${protocolName}.${responseId}.${REALTIME_EVENTS_CHANNELS.NEW_EVENT}`;
 
+const sendToOpenWindows = (channel: string, ...args: unknown[]) => {
+  for (const window of BrowserWindow.getAllWindows()) {
+    if (window.isDestroyed() || window.webContents.isDestroyed()) {
+      continue;
+    }
+    window.webContents.send(channel, ...args);
+  }
+};
+
 const writeEventLogAndNotify = ({
   requestId,
   data,
@@ -94,17 +103,17 @@ const writeEventLogAndNotify = ({
   clearRequestIdMap?: boolean;
 }) => {
   eventLogFileStreams.get(requestId)?.write(data, () => {
+    const resId = requestIdToResponseIdMap.get(requestId);
+    if (!resId) {
+      return;
+    }
+
     // notify all renderers of new event has been received
-    for (const window of BrowserWindow.getAllWindows()) {
-      const resId = requestIdToResponseIdMap.get(requestId);
-      if (resId) {
-        const notifyChannel = getEventNotificationChannel(resId);
-        notifyChannel && window.webContents.send(notifyChannel);
-        if (clearRequestIdMap) {
-          // clean up maps after last event has been written to file
-          requestIdToResponseIdMap.delete(requestId);
-        }
-      }
+    const notifyChannel = getEventNotificationChannel(resId);
+    sendToOpenWindows(notifyChannel);
+    if (clearRequestIdMap) {
+      // clean up maps after last event has been written to file
+      requestIdToResponseIdMap.delete(requestId);
     }
   });
 };
@@ -397,9 +406,7 @@ const openWebSocketConnection = async (
         ?.write(
           JSON.stringify({ value: 'WebSocket connection established', name: 'Text', timestamp: Date.now() }) + '\n',
         );
-      for (const window of BrowserWindow.getAllWindows()) {
-        window.webContents.send(readyStateChannel, ws.readyState === WebSocket.OPEN);
-      }
+      sendToOpenWindows(readyStateChannel, ws.readyState === WebSocket.OPEN);
 
       if (options.initialPayload) {
         sendPayload(ws, { requestId: options.requestId, payload: options.initialPayload });
@@ -435,9 +442,7 @@ const openWebSocketConnection = async (
 
       const message = `Closing connection with code ${code}`;
       deleteRequestMaps(request._id, message, closeEvent);
-      for (const window of BrowserWindow.getAllWindows()) {
-        window.webContents.send(readyStateChannel, ws.readyState === WebSocket.OPEN);
-      }
+      sendToOpenWindows(readyStateChannel, ws.readyState === WebSocket.OPEN);
     });
 
     ws.addEventListener('error', async ({ error, message }: ErrorEvent) => {
@@ -453,9 +458,7 @@ const openWebSocketConnection = async (
       };
 
       deleteRequestMaps(request._id, message, errorEvent);
-      for (const window of BrowserWindow.getAllWindows()) {
-        window.webContents.send(readyStateChannel, ws.readyState === WebSocket.OPEN);
-      }
+      sendToOpenWindows(readyStateChannel, ws.readyState === WebSocket.OPEN);
       if (error.code) {
         createErrorResponse(
           responseId,
diff --git a/packages/insomnia/src/main/plugin-window.ts b/packages/insomnia/src/main/plugin-window.ts
new file mode 100644
index 0000000000..32893a8098
--- /dev/null
+++ b/packages/insomnia/src/main/plugin-window.ts
@@ -0,0 +1,316 @@
+import { randomUUID } from 'node:crypto';
+import path from 'node:path';
+
+import { app, BrowserWindow, ipcMain } from 'electron';
+
+let pluginWindow: BrowserWindow | null = null;
+let windowReady = false;
+const pendingRequests = new Map<string, { resolve: (v: unknown) => void; reject: (e: Error) => void; method: string; startedAt: number }>();
+
+let cachedHasRequestHooks: boolean | null = null;
+let cachedHasResponseHooks: boolean | null = null;
+const promptPendingRequests = new Map<string, (value: string | null) => void>();
+
+// Bridge observability counters.  Kept in-memory and exposed via the
+// `plugins.getBridgeMetrics` IPC handler so devs / smoke tests / support
+// dumps can read the live state without scraping logs.
+interface BridgeMethodStats {
+  ok: number;
+  error: number;
+  timeout: number;
+  totalDurationMs: number;
+  maxDurationMs: number;
+}
+const bridgeMetrics = {
+  windowStartups: 0,
+  windowCrashes: 0,
+  windowStartupMsLast: 0 as number | null,
+  // wall-clock time of the most recent createPluginWindow() call
+  lastStartupAt: 0 as number | null,
+  perMethod: new Map<string, BridgeMethodStats>(),
+};
+
+function recordInvocation(method: string, outcome: 'ok' | 'error' | 'timeout', durationMs: number) {
+  let stats = bridgeMetrics.perMethod.get(method);
+  if (!stats) {
+    stats = { ok: 0, error: 0, timeout: 0, totalDurationMs: 0, maxDurationMs: 0 };
+    bridgeMetrics.perMethod.set(method, stats);
+  }
+  stats[outcome] += 1;
+  stats.totalDurationMs += durationMs;
+  if (durationMs > stats.maxDurationMs) {
+    stats.maxDurationMs = durationMs;
+  }
+  // Single structured log line per invocation; cheap to grep, easy to ship to analytics later.
+  console.log(`[plugin-bridge] invoke method=${method} outcome=${outcome} duration_ms=${durationMs}`);
+}
+
+export function getBridgeMetricsSnapshot() {
+  const perMethod: Record<string, BridgeMethodStats & { avgDurationMs: number }> = {};
+  for (const [method, stats] of bridgeMetrics.perMethod) {
+    const calls = stats.ok + stats.error + stats.timeout;
+    perMethod[method] = {
+      ...stats,
+      avgDurationMs: calls > 0 ? Math.round(stats.totalDurationMs / calls) : 0,
+    };
+  }
+  return {
+    windowStartups: bridgeMetrics.windowStartups,
+    windowCrashes: bridgeMetrics.windowCrashes,
+    windowStartupMsLast: bridgeMetrics.windowStartupMsLast,
+    windowReady,
+    pendingInvocations: pendingRequests.size,
+    perMethod,
+  };
+}
+
+function getMainWindow() {
+  return BrowserWindow.getAllWindows().find(w => !w.isDestroyed() && w.getTitle() === 'Insomnia');
+}
+
+// Registered once so that persistent `ipcMain.on` handlers don't accumulate across window recreations.
+let ipcListenersRegistered = false;
+
+function ensureIpcListeners() {
+  if (ipcListenersRegistered) {
+    return;
+  }
+  ipcListenersRegistered = true;
+
+  ipcMain.on('plugin-window-ready', event => {
+    if (event.sender !== pluginWindow?.webContents) {
+      return;
+    }
+    windowReady = true;
+    const startedAt = bridgeMetrics.lastStartupAt;
+    const startupMs = startedAt ? Date.now() - startedAt : 0;
+    bridgeMetrics.windowStartupMsLast = startupMs;
+    console.log(`[plugin-bridge] window_ready startup_ms=${startupMs}`);
+  });
+
+  ipcMain.on('plugin-ui-alert', (event, options: Record<string, unknown>) => {
+    if (event.sender !== pluginWindow?.webContents) {
+      return;
+    }
+    getMainWindow()?.webContents.send('plugin-ui-alert', options);
+  });
+
+  ipcMain.on('plugin-ui-dialog', (event, options: Record<string, unknown>) => {
+    if (event.sender !== pluginWindow?.webContents) {
+      return;
+    }
+    getMainWindow()?.webContents.send('plugin-ui-dialog', options);
+  });
+
+  ipcMain.handle('plugin-ui-prompt', async (event, options: Record<string, unknown>) => {
+    if (event.sender !== pluginWindow?.webContents) {
+      return null;
+    }
+    const mainWindow = getMainWindow();
+    if (!mainWindow) {
+      return null;
+    }
+    const id = randomUUID();
+    return new Promise<string | null>(resolve => {
+      const timeout = setTimeout(() => {
+        promptPendingRequests.delete(id);
+        resolve(null);
+      }, 60_000);
+      promptPendingRequests.set(id, value => {
+        clearTimeout(timeout);
+        resolve(value);
+      });
+      mainWindow.webContents.send('plugin-ui-prompt', id, options);
+    });
+  });
+
+  ipcMain.on('plugin-ui-prompt-result', (_event, { id, value }: { id: string; value: string | null }) => {
+    const resolve = promptPendingRequests.get(id);
+    if (!resolve) {
+      return;
+    }
+    promptPendingRequests.delete(id);
+    resolve(value);
+  });
+
+  ipcMain.on('plugin-invoke-result', (event, { id, result, error }: { id: string; result?: unknown; error?: string }) => {
+    if (event.sender !== pluginWindow?.webContents) {
+      return;
+    }
+    const pending = pendingRequests.get(id);
+    if (!pending) {
+      return;
+    }
+    pendingRequests.delete(id);
+    const duration = Date.now() - pending.startedAt;
+    if (error) {
+      recordInvocation(pending.method, 'error', duration);
+      pending.reject(new Error(error));
+    } else {
+      recordInvocation(pending.method, 'ok', duration);
+      pending.resolve(result);
+    }
+  });
+}
+
+export function getPluginWindow() {
+  return pluginWindow;
+}
+
+export function createPluginWindow() {
+  if (pluginWindow && !pluginWindow.isDestroyed()) {
+    return;
+  }
+
+  ensureIpcListeners();
+
+  pluginWindow = new BrowserWindow({
+    show: false,
+    title: 'PluginWindow',
+    webPreferences: {
+      contextIsolation: false,
+      nodeIntegration: true,
+      preload: path.join(__dirname, 'entry.plugin-window-preload.min.js'),
+      backgroundThrottling: false,
+      devTools: process.env.NODE_ENV === 'development',
+    },
+  });
+
+  pluginWindow.on('closed', () => {
+    pluginWindow = null;
+    windowReady = false;
+    for (const [id, { reject }] of pendingRequests) {
+      pendingRequests.delete(id);
+      reject(new Error('[plugin-window] window closed'));
+    }
+  });
+
+  pluginWindow.webContents.on('render-process-gone', (_event, details) => {
+    bridgeMetrics.windowCrashes += 1;
+    console.log(`[plugin-bridge] window_crash reason=${details.reason} exit_code=${details.exitCode}`);
+  });
+
+  bridgeMetrics.windowStartups += 1;
+  bridgeMetrics.lastStartupAt = Date.now();
+  const pluginWindowPath = path.resolve(__dirname, 'plugin-window.html');
+  pluginWindow.loadFile(pluginWindowPath);
+  console.log(`[plugin-bridge] window_loading path=${pluginWindowPath} startups_total=${bridgeMetrics.windowStartups}`);
+}
+
+function waitForReady(timeoutMs = 10_000): Promise<void> {
+  if (windowReady) {
+    return Promise.resolve();
+  }
+  return new Promise((resolve, reject) => {
+    const onFailLoad = () => {
+      clearInterval(check);
+      clearTimeout(timer);
+      reject(new Error('[plugin-window] failed to load'));
+    };
+
+    pluginWindow?.webContents.once('did-fail-load', onFailLoad);
+
+    const timer = setTimeout(() => {
+      clearInterval(check);
+      pluginWindow?.webContents.off('did-fail-load', onFailLoad);
+      reject(new Error('[plugin-window] timed out waiting for ready'));
+    }, timeoutMs);
+
+    const check = setInterval(() => {
+      if (windowReady) {
+        clearInterval(check);
+        clearTimeout(timer);
+        pluginWindow?.webContents.off('did-fail-load', onFailLoad);
+        resolve();
+      }
+    }, 50);
+  });
+}
+
+export async function invokeInPluginWindow(method: string, args?: unknown): Promise<unknown> {
+  if (!pluginWindow || pluginWindow.isDestroyed()) {
+    createPluginWindow();
+  }
+
+  await waitForReady();
+
+  return new Promise((resolve, reject) => {
+    const id = randomUUID();
+    const startedAt = Date.now();
+
+    const timeout = setTimeout(() => {
+      if (pendingRequests.has(id)) {
+        pendingRequests.delete(id);
+        recordInvocation(method, 'timeout', Date.now() - startedAt);
+        reject(new Error(`[plugin-window] timeout invoking ${method}`));
+      }
+    }, 30_000);
+
+    pendingRequests.set(id, {
+      method,
+      startedAt,
+      resolve: v => {
+        clearTimeout(timeout);
+        resolve(v);
+      },
+      reject: e => {
+        clearTimeout(timeout);
+        reject(e);
+      },
+    });
+
+    pluginWindow!.webContents.send('plugin-invoke', { id, method, args });
+  });
+}
+
+export function destroyPluginWindow() {
+  pluginWindow?.destroy();
+  pluginWindow = null;
+  windowReady = false;
+}
+
+export function reloadPluginsInWindow() {
+  if (pluginWindow && !pluginWindow.isDestroyed()) {
+    pluginWindow.reload();
+    windowReady = false;
+  }
+}
+
+export function registerPluginIpcHandlers() {
+  ipcMain.handle('plugins.getThemes', () => invokeInPluginWindow('getThemes'));
+  ipcMain.handle('plugins.getPlugins', () => invokeInPluginWindow('getPlugins'));
+  ipcMain.handle('plugins.getActivePlugins', () => invokeInPluginWindow('getActivePlugins'));
+  ipcMain.handle('plugins.reloadPlugins', async () => {
+    cachedHasRequestHooks = null;
+    cachedHasResponseHooks = null;
+    await invokeInPluginWindow('reloadPlugins');
+  });
+  ipcMain.handle('plugins.getRequestActions', () => invokeInPluginWindow('getRequestActions'));
+  ipcMain.handle('plugins.getRequestGroupActions', () => invokeInPluginWindow('getRequestGroupActions'));
+  ipcMain.handle('plugins.getWorkspaceActions', () => invokeInPluginWindow('getWorkspaceActions'));
+  ipcMain.handle('plugins.getDocumentActions', () => invokeInPluginWindow('getDocumentActions'));
+  ipcMain.handle('plugins.executeAction', (_event, args) => invokeInPluginWindow('executeAction', args));
+  ipcMain.handle('plugins.getTemplateTags', () => invokeInPluginWindow('getTemplateTags'));
+  ipcMain.handle('plugins.runTemplateTagAction', (_event, args) => invokeInPluginWindow('runTemplateTagAction', args));
+  ipcMain.handle('plugins.getBundlePlugins', () => invokeInPluginWindow('getBundlePlugins'));
+  ipcMain.handle('plugins.executePluginMainAction', (_event, args) => invokeInPluginWindow('executePluginMainAction', args));
+  ipcMain.handle('plugins.hasRequestHooks', async () => {
+    if (cachedHasRequestHooks === null) {
+      cachedHasRequestHooks = await invokeInPluginWindow('hasRequestHooks') as boolean;
+    }
+    return cachedHasRequestHooks;
+  });
+  ipcMain.handle('plugins.hasResponseHooks', async () => {
+    if (cachedHasResponseHooks === null) {
+      cachedHasResponseHooks = await invokeInPluginWindow('hasResponseHooks') as boolean;
+    }
+    return cachedHasResponseHooks;
+  });
+  ipcMain.handle('plugins.applyRequestHooks', (_event, args) => invokeInPluginWindow('applyRequestHooks', args));
+  ipcMain.handle('plugins.applyResponseHooks', (_event, args) => invokeInPluginWindow('applyResponseHooks', args));
+  ipcMain.handle('plugins.getBridgeMetrics', () => getBridgeMetricsSnapshot());
+}
+
+export function getAppUserDataPath() {
+  return app.getPath('userData');
+}
diff --git a/packages/insomnia/src/main/window-utils.ts b/packages/insomnia/src/main/window-utils.ts
index 14f199503c..d9e0d7ea63 100644
--- a/packages/insomnia/src/main/window-utils.ts
+++ b/packages/insomnia/src/main/window-utils.ts
@@ -23,6 +23,7 @@ import { invariant } from '../utils/invariant';
 import { getElectronStorage } from './electron-storage';
 import { ipcMainOn } from './ipc/electron';
 import { getLogDirectory } from './log';
+import { createPluginWindow, destroyPluginWindow } from './plugin-window';
 
 const DEFAULT_WIDTH = 1280;
 const DEFAULT_HEIGHT = 720;
@@ -785,5 +786,12 @@ export function createWindowsAndReturnMain() {
   if (!browserWindows.get('HiddenBrowserWindow')) {
     createHiddenBrowserWindow();
   }
+  // Create the plugin window after the main window finishes its initial load so
+  // that Playwright's firstWindow() always returns the main app window. Creating
+  // it on did-finish-load still parses the 12 MB bundle well before any user
+  // plugin call would occur.
+  mainWindow.webContents.once('did-finish-load', () => createPluginWindow());
   return mainWindow;
 }
+
+export { destroyPluginWindow };
diff --git a/packages/insomnia/src/network/__tests__/plugin-hooks.test.ts b/packages/insomnia/src/network/__tests__/plugin-hooks.test.ts
new file mode 100644
index 0000000000..53c6c1a5dc
--- /dev/null
+++ b/packages/insomnia/src/network/__tests__/plugin-hooks.test.ts
@@ -0,0 +1,172 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const mockRequestCtx = vi.hoisted(() => ({
+  getEnvironmentVariable: vi.fn().mockReturnValue(null),
+  hasHeader: vi.fn().mockReturnValue(false),
+  removeHeader: vi.fn(),
+  setHeader: vi.fn(),
+}));
+
+const mockPlugins = vi.hoisted(() => ({
+  hasRequestHooks: vi.fn(),
+  hasResponseHooks: vi.fn(),
+  applyRequestHooks: vi.fn(),
+  applyResponseHooks: vi.fn(),
+}));
+
+vi.mock('../../plugins/context/request', () => ({
+  init: vi.fn().mockReturnValue({ request: mockRequestCtx }),
+}));
+
+Object.defineProperty(globalThis, 'window', {
+  value: { main: { plugins: mockPlugins } },
+  writable: true,
+  configurable: true,
+});
+
+Object.defineProperty(process, 'type', {
+  value: 'renderer',
+  writable: true,
+  configurable: true,
+});
+
+import { _applyRequestPluginHooks, _applyResponsePluginHooks } from '../network';
+
+const mockRenderedRequest = {
+  url: 'http://example.com',
+  headers: [],
+  settingSendCookies: true,
+  settingStoreCookies: true,
+} as any;
+
+const mockRenderedContext = {
+  getProjectId: () => 'test-project',
+} as any;
+
+const mockResponse = {
+  url: 'http://example.com',
+  status: 200,
+} as any;
+
+beforeEach(() => {
+  vi.clearAllMocks();
+  mockRequestCtx.getEnvironmentVariable.mockReturnValue(null);
+  mockPlugins.hasRequestHooks.mockResolvedValue(false);
+  mockPlugins.hasResponseHooks.mockResolvedValue(false);
+  mockPlugins.applyRequestHooks.mockResolvedValue(mockRenderedRequest);
+  mockPlugins.applyResponseHooks.mockResolvedValue(mockResponse);
+});
+
+describe('_applyRequestPluginHooks', () => {
+  it('skips applyRequestHooks when hasRequestHooks returns false', async () => {
+    await _applyRequestPluginHooks(mockRenderedRequest, mockRenderedContext);
+    expect(mockPlugins.applyRequestHooks).not.toHaveBeenCalled();
+  });
+
+  it('calls applyRequestHooks when hasRequestHooks returns true', async () => {
+    mockPlugins.hasRequestHooks.mockResolvedValue(true);
+    await _applyRequestPluginHooks(mockRenderedRequest, mockRenderedContext);
+    expect(mockPlugins.applyRequestHooks).toHaveBeenCalledOnce();
+  });
+
+  it('passes projectId and environment to applyRequestHooks', async () => {
+    mockPlugins.hasRequestHooks.mockResolvedValue(true);
+    await _applyRequestPluginHooks(mockRenderedRequest, mockRenderedContext);
+    expect(mockPlugins.applyRequestHooks).toHaveBeenCalledWith(
+      expect.objectContaining({ projectId: 'test-project' }),
+    );
+  });
+
+  it('propagates errors from applyRequestHooks', async () => {
+    mockPlugins.hasRequestHooks.mockResolvedValue(true);
+    mockPlugins.applyRequestHooks.mockRejectedValue(new Error('[plugin=test-plugin] sync failure'));
+    await expect(_applyRequestPluginHooks(mockRenderedRequest, mockRenderedContext)).rejects.toThrow('sync failure');
+  });
+
+  it('applies DEFAULT_HEADERS from the environment without invoking the plugin window', async () => {
+    mockRequestCtx.getEnvironmentVariable.mockReturnValue({ 'X-Custom': 'value' });
+    mockRequestCtx.hasHeader.mockReturnValue(false);
+
+    await _applyRequestPluginHooks(mockRenderedRequest, mockRenderedContext);
+
+    expect(mockRequestCtx.setHeader).toHaveBeenCalledWith('X-Custom', 'value');
+    expect(mockPlugins.applyRequestHooks).not.toHaveBeenCalled();
+  });
+
+  it('skips DEFAULT_HEADERS that already exist on the request', async () => {
+    mockRequestCtx.getEnvironmentVariable.mockReturnValue({ 'X-Custom': 'value' });
+    mockRequestCtx.hasHeader.mockReturnValue(true);
+
+    await _applyRequestPluginHooks(mockRenderedRequest, mockRenderedContext);
+
+    expect(mockRequestCtx.setHeader).not.toHaveBeenCalled();
+  });
+
+  it('removes a DEFAULT_HEADER when its value is "null"', async () => {
+    mockRequestCtx.getEnvironmentVariable.mockReturnValue({ 'X-Remove': 'null' });
+    mockRequestCtx.hasHeader.mockReturnValue(false);
+
+    await _applyRequestPluginHooks(mockRenderedRequest, mockRenderedContext);
+
+    expect(mockRequestCtx.removeHeader).toHaveBeenCalledWith('X-Remove');
+  });
+});
+
+describe('_applyResponsePluginHooks', () => {
+  it('returns the original response when hasResponseHooks returns false', async () => {
+    const result = await _applyResponsePluginHooks(mockResponse, mockRenderedRequest, mockRenderedContext);
+    expect(result).toBe(mockResponse);
+    expect(mockPlugins.applyResponseHooks).not.toHaveBeenCalled();
+  });
+
+  it('calls applyResponseHooks when hasResponseHooks returns true', async () => {
+    mockPlugins.hasResponseHooks.mockResolvedValue(true);
+    await _applyResponsePluginHooks(mockResponse, mockRenderedRequest, mockRenderedContext);
+    expect(mockPlugins.applyResponseHooks).toHaveBeenCalledOnce();
+  });
+
+  it('returns an error ResponsePatch instead of throwing on hook failure', async () => {
+    mockPlugins.hasResponseHooks.mockResolvedValue(true);
+    mockPlugins.applyResponseHooks.mockRejectedValue(new Error('[plugin=test-plugin] hook exploded'));
+
+    const result = await _applyResponsePluginHooks(mockResponse, mockRenderedRequest, mockRenderedContext);
+
+    expect(result).toHaveProperty('error');
+    expect(result.statusMessage).toBe('Error');
+  });
+
+  it('includes the error message in the error response', async () => {
+    mockPlugins.hasResponseHooks.mockResolvedValue(true);
+    mockPlugins.applyResponseHooks.mockRejectedValue(new Error('[plugin=test-plugin] detailed failure reason'));
+
+    const result = await _applyResponsePluginHooks(mockResponse, mockRenderedRequest, mockRenderedContext);
+    expect(result.error).toContain('detailed failure reason');
+  });
+
+  it('handles non-Error rejections without producing undefined in the error message', async () => {
+    mockPlugins.hasResponseHooks.mockResolvedValue(true);
+    mockPlugins.applyResponseHooks.mockRejectedValue('string rejection');
+
+    const result = await _applyResponsePluginHooks(mockResponse, mockRenderedRequest, mockRenderedContext);
+    expect(result.error).toContain('string rejection');
+    expect(result.error).not.toContain('undefined');
+  });
+
+  it('returns an error ResponsePatch for async hook rejections', async () => {
+    mockPlugins.hasResponseHooks.mockResolvedValue(true);
+    mockPlugins.applyResponseHooks.mockRejectedValue(new Error('[plugin=test-plugin] async boom'));
+
+    const result = await _applyResponsePluginHooks(mockResponse, mockRenderedRequest, mockRenderedContext);
+
+    expect(result).toHaveProperty('error');
+    expect(result.error).toContain('async boom');
+  });
+
+  it('preserves the request URL in the error response', async () => {
+    mockPlugins.hasResponseHooks.mockResolvedValue(true);
+    mockPlugins.applyResponseHooks.mockRejectedValue(new Error('[plugin=test-plugin] fail'));
+
+    const result = await _applyResponsePluginHooks(mockResponse, mockRenderedRequest, mockRenderedContext);
+    expect(result.url).toBe('http://example.com');
+  });
+});
diff --git a/packages/insomnia/src/network/network.ts b/packages/insomnia/src/network/network.ts
index 09de79a332..e50b7a17fb 100644
--- a/packages/insomnia/src/network/network.ts
+++ b/packages/insomnia/src/network/network.ts
@@ -25,6 +25,7 @@ import type {
   Workspace,
 } from '~/insomnia-data';
 import { EnvironmentType, models, services } from '~/insomnia-data';
+import { plugins as pluginsBridge } from '~/plugins/renderer-bridge';
 import { getKVPairFromData } from '~/utils/environment-utils';
 
 import type {
@@ -1068,62 +1069,102 @@ export const getCurrentUrl = ({ headerResults, finalUrl }: { headerResults: any;
   }
 };
 
-async function _applyRequestPluginHooks(renderedRequest: RenderedRequest, renderedContext: Record<string, any>) {
+export async function _applyRequestPluginHooks(renderedRequest: RenderedRequest, renderedContext: Record<string, any>) {
   const newRenderedRequest = clone(renderedRequest);
 
-  for (const { plugin, hook } of await plugins.getRequestHooks()) {
-    const context = {
-      ...(pluginApp.init() as Record<string, any>),
-      ...pluginData.init(renderedContext.getProjectId()),
-      ...(pluginStore.init(plugin) as Record<string, any>),
-      ...(pluginRequest.init(newRenderedRequest, renderedContext) as Record<string, any>),
-      ...(pluginNetwork.init() as Record<string, any>),
-    };
-
-    try {
-      await hook(context);
-    } catch (err) {
-      err.plugin = plugin;
-      throw err;
+  // Apply built-in default-headers hook in the renderer (no IPC needed)
+  const { request: reqCtx } = pluginRequest.init(newRenderedRequest, renderedContext);
+  const defaultHeaders = reqCtx.getEnvironmentVariable('DEFAULT_HEADERS');
+  if (defaultHeaders && typeof defaultHeaders === 'object' && !Array.isArray(defaultHeaders)) {
+    for (const name of Object.keys(defaultHeaders)) {
+      const value = (defaultHeaders as Record<string, any>)[name];
+      if (reqCtx.hasHeader(name)) {
+        console.log(`[header] Skip setting default header ${name}. Already set to ${value}`);
+      } else if (value === 'null') {
+        reqCtx.removeHeader(name);
+        console.log(`[header] Remove default header ${name}`);
+      } else {
+        reqCtx.setHeader(name, value);
+        console.log(`[header] Set default header ${name}: ${value}`);
+      }
     }
   }
 
-  return newRenderedRequest;
+  if (process.type !== 'renderer') {
+    for (const { plugin, hook } of await plugins.getRequestHooks()) {
+      const context = {
+        ...(pluginApp.init() as Record<string, any>),
+        ...pluginData.init(renderedContext.getProjectId()),
+        ...(pluginStore.init(plugin) as Record<string, any>),
+        ...(pluginRequest.init(newRenderedRequest, renderedContext) as Record<string, any>),
+        ...(pluginNetwork.init() as Record<string, any>),
+      };
+      try {
+        await hook(context);
+      } catch (err) {
+        const error = err instanceof Error ? err : new Error(String(err));
+        (error as any).plugin = plugin;
+        throw error;
+      }
+    }
+    return newRenderedRequest;
+  }
+
+  if (!await pluginsBridge.hasRequestHooks()) {
+    return newRenderedRequest;
+  }
+
+  return pluginsBridge.applyRequestHooks({
+    renderedRequest: newRenderedRequest,
+    projectId: renderedContext.getProjectId(),
+    environment: renderedContext,
+  });
 }
 
-async function _applyResponsePluginHooks(
+export async function _applyResponsePluginHooks(
   response: ResponsePatch,
   renderedRequest: RenderedRequest,
   renderedContext: Record<string, any>,
 ): Promise<ResponsePatch> {
   try {
-    const newResponse = clone(response);
-    const newRequest = clone(renderedRequest);
-
-    for (const { plugin, hook } of await plugins.getResponseHooks()) {
-      const context = {
-        ...(pluginApp.init() as Record<string, any>),
-        ...pluginData.init(renderedContext.getProjectId()),
-        ...(pluginStore.init(plugin) as Record<string, any>),
-        ...(pluginResponse.init(newResponse) as Record<string, any>),
-        ...(pluginRequest.init(newRequest, renderedContext, true) as Record<string, any>),
-        ...(pluginNetwork.init() as Record<string, any>),
-      };
-
-      try {
-        await hook(context);
-      } catch (err) {
-        err.plugin = plugin;
-        throw err;
+    if (process.type !== 'renderer') {
+      const newResponse = clone(response);
+      const newRequest = clone(renderedRequest);
+      for (const { plugin, hook } of await plugins.getResponseHooks()) {
+        const context = {
+          ...(pluginApp.init() as Record<string, any>),
+          ...pluginData.init(renderedContext.getProjectId()),
+          ...(pluginStore.init(plugin) as Record<string, any>),
+          ...(pluginResponse.init(newResponse) as Record<string, any>),
+          ...(pluginRequest.init(newRequest, renderedContext, true) as Record<string, any>),
+          ...(pluginNetwork.init() as Record<string, any>),
+        };
+        try {
+          await hook(context);
+        } catch (err) {
+          const error = err instanceof Error ? err : new Error(String(err));
+          (error as any).plugin = plugin;
+          throw error;
+        }
       }
+      return newResponse;
     }
 
-    return newResponse;
+    if (!await pluginsBridge.hasResponseHooks()) {
+      return response;
+    }
+
+    return await pluginsBridge.applyResponseHooks({
+      response,
+      renderedRequest,
+      projectId: renderedContext.getProjectId(),
+      environment: renderedContext,
+    });
   } catch (err) {
     console.log('[plugin] Response hook failed', err, response);
     return {
       url: renderedRequest.url,
-      error: `[plugin] Response hook failed plugin=${err.plugin?.name} err=${err.message}`,
+      error: `[plugin] Response hook failed err=${err instanceof Error ? err.message : String(err)}`,
       elapsedTime: 0, // 0 because this path is hit during plugin calls
       statusMessage: 'Error',
       settingSendCookies: renderedRequest.settingSendCookies,
diff --git a/packages/insomnia/src/plugin-window.html b/packages/insomnia/src/plugin-window.html
new file mode 100644
index 0000000000..356c3bdb6c
--- /dev/null
+++ b/packages/insomnia/src/plugin-window.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en-US">
+  <head>
+    <meta charset="utf-8" />
+    <title>Plugin Window</title>
+  </head>
+
+  <body>
+    <script src="./entry.plugin-window.min.js"></script>
+  </body>
+</html>
diff --git a/packages/insomnia/src/plugins/__tests__/index.test.ts b/packages/insomnia/src/plugins/__tests__/index.test.ts
new file mode 100644
index 0000000000..acd7286169
--- /dev/null
+++ b/packages/insomnia/src/plugins/__tests__/index.test.ts
@@ -0,0 +1,359 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('../themes', () => ({ default: [] }));
+vi.mock('../context/app', () => ({ init: vi.fn().mockReturnValue({ app: {} }) }));
+vi.mock('../context/store', () => ({ init: vi.fn().mockReturnValue({ store: {} }) }));
+vi.mock('../context/network', () => ({ init: vi.fn().mockReturnValue({ network: {} }) }));
+vi.mock('~/insomnia-data', () => ({
+  services: {
+    settings: { get: vi.fn() },
+    request: { getById: vi.fn() },
+    cloudCredential: { getById: vi.fn(), update: vi.fn() },
+    workspace: { getById: vi.fn() },
+    oAuth2Token: { getByParentId: vi.fn() },
+    cookieJar: { getOrCreateForParentId: vi.fn() },
+    response: { getLatestForRequestId: vi.fn() },
+    helpers: { getResponseBodyBuffer: vi.fn() },
+  },
+}));
+
+import { services } from '~/insomnia-data';
+
+import type { Plugin } from '../index';
+import {
+  _testOnlySetPlugins,
+  executePluginMainAction,
+  getDocumentActions,
+  getPluginCommonContext,
+  getRequestActions,
+  getRequestGroupActions,
+  getRequestHooks,
+  getResponseHooks,
+  getTemplateTags,
+  getThemes,
+  getWorkspaceActions,
+} from '../index';
+
+const makePlugin = (overrides: Partial<Plugin> = {}): Plugin => ({
+  name: 'test-plugin',
+  description: 'A test plugin',
+  version: '1.0.0',
+  directory: '/plugins/test-plugin',
+  config: { disabled: false },
+  module: {},
+  ...overrides,
+});
+
+afterEach(() => {
+  _testOnlySetPlugins(null);
+});
+
+describe('getRequestHooks', () => {
+  it('returns empty array when no plugins are active', async () => {
+    _testOnlySetPlugins([]);
+    expect(await getRequestHooks()).toHaveLength(0);
+  });
+
+  it('includes plugin hooks with plugin metadata', async () => {
+    const hook = vi.fn();
+    _testOnlySetPlugins([makePlugin({ module: { requestHooks: [hook] } })]);
+    const hooks = await getRequestHooks();
+    expect(hooks).toHaveLength(1);
+    expect(hooks[0].hook).toBe(hook);
+    expect(hooks[0].plugin.name).toBe('test-plugin');
+  });
+
+  it('excludes hooks from disabled plugins', async () => {
+    _testOnlySetPlugins([makePlugin({ config: { disabled: true }, module: { requestHooks: [vi.fn()] } })]);
+    const hooks = await getRequestHooks();
+    expect(hooks).toHaveLength(0);
+  });
+});
+
+describe('getResponseHooks', () => {
+  it('returns empty array when no plugins are active', async () => {
+    _testOnlySetPlugins([]);
+    expect(await getResponseHooks()).toHaveLength(0);
+  });
+
+  it('includes plugin hooks with plugin metadata', async () => {
+    const hook = vi.fn();
+    _testOnlySetPlugins([makePlugin({ module: { responseHooks: [hook] } })]);
+    const hooks = await getResponseHooks();
+    expect(hooks).toHaveLength(1);
+    expect(hooks[0].hook).toBe(hook);
+    expect(hooks[0].plugin.name).toBe('test-plugin');
+  });
+
+  it('excludes hooks from disabled plugins', async () => {
+    _testOnlySetPlugins([makePlugin({ config: { disabled: true }, module: { responseHooks: [vi.fn()] } })]);
+    expect(await getResponseHooks()).toHaveLength(0);
+  });
+});
+
+describe('getRequestActions', () => {
+  it('returns actions with plugin metadata', async () => {
+    const action = vi.fn();
+    _testOnlySetPlugins([makePlugin({ module: { requestActions: [{ label: 'Run', action }] } })]);
+    const actions = await getRequestActions();
+    expect(actions).toHaveLength(1);
+    expect(actions[0].label).toBe('Run');
+    expect(actions[0].plugin.name).toBe('test-plugin');
+  });
+
+  it('excludes actions from disabled plugins', async () => {
+    _testOnlySetPlugins([
+      makePlugin({ config: { disabled: true }, module: { requestActions: [{ label: 'Run', action: vi.fn() }] } }),
+    ]);
+    expect(await getRequestActions()).toHaveLength(0);
+  });
+
+  it('action is callable and receives the args passed by the caller', async () => {
+    const action = vi.fn().mockResolvedValue();
+    _testOnlySetPlugins([makePlugin({ module: { requestActions: [{ label: 'Run', action }] } })]);
+    const [{ action: retrieved }] = await getRequestActions();
+
+    const context = { app: {} };
+    const models = { request: { _id: 'req_1' } };
+    await retrieved(context as any, models as any);
+
+    expect(action).toHaveBeenCalledWith(context, models);
+  });
+
+  it('action errors propagate to the caller', async () => {
+    const action = vi.fn().mockRejectedValue(new Error('request action failed'));
+    _testOnlySetPlugins([makePlugin({ module: { requestActions: [{ label: 'Run', action }] } })]);
+    const [{ action: retrieved }] = await getRequestActions();
+
+    await expect(retrieved({} as any, {} as any)).rejects.toThrow('request action failed');
+  });
+});
+
+describe('getWorkspaceActions', () => {
+  it('returns actions with plugin metadata', async () => {
+    const action = vi.fn();
+    _testOnlySetPlugins([makePlugin({ module: { workspaceActions: [{ label: 'Export', action }] } })]);
+    const actions = await getWorkspaceActions();
+    expect(actions).toHaveLength(1);
+    expect(actions[0].label).toBe('Export');
+    expect(actions[0].plugin.name).toBe('test-plugin');
+  });
+
+  it('excludes actions from disabled plugins', async () => {
+    _testOnlySetPlugins([
+      makePlugin({ config: { disabled: true }, module: { workspaceActions: [{ label: 'Export', action: vi.fn() }] } }),
+    ]);
+    expect(await getWorkspaceActions()).toHaveLength(0);
+  });
+
+  it('action is callable and receives the args passed by the caller', async () => {
+    const action = vi.fn().mockResolvedValue();
+    _testOnlySetPlugins([makePlugin({ module: { workspaceActions: [{ label: 'Export', action }] } })]);
+    const [{ action: retrieved }] = await getWorkspaceActions();
+
+    const context = { app: {} };
+    const models = { workspace: { _id: 'wrk_1' }, requestGroups: [], requests: [] };
+    await retrieved(context as any, models as any);
+
+    expect(action).toHaveBeenCalledWith(context, models);
+  });
+
+  it('action errors propagate to the caller', async () => {
+    const action = vi.fn().mockRejectedValue(new Error('workspace action failed'));
+    _testOnlySetPlugins([makePlugin({ module: { workspaceActions: [{ label: 'Export', action }] } })]);
+    const [{ action: retrieved }] = await getWorkspaceActions();
+
+    await expect(retrieved({} as any, {} as any)).rejects.toThrow('workspace action failed');
+  });
+});
+
+describe('getRequestGroupActions', () => {
+  it('returns actions with plugin metadata', async () => {
+    const action = vi.fn();
+    _testOnlySetPlugins([makePlugin({ module: { requestGroupActions: [{ label: 'Run All', action }] } })]);
+    const actions = await getRequestGroupActions();
+    expect(actions).toHaveLength(1);
+    expect(actions[0].label).toBe('Run All');
+    expect(actions[0].plugin.name).toBe('test-plugin');
+  });
+
+  it('excludes actions from disabled plugins', async () => {
+    _testOnlySetPlugins([
+      makePlugin({
+        config: { disabled: true },
+        module: { requestGroupActions: [{ label: 'Run All', action: vi.fn() }] },
+      }),
+    ]);
+    expect(await getRequestGroupActions()).toHaveLength(0);
+  });
+
+  it('action is callable and receives the args passed by the caller', async () => {
+    const action = vi.fn().mockResolvedValue();
+    _testOnlySetPlugins([makePlugin({ module: { requestGroupActions: [{ label: 'Run All', action }] } })]);
+    const [{ action: retrieved }] = await getRequestGroupActions();
+
+    const context = { app: {} };
+    const models = { requestGroup: { _id: 'grp_1' }, requests: [] };
+    await retrieved(context as any, models as any);
+
+    expect(action).toHaveBeenCalledWith(context, models);
+  });
+
+  it('action errors propagate to the caller', async () => {
+    const action = vi.fn().mockRejectedValue(new Error('group action failed'));
+    _testOnlySetPlugins([makePlugin({ module: { requestGroupActions: [{ label: 'Run All', action }] } })]);
+    const [{ action: retrieved }] = await getRequestGroupActions();
+
+    await expect(retrieved({} as any, {} as any)).rejects.toThrow('group action failed');
+  });
+});
+
+describe('getDocumentActions', () => {
+  it('returns actions with plugin metadata', async () => {
+    const action = vi.fn();
+    _testOnlySetPlugins([makePlugin({ module: { documentActions: [{ label: 'Lint', action }] } })]);
+    const actions = await getDocumentActions();
+    expect(actions).toHaveLength(1);
+    expect(actions[0].label).toBe('Lint');
+    expect(actions[0].plugin.name).toBe('test-plugin');
+  });
+
+  it('excludes actions from disabled plugins', async () => {
+    _testOnlySetPlugins([
+      makePlugin({ config: { disabled: true }, module: { documentActions: [{ label: 'Lint', action: vi.fn() }] } }),
+    ]);
+    expect(await getDocumentActions()).toHaveLength(0);
+  });
+
+  it('action is callable and receives the args passed by the caller', async () => {
+    const action = vi.fn().mockResolvedValue();
+    _testOnlySetPlugins([makePlugin({ module: { documentActions: [{ label: 'Lint', action }] } })]);
+    const [{ action: retrieved }] = await getDocumentActions();
+
+    const context = { app: {} };
+    const spec = { contents: 'openapi: 3.0.0' };
+    await retrieved(context as any, spec as any);
+
+    expect(action).toHaveBeenCalledWith(context, spec);
+  });
+
+  it('action errors propagate to the caller — the plugin layer does not swallow them', async () => {
+    const action = vi.fn().mockRejectedValue(new Error('lint failed'));
+    _testOnlySetPlugins([makePlugin({ module: { documentActions: [{ label: 'Lint', action }] } })]);
+    const [{ action: retrieved }] = await getDocumentActions();
+
+    await expect(retrieved({} as any, {} as any)).rejects.toThrow('lint failed');
+  });
+
+  it('supports hideAfterClick flag', async () => {
+    _testOnlySetPlugins([
+      makePlugin({ module: { documentActions: [{ label: 'Lint', action: vi.fn(), hideAfterClick: true }] } }),
+    ]);
+    const [item] = await getDocumentActions();
+    expect(item.hideAfterClick).toBe(true);
+  });
+});
+
+describe('getTemplateTags', () => {
+  it('returns template tags with plugin metadata', async () => {
+    const tag = { name: 'env', displayName: 'Environment', run: vi.fn() };
+    _testOnlySetPlugins([makePlugin({ module: { templateTags: [tag] } })]);
+    const tags = await getTemplateTags();
+    expect(tags).toHaveLength(1);
+    expect(tags[0].templateTag).toBe(tag);
+    expect(tags[0].plugin.name).toBe('test-plugin');
+  });
+
+  it('excludes tags from disabled plugins', async () => {
+    _testOnlySetPlugins([
+      makePlugin({ config: { disabled: true }, module: { templateTags: [{ name: 'env', run: vi.fn() }] } }),
+    ]);
+    expect(await getTemplateTags()).toHaveLength(0);
+  });
+
+  it('run() is callable and errors propagate — the plugin layer does not catch them', async () => {
+    const run = vi.fn().mockRejectedValue(new Error('tag run failed'));
+    _testOnlySetPlugins([makePlugin({ module: { templateTags: [{ name: 'env', run }] } })]);
+    const [{ templateTag }] = await getTemplateTags();
+    await expect(templateTag.run({} as any, [])).rejects.toThrow('tag run failed');
+  });
+});
+
+describe('getThemes', () => {
+  it('returns plugin themes with plugin metadata', async () => {
+    const theme = { name: 'dracula', displayName: 'Dracula', theme: { background: { default: '#282a36' } } };
+    _testOnlySetPlugins([makePlugin({ module: { themes: [theme] } })]);
+    const themes = await getThemes();
+    expect(themes).toHaveLength(1);
+    expect(themes[0].theme).toBe(theme);
+    expect(themes[0].plugin.name).toBe('test-plugin');
+  });
+
+  it('excludes themes from disabled plugins', async () => {
+    _testOnlySetPlugins([
+      makePlugin({ config: { disabled: true }, module: { themes: [{ name: 'dracula', theme: {} }] } }),
+    ]);
+    expect(await getThemes()).toHaveLength(0);
+  });
+});
+
+describe('getPluginCommonContext', () => {
+  it('returns an object with the expected top-level keys', () => {
+    const ctx = getPluginCommonContext({ plugin: { name: 'test-plugin' } });
+    expect(ctx).toHaveProperty('app');
+    expect(ctx).toHaveProperty('store');
+    expect(ctx).toHaveProperty('network');
+    expect(ctx).toHaveProperty('util');
+  });
+});
+
+describe('executePluginMainAction', () => {
+  // @kong/insomnia-plugin-external-vault is a real bundlePlugin name from config.json
+  const bundlePluginName = '@kong/insomnia-plugin-external-vault';
+
+  beforeEach(() => {
+    vi.mocked(services.settings.get).mockResolvedValue({ pluginsAllowElevatedAccess: true } as any);
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('executes the matching action and returns its result', async () => {
+    const action = vi.fn().mockResolvedValue('action-result');
+    _testOnlySetPlugins([
+      makePlugin({
+        name: bundlePluginName,
+        directory: '',
+        module: { unsafePluginMainActions: [{ name: 'doThing', action }] },
+      }),
+    ]);
+
+    const result = await executePluginMainAction({ pluginName: bundlePluginName, actionName: 'doThing' });
+
+    expect(result).toBe('action-result');
+    expect(action).toHaveBeenCalledOnce();
+  });
+
+  it('throws when the plugin is not found', async () => {
+    _testOnlySetPlugins([]);
+
+    await expect(executePluginMainAction({ pluginName: bundlePluginName, actionName: 'doThing' })).rejects.toThrow(
+      `Plugin ${bundlePluginName} not found`,
+    );
+  });
+
+  it('throws when the action name is not found in the plugin', async () => {
+    _testOnlySetPlugins([
+      makePlugin({
+        name: bundlePluginName,
+        directory: '',
+        module: { unsafePluginMainActions: [{ name: 'otherAction', action: vi.fn() }] },
+      }),
+    ]);
+
+    await expect(executePluginMainAction({ pluginName: bundlePluginName, actionName: 'doThing' })).rejects.toThrow(
+      'Action doThing not found',
+    );
+  });
+});
diff --git a/packages/insomnia/src/plugins/__tests__/invoke-method.test.ts b/packages/insomnia/src/plugins/__tests__/invoke-method.test.ts
new file mode 100644
index 0000000000..a3b3176035
--- /dev/null
+++ b/packages/insomnia/src/plugins/__tests__/invoke-method.test.ts
@@ -0,0 +1,82 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('../themes', () => ({ default: [] }));
+vi.mock('../context/app', () => ({ init: vi.fn().mockReturnValue({ app: {} }) }));
+vi.mock('../context/data', () => ({ init: vi.fn().mockReturnValue({ data: {} }) }));
+vi.mock('../context/store', () => ({ init: vi.fn().mockReturnValue({ store: {} }) }));
+vi.mock('../context/network', () => ({ init: vi.fn().mockReturnValue({ network: {} }) }));
+vi.mock('../context/request', () => ({ init: vi.fn().mockReturnValue({ request: {} }) }));
+vi.mock('../context/response', () => ({ init: vi.fn().mockReturnValue({ response: {} }) }));
+vi.mock('~/insomnia-data', () => ({
+  services: {
+    settings: { get: vi.fn() },
+    request: { getById: vi.fn() },
+    cloudCredential: { getById: vi.fn(), update: vi.fn() },
+    workspace: { getById: vi.fn() },
+    oAuth2Token: { getByParentId: vi.fn() },
+    cookieJar: { getOrCreateForParentId: vi.fn() },
+    response: { getLatestForRequestId: vi.fn() },
+    helpers: { getResponseBodyBuffer: vi.fn() },
+  },
+}));
+
+import type { Plugin } from '../index';
+import { _testOnlySetPlugins } from '../index';
+import { invokePluginMethod } from '../invoke-method';
+
+const makePlugin = (overrides: Partial<Plugin> = {}): Plugin => ({
+  name: 'test-plugin',
+  description: 'A test plugin',
+  version: '1.0.0',
+  directory: '/plugins/test-plugin',
+  config: { disabled: false },
+  module: {},
+  ...overrides,
+});
+
+afterEach(() => {
+  _testOnlySetPlugins(null);
+  vi.clearAllMocks();
+});
+
+describe('invokePluginMethod', () => {
+  it('serializes request action metadata', async () => {
+    _testOnlySetPlugins([makePlugin({ module: { requestActions: [{ label: 'Run', icon: 'bolt', action: vi.fn() }] } })]);
+
+    await expect(invokePluginMethod('getRequestActions')).resolves.toEqual([
+      { label: 'Run', icon: 'bolt', pluginName: 'test-plugin' },
+    ]);
+  });
+
+  it('executes the matching action locally', async () => {
+    const action = vi.fn().mockResolvedValue(null);
+    _testOnlySetPlugins([makePlugin({ module: { requestActions: [{ label: 'Run', action }] } })]);
+
+    await expect(
+      invokePluginMethod('executeAction', {
+        type: 'request',
+        pluginName: 'test-plugin',
+        label: 'Run',
+        projectId: 'proj_1',
+        domainData: { request: { _id: 'req_1' } },
+      }),
+    ).resolves.toBeNull();
+
+    expect(action).toHaveBeenCalledWith(expect.objectContaining({ app: {}, data: {}, store: {}, network: {} }), {
+      request: { _id: 'req_1' },
+    });
+  });
+
+  it('preserves plugin-prefixed request hook errors', async () => {
+    const hook = vi.fn().mockRejectedValue(new Error('boom'));
+    _testOnlySetPlugins([makePlugin({ module: { requestHooks: [hook] } })]);
+
+    await expect(
+      invokePluginMethod('applyRequestHooks', {
+        renderedRequest: { url: 'https://example.com' } as any,
+        projectId: 'proj_1',
+        environment: {},
+      }),
+    ).rejects.toThrow('[plugin=test-plugin] boom');
+  });
+});
diff --git a/packages/insomnia/src/plugins/__tests__/themes.test.ts b/packages/insomnia/src/plugins/__tests__/themes.test.ts
new file mode 100644
index 0000000000..c786d2d855
--- /dev/null
+++ b/packages/insomnia/src/plugins/__tests__/themes.test.ts
@@ -0,0 +1,86 @@
+import { afterEach, describe, expect, it } from 'vitest';
+
+import type { Plugin } from '../index';
+// No mock of '../themes' here — this file tests the built-in theme baseline.
+import { _testOnlySetPlugins, getThemes } from '../index';
+
+const makePlugin = (overrides: Partial<Plugin> = {}): Plugin => ({
+  name: 'test-plugin',
+  description: 'A test plugin',
+  version: '1.0.0',
+  directory: '/plugins/test-plugin',
+  config: { disabled: false },
+  module: {},
+  ...overrides,
+});
+
+afterEach(() => {
+  _testOnlySetPlugins(null);
+});
+
+describe('getThemes — built-in themes', () => {
+  it('returns all 18 built-in themes when no plugins are active', async () => {
+    _testOnlySetPlugins([]);
+    const themes = await getThemes();
+    expect(themes).toHaveLength(18);
+  });
+
+  it('every built-in theme has a name and displayName', async () => {
+    _testOnlySetPlugins([]);
+    const themes = await getThemes();
+    for (const { theme } of themes) {
+      expect(theme).toHaveProperty('name');
+      expect(theme).toHaveProperty('displayName');
+      expect(typeof theme.name).toBe('string');
+      expect(theme.name.length).toBeGreaterThan(0);
+    }
+  });
+
+  it('built-in theme entries carry the correct plugin metadata', async () => {
+    _testOnlySetPlugins([]);
+    const themes = await getThemes();
+    for (const entry of themes) {
+      expect(entry.plugin.description).toBe('Built-in themes');
+      expect(entry.plugin.name).toBe(entry.theme.name);
+    }
+  });
+});
+
+describe('getThemes — merge with plugin themes', () => {
+  it('plugin themes appear after built-in themes', async () => {
+    const pluginTheme = { name: 'dracula', displayName: 'Dracula', theme: {} };
+    _testOnlySetPlugins([makePlugin({ module: { themes: [pluginTheme] } })]);
+
+    const themes = await getThemes();
+
+    expect(themes).toHaveLength(19); // 18 built-in + 1 plugin
+    expect(themes[18].theme).toBe(pluginTheme);
+    expect(themes[18].plugin.name).toBe('test-plugin');
+  });
+
+  it('multiple plugins contribute themes independently', async () => {
+    const themeA = { name: 'theme-a', displayName: 'Theme A', theme: {} };
+    const themeB = { name: 'theme-b', displayName: 'Theme B', theme: {} };
+    _testOnlySetPlugins([
+      makePlugin({ name: 'plugin-a', module: { themes: [themeA] } }),
+      makePlugin({ name: 'plugin-b', module: { themes: [themeB] } }),
+    ]);
+
+    const themes = await getThemes();
+
+    expect(themes).toHaveLength(20);
+    expect(themes.find(t => t.theme === themeA)?.plugin.name).toBe('plugin-a');
+    expect(themes.find(t => t.theme === themeB)?.plugin.name).toBe('plugin-b');
+  });
+
+  it('disabled plugin themes do not appear in the list', async () => {
+    _testOnlySetPlugins([
+      makePlugin({
+        config: { disabled: true },
+        module: { themes: [{ name: 'hidden', displayName: 'Hidden', theme: {} }] },
+      }),
+    ]);
+    const themes = await getThemes();
+    expect(themes).toHaveLength(18); // only built-in
+  });
+});
diff --git a/packages/insomnia/src/plugins/bridge-types.ts b/packages/insomnia/src/plugins/bridge-types.ts
new file mode 100644
index 0000000000..323f4ccb31
--- /dev/null
+++ b/packages/insomnia/src/plugins/bridge-types.ts
@@ -0,0 +1,108 @@
+import type { ResponsePatch } from '../main/network/libcurl-promise';
+import type { RenderedRequest } from '../templating/types';
+import type { PluginTheme } from './misc';
+
+export interface SerializablePlugin {
+  name: string;
+  description: string;
+  version: string;
+  directory: string;
+  config: { disabled: boolean };
+}
+
+export interface SerializableTheme {
+  plugin: SerializablePlugin;
+  theme: PluginTheme;
+}
+
+export interface SerializableActionMeta {
+  label: string;
+  icon?: string;
+  pluginName: string;
+}
+
+export interface SerializableDocumentActionMeta {
+  label: string;
+  pluginName: string;
+  hideAfterClick?: boolean;
+}
+
+export interface SerializableTemplateTagMeta {
+  pluginName: string;
+  templateTag: Record<string, unknown>;
+}
+
+export interface RunTemplateTagActionArgs {
+  pluginName: string;
+  tagName: string;
+  actionName: string;
+}
+
+export type PluginActionType = 'request' | 'requestGroup' | 'workspace' | 'document';
+
+export interface ExecutePluginActionArgs {
+  type: PluginActionType;
+  pluginName: string;
+  label: string;
+  projectId: string;
+  domainData: unknown;
+}
+
+export interface ApplyRequestHooksArgs {
+  renderedRequest: RenderedRequest;
+  projectId: string;
+  environment: Record<string, any>;
+}
+
+export interface ApplyResponseHooksArgs {
+  response: ResponsePatch;
+  renderedRequest: RenderedRequest;
+  projectId: string;
+  environment: Record<string, any>;
+}
+
+export interface ExecutePluginMainActionArgs {
+  pluginName: string;
+  actionName: string;
+  context?: Record<string, any>;
+  params?: Record<string, any>;
+}
+
+export interface PluginsBridgeAPI {
+  getThemes: () => Promise<SerializableTheme[]>;
+  getPlugins: () => Promise<SerializablePlugin[]>;
+  getActivePlugins: () => Promise<SerializablePlugin[]>;
+  reloadPlugins: () => Promise<void>;
+  getRequestActions: () => Promise<SerializableActionMeta[]>;
+  getRequestGroupActions: () => Promise<SerializableActionMeta[]>;
+  getWorkspaceActions: () => Promise<SerializableActionMeta[]>;
+  getDocumentActions: () => Promise<SerializableDocumentActionMeta[]>;
+  executeAction: (args: ExecutePluginActionArgs) => Promise<void>;
+  getTemplateTags: () => Promise<SerializableTemplateTagMeta[]>;
+  runTemplateTagAction: (args: RunTemplateTagActionArgs) => Promise<void>;
+  getBundlePlugins: () => Promise<SerializablePlugin[]>;
+  executePluginMainAction: (args: ExecutePluginMainActionArgs) => Promise<unknown>;
+  hasRequestHooks: () => Promise<boolean>;
+  hasResponseHooks: () => Promise<boolean>;
+  applyRequestHooks: (args: ApplyRequestHooksArgs) => Promise<RenderedRequest>;
+  applyResponseHooks: (args: ApplyResponseHooksArgs) => Promise<ResponsePatch>;
+  getBridgeMetrics: () => Promise<PluginBridgeMetrics>;
+}
+
+export interface PluginBridgeMethodMetrics {
+  ok: number;
+  error: number;
+  timeout: number;
+  totalDurationMs: number;
+  maxDurationMs: number;
+  avgDurationMs: number;
+}
+
+export interface PluginBridgeMetrics {
+  windowStartups: number;
+  windowCrashes: number;
+  windowStartupMsLast: number | null;
+  windowReady: boolean;
+  pendingInvocations: number;
+  perMethod: Record<string, PluginBridgeMethodMetrics>;
+}
diff --git a/packages/insomnia/src/plugins/index.ts b/packages/insomnia/src/plugins/index.ts
index 6ca0fd31ba..0ec029412b 100644
--- a/packages/insomnia/src/plugins/index.ts
+++ b/packages/insomnia/src/plugins/index.ts
@@ -111,6 +111,10 @@ export type ColorScheme = 'default' | 'light' | 'dark';
 
 let plugins: Plugin[] | null | undefined = null;
 
+export function _testOnlySetPlugins(p: Plugin[] | null) {
+  plugins = p;
+}
+
 export async function init() {
   await reloadPlugins();
 }
@@ -458,40 +462,7 @@ export async function executePluginMainAction({
 }
 
 export async function getRequestHooks(): Promise<RequestHook[]> {
-  let functions: RequestHook[] = [
-    {
-      plugin: {
-        name: 'default-headers',
-        description: 'Set default headers for all requests',
-        version: '0.0.0',
-        directory: '',
-        config: {
-          disabled: false,
-        },
-        module: {},
-      },
-      hook: context => {
-        const headers = context.request.getEnvironmentVariable('DEFAULT_HEADERS');
-        if (!headers) {
-          return;
-        }
-        for (const name of Object.keys(headers)) {
-          const value = headers[name];
-          if (context.request.hasHeader(name)) {
-            console.log(`[header] Skip setting default header ${name}. Already set to ${value}`);
-            continue;
-          }
-          if (value === 'null') {
-            context.request.removeHeader(name);
-            console.log(`[header] Remove default header ${name}`);
-          } else {
-            context.request.setHeader(name, value);
-            console.log(`[header] Set default header ${name}: ${value}`);
-          }
-        }
-      },
-    },
-  ];
+  let functions: RequestHook[] = [];
 
   for (const plugin of await getActivePlugins()) {
     const moreFunctions = plugin.module.requestHooks || [];
diff --git a/packages/insomnia/src/plugins/invoke-method.ts b/packages/insomnia/src/plugins/invoke-method.ts
new file mode 100644
index 0000000000..214c4d805f
--- /dev/null
+++ b/packages/insomnia/src/plugins/invoke-method.ts
@@ -0,0 +1,241 @@
+import type {
+  ApplyRequestHooksArgs,
+  ApplyResponseHooksArgs,
+  ExecutePluginActionArgs,
+  ExecutePluginMainActionArgs,
+  RunTemplateTagActionArgs,
+} from './bridge-types';
+import * as pluginApp from './context/app';
+import * as pluginData from './context/data';
+import * as pluginNetwork from './context/network';
+import * as pluginRequest from './context/request';
+import * as pluginResponse from './context/response';
+import * as pluginStore from './context/store';
+import type { Plugin } from './index';
+import {
+  executePluginMainAction,
+  getActivePlugins,
+  getBundlePlugins,
+  getDocumentActions,
+  getPlugins,
+  getRequestActions,
+  getRequestGroupActions,
+  getRequestHooks,
+  getResponseHooks,
+  getTemplateTags,
+  getThemes,
+  getWorkspaceActions,
+  reloadPlugins,
+} from './index';
+
+export type PluginInvokeMethod =
+  | 'getThemes'
+  | 'getPlugins'
+  | 'getActivePlugins'
+  | 'reloadPlugins'
+  | 'getRequestActions'
+  | 'getRequestGroupActions'
+  | 'getWorkspaceActions'
+  | 'getDocumentActions'
+  | 'executeAction'
+  | 'getTemplateTags'
+  | 'runTemplateTagAction'
+  | 'getBundlePlugins'
+  | 'executePluginMainAction'
+  | 'hasRequestHooks'
+  | 'hasResponseHooks'
+  | 'applyRequestHooks'
+  | 'applyResponseHooks';
+
+function serializePlugin(p: Plugin) {
+  return {
+    name: p.name,
+    description: p.description,
+    version: p.version,
+    directory: p.directory,
+    config: p.config,
+  };
+}
+
+export async function invokePluginMethod(method: PluginInvokeMethod, args?: unknown): Promise<unknown> {
+  switch (method) {
+    case 'getThemes': {
+      const themes = await getThemes();
+      return themes.map(({ plugin, theme }) => ({ plugin: serializePlugin(plugin), theme }));
+    }
+
+    case 'getPlugins': {
+      const plugins = await getPlugins();
+      return plugins.map(serializePlugin);
+    }
+
+    case 'getActivePlugins': {
+      const plugins = await getActivePlugins();
+      return plugins.map(serializePlugin);
+    }
+
+    case 'reloadPlugins': {
+      await reloadPlugins();
+      return null;
+    }
+
+    case 'getRequestActions': {
+      const actions = await getRequestActions();
+      return actions.map(a => ({ label: a.label, icon: a.icon, pluginName: a.plugin.name }));
+    }
+
+    case 'getRequestGroupActions': {
+      const actions = await getRequestGroupActions();
+      return actions.map(a => ({ label: a.label, icon: a.icon, pluginName: a.plugin.name }));
+    }
+
+    case 'getWorkspaceActions': {
+      const actions = await getWorkspaceActions();
+      return actions.map(a => ({ label: a.label, icon: a.icon, pluginName: a.plugin.name }));
+    }
+
+    case 'getDocumentActions': {
+      const actions = await getDocumentActions();
+      return actions.map(a => ({ label: a.label, hideAfterClick: a.hideAfterClick, pluginName: a.plugin.name }));
+    }
+
+    case 'executeAction': {
+      const { type, pluginName, label, projectId, domainData } = args as ExecutePluginActionArgs;
+
+      let allActions: any[];
+      switch (type) {
+        case 'request': {
+          allActions = await getRequestActions();
+          break;
+        }
+        case 'requestGroup': {
+          allActions = await getRequestGroupActions();
+          break;
+        }
+        case 'workspace': {
+          allActions = await getWorkspaceActions();
+          break;
+        }
+        case 'document': {
+          allActions = await getDocumentActions();
+          break;
+        }
+        default: {
+          throw new Error(`[plugin-window] Unknown action type: ${type}`);
+        }
+      }
+
+      const entry = allActions.find(a => a.plugin.name === pluginName && a.label === label);
+      if (!entry) {
+        throw new Error(`[plugin-window] Action not found: ${pluginName}/${label}`);
+      }
+
+      const context = {
+        ...pluginApp.init(),
+        ...pluginData.init(projectId),
+        ...(pluginStore.init(entry.plugin) as Record<string, any>),
+        ...(pluginNetwork.init() as Record<string, any>),
+      };
+
+      await entry.action(context, domainData);
+      return null;
+    }
+
+    case 'getBundlePlugins': {
+      const plugins = await getBundlePlugins();
+      return plugins.map(serializePlugin);
+    }
+
+    case 'executePluginMainAction': {
+      return executePluginMainAction(args as ExecutePluginMainActionArgs);
+    }
+
+    case 'getTemplateTags': {
+      const tags = await getTemplateTags();
+      return tags.map(({ plugin, templateTag }) => ({
+        pluginName: plugin.name,
+        // eslint-disable-next-line unicorn/prefer-structured-clone
+        templateTag: JSON.parse(JSON.stringify(templateTag)),
+      }));
+    }
+
+    case 'runTemplateTagAction': {
+      const { pluginName, tagName, actionName } = args as RunTemplateTagActionArgs;
+      const tags = await getTemplateTags();
+      const tag = tags.find(t => t.plugin.name === pluginName && t.templateTag.name === tagName);
+      if (!tag) {
+        throw new Error(`[plugin-window] Template tag not found: ${pluginName}/${tagName}`);
+      }
+      const action = tag.templateTag.actions?.find((a: any) => a.name === actionName);
+      if (!action) {
+        throw new Error(`[plugin-window] Tag action not found: ${actionName}`);
+      }
+      await action.run(pluginStore.init(tag.plugin));
+      return null;
+    }
+
+    case 'hasRequestHooks': {
+      const hooks = await getRequestHooks();
+      return hooks.length > 0;
+    }
+
+    case 'hasResponseHooks': {
+      const hooks = await getResponseHooks();
+      return hooks.length > 0;
+    }
+
+    case 'applyRequestHooks': {
+      const { renderedRequest, projectId, environment } = args as ApplyRequestHooksArgs;
+      const newRenderedRequest = { ...renderedRequest };
+      const renderedContext = { ...environment, getProjectId: () => projectId };
+
+      for (const { plugin, hook } of await getRequestHooks()) {
+        const context = {
+          ...pluginApp.init(),
+          ...pluginData.init(projectId),
+          ...(pluginStore.init(plugin) as Record<string, any>),
+          ...(pluginRequest.init(newRenderedRequest as any, renderedContext) as Record<string, any>),
+          ...(pluginNetwork.init() as Record<string, any>),
+        };
+        try {
+          await hook(context);
+        } catch (err) {
+          const error = err instanceof Error ? err : new Error(String(err));
+          throw new Error(`[plugin=${plugin.name}] ${error.message}`);
+        }
+      }
+
+      return newRenderedRequest;
+    }
+
+    case 'applyResponseHooks': {
+      const { response, renderedRequest, projectId, environment } = args as ApplyResponseHooksArgs;
+      const newResponse = { ...response };
+      const newRequest = { ...renderedRequest };
+      const renderedContext = { ...environment, getProjectId: () => projectId };
+
+      for (const { plugin, hook } of await getResponseHooks()) {
+        const context = {
+          ...pluginApp.init(),
+          ...pluginData.init(projectId),
+          ...(pluginStore.init(plugin) as Record<string, any>),
+          ...(pluginResponse.init(newResponse) as Record<string, any>),
+          ...(pluginRequest.init(newRequest as any, renderedContext, true) as Record<string, any>),
+          ...(pluginNetwork.init() as Record<string, any>),
+        };
+        try {
+          await hook(context);
+        } catch (err) {
+          const error = err instanceof Error ? err : new Error(String(err));
+          throw new Error(`[plugin=${plugin.name}] ${error.message}`);
+        }
+      }
+
+      return newResponse;
+    }
+
+    default: {
+      throw new Error(`[plugin-window] Unknown method: ${method}`);
+    }
+  }
+}
diff --git a/packages/insomnia/src/plugins/renderer-bridge.ts b/packages/insomnia/src/plugins/renderer-bridge.ts
new file mode 100644
index 0000000000..7b4c4c3652
--- /dev/null
+++ b/packages/insomnia/src/plugins/renderer-bridge.ts
@@ -0,0 +1,52 @@
+import type { PluginBridgeMetrics, PluginsBridgeAPI } from './bridge-types';
+import { invokePluginMethod } from './invoke-method';
+
+// Phase 1a rollback switch: set INSOMNIA_ENABLE_PLUGIN_BRIDGE=false to fall
+// back to running plugins directly in the renderer (legacy behaviour).
+// This module lives in the renderer bundle (not the preload) so the heavy
+// plugin-system deps it pulls in don't inflate the preload.
+const bridgeEnabled = process.env.INSOMNIA_ENABLE_PLUGIN_BRIDGE !== 'false';
+
+function call<M extends keyof Omit<PluginsBridgeAPI, 'getBridgeMetrics'>>(
+  method: M,
+  args?: Parameters<PluginsBridgeAPI[M]>[0],
+): ReturnType<PluginsBridgeAPI[M]> {
+  if (bridgeEnabled) {
+    const fn = (window.main.plugins[method] as (...a: any[]) => any);
+    return fn(args) as ReturnType<PluginsBridgeAPI[M]>;
+  }
+  return invokePluginMethod(method as any, args) as ReturnType<PluginsBridgeAPI[M]>;
+}
+
+const emptyBridgeMetrics: PluginBridgeMetrics = {
+  windowStartups: 0,
+  windowCrashes: 0,
+  windowStartupMsLast: null,
+  windowReady: false,
+  pendingInvocations: 0,
+  perMethod: {},
+};
+
+export const plugins: PluginsBridgeAPI = {
+  getThemes: () => call('getThemes'),
+  getPlugins: () => call('getPlugins'),
+  getActivePlugins: () => call('getActivePlugins'),
+  reloadPlugins: () => call('reloadPlugins'),
+  getRequestActions: () => call('getRequestActions'),
+  getRequestGroupActions: () => call('getRequestGroupActions'),
+  getWorkspaceActions: () => call('getWorkspaceActions'),
+  getDocumentActions: () => call('getDocumentActions'),
+  executeAction: args => call('executeAction', args),
+  getTemplateTags: () => call('getTemplateTags'),
+  runTemplateTagAction: args => call('runTemplateTagAction', args),
+  getBundlePlugins: () => call('getBundlePlugins'),
+  executePluginMainAction: args => call('executePluginMainAction', args),
+  hasRequestHooks: () => call('hasRequestHooks'),
+  hasResponseHooks: () => call('hasResponseHooks'),
+  applyRequestHooks: args => call('applyRequestHooks', args),
+  applyResponseHooks: args => call('applyResponseHooks', args),
+  getBridgeMetrics: () =>
+    bridgeEnabled
+      ? window.main.plugins.getBridgeMetrics()
+      : Promise.resolve(emptyBridgeMetrics),
+};
diff --git a/packages/insomnia/src/root.tsx b/packages/insomnia/src/root.tsx
index 9fa80a6f1d..922fee22fb 100644
--- a/packages/insomnia/src/root.tsx
+++ b/packages/insomnia/src/root.tsx
@@ -24,9 +24,10 @@ import { useLatest } from 'react-use';
 import { EXTERNAL_VAULT_PLUGIN_NAME, isDevelopment } from '~/common/constants';
 import type { Settings, UserSession } from '~/insomnia-data';
 import { models, services } from '~/insomnia-data';
-import { executePluginMainAction, reloadPlugins } from '~/plugins';
+import { executePluginMainAction } from '~/plugins';
 import { createPlugin } from '~/plugins/create';
 import { setTheme } from '~/plugins/misc';
+import { plugins } from '~/plugins/renderer-bridge';
 import { useAuthorizeActionFetcher } from '~/routes/auth.authorize';
 import { useDefaultBrowserRedirectActionFetcher } from '~/routes/auth.default-browser-redirect';
 import { useLogoutFetcher } from '~/routes/auth.logout';
@@ -482,7 +483,7 @@ const Root = () => {
               await services.settings.update(settings, {
                 theme: parsedTheme.name,
               });
-              await reloadPlugins();
+              await plugins.reloadPlugins();
               await setTheme(parsedTheme.name);
               showModal(SettingsModal, { tab: 'themes' });
             }
diff --git a/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.update.ts b/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.update.ts
index 64e524c2d7..88a03bb6ff 100644
--- a/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.update.ts
+++ b/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.update.ts
@@ -3,7 +3,7 @@ import { href } from 'react-router';
 import { EXTERNAL_VAULT_PLUGIN_NAME } from '~/common/constants';
 import type { CloudProviderCredential } from '~/insomnia-data';
 import { services } from '~/insomnia-data';
-import { executePluginMainAction } from '~/plugins';
+import { plugins } from '~/plugins/renderer-bridge';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -17,12 +17,12 @@ export async function clientAction({ params, request }: Route.ClientActionArgs)
   invariant(name && typeof name === 'string', 'Name is required');
   invariant(provider, 'Cloud Provider name is required');
   invariant(credentials, 'Credentials are required');
-  const authenticateResponse = await executePluginMainAction({
+  const authenticateResponse = await plugins.executePluginMainAction({
     pluginName: EXTERNAL_VAULT_PLUGIN_NAME,
     actionName: 'authenticate',
     params: { provider, credentials },
   });
-  const { success, error, result } = authenticateResponse;
+  const { success, error, result } = authenticateResponse as any;
   if (error) {
     return {
       error: `${error.errorMessage}`,
diff --git a/packages/insomnia/src/routes/cloud-credentials.create.tsx b/packages/insomnia/src/routes/cloud-credentials.create.tsx
index 54a15fcfae..56470c8cf1 100644
--- a/packages/insomnia/src/routes/cloud-credentials.create.tsx
+++ b/packages/insomnia/src/routes/cloud-credentials.create.tsx
@@ -3,7 +3,7 @@ import { href } from 'react-router';
 import { EXTERNAL_VAULT_PLUGIN_NAME } from '~/common/constants';
 import type { CloudProviderCredential } from '~/insomnia-data';
 import { services } from '~/insomnia-data';
-import { executePluginMainAction } from '~/plugins';
+import { plugins } from '~/plugins/renderer-bridge';
 import { invariant } from '~/utils/invariant';
 import { createFetcherSubmitHook } from '~/utils/router';
 
@@ -28,12 +28,12 @@ export async function clientAction({ request }: Route.ClientActionArgs) {
       : services.cloudCredential.update(existingCredential[0], patch));
     return credentials;
   }
-  const authenticateResponse = await executePluginMainAction({
+  const authenticateResponse = await plugins.executePluginMainAction({
     pluginName: EXTERNAL_VAULT_PLUGIN_NAME,
     actionName: 'authenticate',
     params: { provider, credentials },
   });
-  const { success, error, result } = authenticateResponse!;
+  const { success, error, result } = authenticateResponse as any;
   if (error) {
     return {
       error: `${error.errorMessage}`,
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 11539254df..229dd536f4 100644
--- a/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx
+++ b/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx
@@ -21,7 +21,7 @@ import { DEBOUNCE_MILLIS } from '~/common/constants';
 import * as misc from '~/common/misc';
 import { isMac } from '~/common/platform';
 import type { KeyCombination } from '~/common/settings';
-import { getTemplateTags } from '~/plugins';
+import { plugins } from '~/plugins/renderer-bridge';
 import { useRootLoaderData } from '~/root';
 import { getTagDefinitions } from '~/templating/index';
 import { type NunjucksParsedTag, type nunjucksTagContextMenuOptions } from '~/templating/types';
@@ -746,11 +746,7 @@ export const CodeEditor = memo(
               return;
             }
             event.preventDefault();
-            const pluginTemplateTags = (await getTemplateTags()).map(tag => ({
-              // Skip unsupported objects like functions in template tag to send in IPC
-              // eslint-disable-next-line unicorn/prefer-structured-clone
-              templateTag: JSON.parse(JSON.stringify(tag.templateTag)),
-            }));
+            const pluginTemplateTags = await plugins.getTemplateTags();
             const target = event.target as HTMLElement;
             // right click on nunjucks tag
             if (target?.classList?.contains('nunjucks-tag')) {
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 98bafa03b6..a35ab21798 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
@@ -10,7 +10,7 @@ import { DEBOUNCE_MILLIS } from '~/common/constants';
 import * as misc from '~/common/misc';
 import { isMac } from '~/common/platform';
 import type { KeyCombination } from '~/common/settings';
-import { getTemplateTags } from '~/plugins';
+import { plugins } from '~/plugins/renderer-bridge';
 import { useRootLoaderData } from '~/root';
 import { getTagDefinitions } from '~/templating/index';
 import { type NunjucksParsedTag, type nunjucksTagContextMenuOptions } from '~/templating/types';
@@ -380,11 +380,7 @@ export const OneLineEditor = forwardRef<OneLineEditorHandle, OneLineEditorProps>
             return;
           }
           event.preventDefault();
-          const pluginTemplateTags = (await getTemplateTags()).map(tag => ({
-            // Skip unsupported objects like functions in template tag to send in IPC
-            // eslint-disable-next-line unicorn/prefer-structured-clone
-            templateTag: JSON.parse(JSON.stringify(tag.templateTag)),
-          }));
+          const pluginTemplateTags = await plugins.getTemplateTags();
           const target = event.target as HTMLElement;
           // right click on nunjucks tag
           if (target?.classList?.contains('nunjucks-tag')) {
diff --git a/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx
index 7c757aa191..83ee855219 100644
--- a/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx
+++ b/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx
@@ -12,6 +12,7 @@ import type {
   WebSocketRequest,
 } from '~/insomnia-data';
 import { models, services } from '~/insomnia-data';
+import { plugins } from '~/plugins/renderer-bridge';
 import { useRootLoaderData } from '~/root';
 import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
 import { useRequestDuplicateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.duplicate';
@@ -22,12 +23,7 @@ import { useTabNavigate } from '~/ui/hooks/use-insomnia-tab';
 import { exportHarRequest } from '../../../common/har';
 import { toKebabCase } from '../../../common/misc';
 import type { PlatformKeyCombinations } from '../../../common/settings';
-import type { RequestAction } from '../../../plugins';
-import { getRequestActions } from '../../../plugins';
-import * as pluginApp from '../../../plugins/context/app';
-import * as pluginData from '../../../plugins/context/data';
-import * as pluginNetwork from '../../../plugins/context/network';
-import * as pluginStore from '../../../plugins/context/store';
+import type { SerializableActionMeta } from '../../../plugins/bridge-types';
 import { useRequestMetaPatcher } from '../../hooks/use-request';
 import { DropdownHint } from '../base/dropdown/dropdown-hint';
 import { Icon } from '../icon';
@@ -64,7 +60,7 @@ export const RequestActionsDropdown = ({
   const { activeProject, activeWorkspace } = useWorkspaceLoaderData()!;
   const patchRequestMeta = useRequestMetaPatcher();
   const { hotKeyRegistry } = settings;
-  const [actionPlugins, setActionPlugins] = useState<RequestAction[]>([]);
+  const [actionPlugins, setActionPlugins] = useState<SerializableActionMeta[]>([]);
   const duplicateRequestFetcher = useRequestDuplicateActionFetcher();
   const deleteRequestFetcher = useRequestDeleteActionFetcher();
   const { organizationId, projectId, workspaceId } = useParams() as {
@@ -93,7 +89,7 @@ export const RequestActionsDropdown = ({
   };
 
   const onOpen = useCallback(async () => {
-    const actionPlugins = await getRequestActions();
+    const actionPlugins = await plugins.getRequestActions();
     setActionPlugins(actionPlugins);
   }, []);
 
@@ -120,16 +116,14 @@ export const RequestActionsDropdown = ({
     });
   };
 
-  const handlePluginClick = async ({ plugin, action }: RequestAction) => {
+  const handlePluginClick = async ({ pluginName, label }: SerializableActionMeta) => {
     try {
-      const context = {
-        ...pluginApp.init(),
-        ...pluginData.init(activeProject._id),
-        ...pluginStore.init(plugin),
-        ...pluginNetwork.init(),
-      };
-      await action(context, {
-        request,
+      await plugins.executeAction({
+        type: 'request',
+        pluginName,
+        label,
+        projectId: activeProject._id,
+        domainData: { request },
       });
     } catch (error) {
       showError({
diff --git a/packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx
index 386e2b02e0..ba95c2feb4 100644
--- a/packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx
+++ b/packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx
@@ -5,6 +5,7 @@ import { useParams } from 'react-router';
 
 import type { Request, RequestGroup } from '~/insomnia-data';
 import { services } from '~/insomnia-data';
+import { plugins } from '~/plugins/renderer-bridge';
 import { useRootLoaderData } from '~/root';
 import { useRequestNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new';
 import { useRequestGroupDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.delete';
@@ -14,12 +15,7 @@ import { useTabNavigate } from '~/ui/hooks/use-insomnia-tab';
 
 import { toKebabCase } from '../../../common/misc';
 import type { PlatformKeyCombinations } from '../../../common/settings';
-import type { RequestGroupAction } from '../../../plugins';
-import { getRequestGroupActions } from '../../../plugins';
-import * as pluginApp from '../../../plugins/context/app';
-import * as pluginData from '../../../plugins/context/data';
-import * as pluginNetwork from '../../../plugins/context/network';
-import * as pluginStore from '../../../plugins/context/store';
+import type { SerializableActionMeta } from '../../../plugins/bridge-types';
 import { useWorkspaceLoaderData } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
 import type { CreateRequestType } from '../../hooks/use-request';
 import { type DropdownHandle, type DropdownProps } from '../base/dropdown';
@@ -42,7 +38,7 @@ export const RequestGroupActionsDropdown = ({ requestGroup, isOpen, triggerRef,
   const { activeProject, activeWorkspace } = useWorkspaceLoaderData()!;
   const { settings } = useRootLoaderData()!;
   const { hotKeyRegistry } = settings;
-  const [actionPlugins, setActionPlugins] = useState<RequestGroupAction[]>([]);
+  const [actionPlugins, setActionPlugins] = useState<SerializableActionMeta[]>([]);
   const [loadingActions, setLoadingActions] = useState<Record<string, boolean>>({});
   const dropdownRef = useRef<DropdownHandle>(null);
 
@@ -78,7 +74,7 @@ export const RequestGroupActionsDropdown = ({ requestGroup, isOpen, triggerRef,
     });
 
   const onOpen = async () => {
-    const actionPlugins = await getRequestGroupActions();
+    const actionPlugins = await plugins.getRequestGroupActions();
     setActionPlugins(actionPlugins);
   };
 
@@ -119,21 +115,18 @@ export const RequestGroupActionsDropdown = ({ requestGroup, isOpen, triggerRef,
     });
   };
 
-  const handlePluginClick = async ({ label, plugin, action }: RequestGroupAction) => {
+  const handlePluginClick = async ({ label, pluginName }: SerializableActionMeta) => {
     setLoadingActions({ ...loadingActions, [label]: true });
 
     try {
-      const context = {
-        ...(pluginApp.init() as Record<string, any>),
-        ...pluginData.init(activeProject._id),
-        ...(pluginStore.init(plugin) as Record<string, any>),
-        ...(pluginNetwork.init() as Record<string, any>),
-      };
       const requests = await services.request.findByParentId(requestGroup._id);
       requests.sort((a, b) => a.metaSortKey - b.metaSortKey);
-      await action(context, {
-        requestGroup,
-        requests,
+      await plugins.executeAction({
+        type: 'requestGroup',
+        pluginName,
+        label,
+        projectId: activeProject._id,
+        domainData: { requestGroup, requests },
       });
     } catch (err) {
       showError({
diff --git a/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx
index a09ad2556c..fe6c26bd09 100644
--- a/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx
+++ b/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx
@@ -16,11 +16,8 @@ import { useTabNavigate } from '~/ui/hooks/use-insomnia-tab';
 import { parseApiSpec } from '../../../common/api-specs';
 import { getProductName } from '../../../common/constants';
 import { getWorkspaceLabel } from '../../../common/get-workspace-label';
-import type { DocumentAction } from '../../../plugins';
-import { getDocumentActions } from '../../../plugins';
-import * as pluginApp from '../../../plugins/context/app';
-import * as pluginData from '../../../plugins/context/data';
-import * as pluginStore from '../../../plugins/context/store';
+import type { SerializableDocumentActionMeta } from '../../../plugins/bridge-types';
+import { plugins } from '../../../plugins/renderer-bridge';
 import { AnalyticsEvent } from '../../analytics';
 import { useLoadingRecord } from '../../hooks/use-loading-record';
 import { Dropdown, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
@@ -43,27 +40,28 @@ interface Props {
 }
 
 const useDocumentActionPlugins = ({ workspace, apiSpec, project }: Props) => {
-  const [actionPlugins, setActionPlugins] = useState<DocumentAction[]>([]);
+  const [actionPlugins, setActionPlugins] = useState<SerializableDocumentActionMeta[]>([]);
   const { startLoading, stopLoading, isLoading } = useLoadingRecord();
 
   const refresh = useCallback(async () => {
     // Only load document plugins if the scope is design, for now
     if (workspace.scope === models.workspace.WorkspaceScopeKeys.design) {
-      setActionPlugins(await getDocumentActions());
+      setActionPlugins(await plugins.getDocumentActions());
     }
   }, [workspace.scope]);
 
   const handleClick = useCallback(
-    async (p: DocumentAction) => {
+    async (p: SerializableDocumentActionMeta) => {
       startLoading(p.label);
 
       try {
-        const context = {
-          ...pluginApp.init(),
-          ...pluginData.init(project._id),
-          ...pluginStore.init(p.plugin),
-        };
-        await p.action(context, parseApiSpec(apiSpec?.contents || ''));
+        await plugins.executeAction({
+          type: 'document',
+          pluginName: p.pluginName,
+          label: p.label,
+          projectId: project._id,
+          domainData: parseApiSpec(apiSpec?.contents || ''),
+        });
       } catch (err) {
         showError({
           title: 'Document Action Failed',
@@ -79,7 +77,7 @@ const useDocumentActionPlugins = ({ workspace, apiSpec, project }: Props) => {
   const renderPluginDropdownItems: any = useCallback(
     () =>
       actionPlugins.map(p => (
-        <DropdownItem key={`${p.plugin.name}:${p.label}`} aria-label={p.label}>
+        <DropdownItem key={`${p.pluginName}:${p.label}`} aria-label={p.label}>
           <ItemContent
             icon={isLoading(p.label) ? 'refresh fa-spin' : undefined}
             label={p.label}
diff --git a/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx
index 0c68bf99c6..24329a8de5 100644
--- a/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx
+++ b/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx
@@ -33,12 +33,8 @@ import { getProductName } from '../../../common/constants';
 import { database as db } from '../../../common/database';
 import { getWorkspaceLabel } from '../../../common/get-workspace-label';
 import type { PlatformKeyCombinations } from '../../../common/settings';
-import type { WorkspaceAction } from '../../../plugins';
-import { getWorkspaceActions } from '../../../plugins';
-import * as pluginApp from '../../../plugins/context/app';
-import * as pluginData from '../../../plugins/context/data';
-import * as pluginNetwork from '../../../plugins/context/network';
-import * as pluginStore from '../../../plugins/context/store';
+import type { SerializableActionMeta } from '../../../plugins/bridge-types';
+import { plugins } from '../../../plugins/renderer-bridge';
 import { useWorkspaceLoaderData } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
 import { useMockServerGenerateRequestCollectionActionFetcher } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection';
 import { invariant } from '../../../utils/invariant';
@@ -70,7 +66,7 @@ export const WorkspaceDropdown: FC<{}> = () => {
   const updateWorkspaceFetcher = useWorkspaceUpdateActionFetcher();
   const [isDeleteRemoteWorkspaceModalOpen, setIsDeleteRemoteWorkspaceModalOpen] = useState(false);
   const deleteWorkspaceFetcher = useWorkspaceDeleteActionFetcher();
-  const [actionPlugins, setActionPlugins] = useState<WorkspaceAction[]>([]);
+  const [actionPlugins, setActionPlugins] = useState<SerializableActionMeta[]>([]);
   const [loadingActions, setLoadingActions] = useState<Record<string, boolean>>({});
   const navigate = useNavigate();
   const generateCollectionFetcher = useMockServerGenerateRequestCollectionActionFetcher();
@@ -85,23 +81,18 @@ export const WorkspaceDropdown: FC<{}> = () => {
   });
 
   const handlePluginClick = useCallback(
-    async ({ action, plugin, label }: WorkspaceAction, workspace: Workspace) => {
+    async ({ pluginName, label }: SerializableActionMeta, workspace: Workspace) => {
       setLoadingActions({ ...loadingActions, [label]: true });
       try {
-        const context = {
-          ...(pluginApp.init() as Record<string, any>),
-          ...pluginData.init(activeProject._id),
-          ...(pluginStore.init(plugin) as Record<string, any>),
-          ...(pluginNetwork.init() as Record<string, any>),
-        };
-
         const docs = await db.getWithDescendants(workspace, [models.request.type]);
         const requests = docs.filter(models.request.isRequest).filter(doc => !doc.isPrivate);
         const requestGroups = docs.filter(models.requestGroup.isRequestGroup);
-        await action(context, {
-          requestGroups,
-          requests,
-          workspace,
+        await plugins.executeAction({
+          type: 'workspace',
+          pluginName,
+          label,
+          projectId: activeProject._id,
+          domainData: { workspace, requests, requestGroups },
         });
       } catch (err) {
         showError({
@@ -115,7 +106,7 @@ export const WorkspaceDropdown: FC<{}> = () => {
   );
 
   const handleDropdownOpen = useCallback(async () => {
-    const actionPlugins = await getWorkspaceActions();
+    const actionPlugins = await plugins.getWorkspaceActions();
     setActionPlugins(actionPlugins);
   }, []);
 
diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
index 2f401771b7..a86562901d 100644
--- a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
@@ -7,7 +7,7 @@ import { useUpdateCloudCredentialActionFetcher } from '~/routes/cloud-credential
 import { useCreateCloudCredentialActionFetcher } from '~/routes/cloud-credentials.create';
 
 import { EXTERNAL_VAULT_PLUGIN_NAME } from '../../../../common/constants';
-import { executePluginMainAction } from '../../../../plugins';
+import { plugins } from '../../../../plugins/renderer-bridge';
 import { Icon } from '../../icon';
 import { AWSCredentialForm } from './aws-credential-form';
 import { GCPCredentialForm } from './gcp-credential-form';
@@ -66,12 +66,12 @@ export const CloudCredentialModal = (props: CloudCredentialModalProps) => {
       const parsedURL = new URL(manulInputUrl);
       const code = parsedURL.searchParams.get('code');
       if (code && typeof code === 'string') {
-        const authResult = await executePluginMainAction({
+        const authResult = await plugins.executePluginMainAction({
           pluginName: EXTERNAL_VAULT_PLUGIN_NAME,
           actionName: 'exchangeCode',
           params: { provider: 'azure', code },
         });
-        const { success, result, error } = authResult;
+        const { success, result, error } = authResult as any;
         if (success) {
           const { account, uniqueId } = result!;
           handleFormSubmit({
diff --git a/packages/insomnia/src/ui/components/modals/settings-modal.tsx b/packages/insomnia/src/ui/components/modals/settings-modal.tsx
index fe7a0abfc9..59861feae8 100644
--- a/packages/insomnia/src/ui/components/modals/settings-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/settings-modal.tsx
@@ -5,7 +5,6 @@ import { useParams } from 'react-router';
 
 import { AI_PLUGIN_NAME, isKonnectSyncEnabled } from '~/common/constants';
 import { models } from '~/insomnia-data';
-import { getBundlePlugins } from '~/plugins';
 import { useRootLoaderData } from '~/root';
 import { AnalyticsEvent } from '~/ui/analytics';
 import { AISettings } from '~/ui/components/settings/ai-settings';
@@ -14,6 +13,7 @@ import { KonnectSettings } from '~/ui/components/settings/konnect-settings';
 import { ScriptingSettings } from '~/ui/components/settings/scripting-settings';
 
 import { getAppVersion, getProductName } from '../../../common/constants';
+import { plugins as pluginsBridge } from '../../../plugins/renderer-bridge';
 import { Modal, type ModalHandle, type ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalHeader } from '../base/modal-header';
@@ -46,7 +46,7 @@ export const SettingsModal = forwardRef<SettingsModalHandle, ModalProps>((props,
 
   useEffect(() => {
     const checkFeatures = async () => {
-      const plugins = await getBundlePlugins();
+      const plugins = await pluginsBridge.getBundlePlugins();
       const aiPlugin = plugins.find(p => p.name === AI_PLUGIN_NAME);
       setShouldShowAiSettingsTab(!!aiPlugin && !!userSession.id);
 
diff --git a/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx b/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
index a79ff749a1..45ad45c3f5 100644
--- a/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
+++ b/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
@@ -7,8 +7,7 @@ import { useRootLoaderData } from '~/root';
 import { useDeleteCloudCredentialActionFetcher } from '~/routes/cloud-credentials.$cloudCredentialId.delete';
 
 import { EXTERNAL_VAULT_PLUGIN_NAME } from '../../../common/constants';
-import { executePluginMainAction } from '../../../plugins';
-import { getBundlePlugins } from '../../../plugins';
+import { plugins as pluginsBridge } from '../../../plugins/renderer-bridge';
 import { usePlanData } from '../../hooks/use-plan';
 import { Icon } from '../icon';
 import { showError, showModal } from '../modals';
@@ -64,7 +63,7 @@ export const CloudServiceCredentialList = () => {
   const deleteCredentialFetcher = useDeleteCloudCredentialActionFetcher();
   useEffect(() => {
     const checkVaultPlugin = async () => {
-      const plugins = await getBundlePlugins();
+      const plugins = await pluginsBridge.getBundlePlugins();
       const vaultPlugin = plugins.find(p => p.name === EXTERNAL_VAULT_PLUGIN_NAME);
       setIsVaultPluginInstalled(!!vaultPlugin);
     };
@@ -98,11 +97,11 @@ export const CloudServiceCredentialList = () => {
 
   const handleCreateCloudServiceCredential = async (key: CloudProviderName) => {
     if (key === 'azure') {
-      const { authUrl, error } = await executePluginMainAction({
+      const { authUrl, error } = (await pluginsBridge.executePluginMainAction({
         pluginName: EXTERNAL_VAULT_PLUGIN_NAME,
         actionName: 'openAuthUrl',
         params: { provider: 'azure' },
-      });
+      })) as any;
       // show error modal if no authUrl generated
       if (!authUrl) {
         console.error('Failed to open Azure auth url', error);
@@ -247,7 +246,7 @@ export const CloudServiceCredentialList = () => {
           <button
             className="pointer mb-(--padding-sm) ml-(--padding-sm) flex h-(--line-height-xs) w-32 items-center gap-2 rounded-md border border-solid border-(--hl-lg) px-(--padding-md) hover:bg-(--hl-xs)"
             onClick={async () =>
-              await executePluginMainAction({
+              await pluginsBridge.executePluginMainAction({
                 pluginName: EXTERNAL_VAULT_PLUGIN_NAME,
                 actionName: 'clearCache',
               })
diff --git a/packages/insomnia/src/ui/components/settings/plugins.tsx b/packages/insomnia/src/ui/components/settings/plugins.tsx
index 118f57dee2..28de93db3b 100644
--- a/packages/insomnia/src/ui/components/settings/plugins.tsx
+++ b/packages/insomnia/src/ui/components/settings/plugins.tsx
@@ -16,8 +16,8 @@ import { useRootLoaderData } from '~/root';
 
 import { ACCEPTED_NODE_CA_FILE_EXTS, NPM_PACKAGE_BASE, PLUGIN_HUB_BASE } from '../../../common/constants';
 import { docsPlugins } from '../../../common/documentation';
-import type { Plugin } from '../../../plugins/index';
-import { getPlugins } from '../../../plugins/index';
+import type { SerializablePlugin } from '../../../plugins/bridge-types';
+import { plugins as pluginsBridge } from '../../../plugins/renderer-bridge';
 import { reload } from '../../../templating/index';
 import { validatePluginName } from '../../../utils/plugin';
 import { useSettingsPatcher } from '../../hooks/use-request';
@@ -47,7 +47,7 @@ const getNpmRegistryUrlValidationError = (url: string): string | null => {
 };
 
 interface State {
-  plugins: Plugin[];
+  plugins: SerializablePlugin[];
   npmPluginValue: string;
   error: Error | null;
   installPluginErrMsg: string;
@@ -107,8 +107,9 @@ export const Plugins: FC = () => {
 
   async function handleReloadPlugins() {
     setState(state => ({ ...state, isRefreshingPlugins: true }));
-    // Get and reload plugins
-    const plugins = (await getPlugins(true)).filter(
+    await pluginsBridge.reloadPlugins();
+    const allPlugins = (await pluginsBridge.getPlugins()) as SerializablePlugin[];
+    const plugins = allPlugins.filter(
       // Filter out pre-bundled plugins
       p => p.directory,
     );
@@ -456,7 +457,7 @@ export const Plugins: FC = () => {
                             acc[plugin.name] = { ...plugin.config, disabled: !isSelected };
                             return acc;
                           },
-                          {} as Record<string, Plugin['config']>,
+                          {} as Record<string, SerializablePlugin['config']>,
                         );
 
                         patchSettings({ pluginConfig: { ...settings.pluginConfig, ...config } });
diff --git a/packages/insomnia/src/ui/components/templating/tag-editor.tsx b/packages/insomnia/src/ui/components/templating/tag-editor.tsx
index dd3d58d57b..4168325b05 100644
--- a/packages/insomnia/src/ui/components/templating/tag-editor.tsx
+++ b/packages/insomnia/src/ui/components/templating/tag-editor.tsx
@@ -1,6 +1,5 @@
 import classnames from 'classnames';
 import clone from 'clone';
-import { localTemplateTags } from 'insomnia/src/templating/local-template-tags';
 import React, { type FC, useCallback, useEffect, useState } from 'react';
 import { Button, Link } from 'react-aria-components';
 import * as reactUse from 'react-use';
@@ -13,8 +12,7 @@ import { database as db } from '../../../common/database';
 import { docsAfterResponseScript } from '../../../common/documentation';
 import { delay, fnOrString, SECURITY_SETTINGS_PATH_LABEL } from '../../../common/misc';
 import { metaSortKeySort } from '../../../common/sorting';
-import * as plugins from '../../../plugins';
-import * as pluginStore from '../../../plugins/context/store';
+import { plugins } from '../../../plugins/renderer-bridge';
 import * as templating from '../../../templating';
 import type { NunjucksParsedTag, NunjucksParsedTagArg } from '../../../templating/types';
 import * as templateUtils from '../../../templating/utils';
@@ -569,13 +567,14 @@ export const TagEditor: FC<Props> = props => {
                   className="btn btn--clicky btn--largest"
                   type="button"
                   onClick={async () => {
-                    const pluginTemplateTags = await plugins.getTemplateTags();
-                    const templateTags = [...pluginTemplateTags, ...localTemplateTags] as plugins.TemplateTag[];
-                    const activeTemplateTag = templateTags.find(({ templateTag }) => {
-                      return templateTag.name === state.activeTagData?.name;
-                    });
-                    if (activeTemplateTag) {
-                      await action.run(pluginStore.init(activeTemplateTag.plugin));
+                    const bridgeTags = await plugins.getTemplateTags();
+                    const bridgeTag = bridgeTags.find(t => t.templateTag.name === state.activeTagData?.name);
+                    if (bridgeTag) {
+                      await plugins.runTemplateTagAction({
+                        pluginName: bridgeTag.pluginName,
+                        tagName: bridgeTag.templateTag.name as string,
+                        actionName: action.name,
+                      });
                     }
                     update(state.tagDefinitions, state.activeTagDefinition, state.activeTagData, true);
                   }}
diff --git a/packages/insomnia/src/ui/hooks/theme.ts b/packages/insomnia/src/ui/hooks/theme.ts
index d60fe776f2..d87c9a4f2a 100644
--- a/packages/insomnia/src/ui/hooks/theme.ts
+++ b/packages/insomnia/src/ui/hooks/theme.ts
@@ -5,8 +5,9 @@ import type { ThemeSettings } from '~/insomnia-data';
 import { useRootLoaderData } from '~/root';
 import { AnalyticsEvent } from '~/ui/analytics';
 
-import { type ColorScheme, getThemes } from '../../plugins';
+import { type ColorScheme } from '../../plugins';
 import { applyColorScheme, getColorScheme, type PluginTheme } from '../../plugins/misc';
+import { plugins } from '../../plugins/renderer-bridge';
 import { useSettingsPatcher } from './use-request';
 
 export const useThemes = () => {
@@ -16,7 +17,7 @@ export const useThemes = () => {
   const [themes, setThemes] = useState<PluginTheme[]>([]);
 
   reactUse.useAsync(async () => {
-    const pluginThemes = await getThemes();
+    const pluginThemes = await plugins.getThemes();
     setThemes(pluginThemes.map(({ theme }) => theme));
   }, [pluginConfig]);
 
diff --git a/packages/insomnia/src/ui/hooks/use-global-keyboard-shortcuts.ts b/packages/insomnia/src/ui/hooks/use-global-keyboard-shortcuts.ts
index 351ac6a685..96bb00a428 100644
--- a/packages/insomnia/src/ui/hooks/use-global-keyboard-shortcuts.ts
+++ b/packages/insomnia/src/ui/hooks/use-global-keyboard-shortcuts.ts
@@ -1,6 +1,6 @@
 import { useRootLoaderData } from '~/root';
 
-import * as plugins from '../../plugins';
+import { plugins } from '../../plugins/renderer-bridge';
 import { useDocBodyKeyboardShortcuts } from '../components/keydown-binder';
 import { showModal } from '../components/modals';
 import { SettingsModal } from '../components/modals/settings-modal';
diff --git a/packages/insomnia/src/ui/renderer-listeners.ts b/packages/insomnia/src/ui/renderer-listeners.ts
index 791d631bb3..730ec8518c 100644
--- a/packages/insomnia/src/ui/renderer-listeners.ts
+++ b/packages/insomnia/src/ui/renderer-listeners.ts
@@ -1,8 +1,8 @@
 import { services } from '~/insomnia-data';
 import { type RAToastContent, showToast } from '~/ui/components/toast-notification';
 
-import * as plugins from '../plugins';
 import * as themes from '../plugins/misc';
+import { plugins } from '../plugins/renderer-bridge';
 import * as templating from '../templating';
 import { showModal } from './components/modals';
 import { SettingsModal } from './components/modals/settings-modal';
@@ -26,3 +26,21 @@ window.main.on('toggle-preferences-shortcuts', () => {
 window.main.on('show-toast', (_, options: { content: RAToastContent; options?: { timeout?: number } }) => {
   showToast(options.content, options.options);
 });
+
+window.main.on('plugin-ui-alert', (_, options: Record<string, any>) => {
+  window.showAlert?.(options);
+});
+
+window.main.on('plugin-ui-dialog', (_, options: Record<string, any>) => {
+  window.showWrapper?.(options);
+});
+
+window.main.on('plugin-ui-prompt', (_, id: string, options: Record<string, any>) => {
+  window.showPrompt?.({
+    ...options,
+    onComplete: (value: string) => {
+      window.main.notifyPluginPromptResult(id, value);
+    },
+    onHide: () => {},
+  });
+});