diff --git a/desktop/.eslintignore b/desktop/.eslintignore
index a5200da84..c46f59cca 100644
--- a/desktop/.eslintignore
+++ b/desktop/.eslintignore
@@ -15,5 +15,6 @@ static/index.js
 static/defaultPlugins/*
 app/src/defaultPlugins/index.tsx
 flipper-server-core/src/defaultPlugins/index.tsx
+flipper-server-companion/src/defaultPlugins/index.tsx
 generated
 flipper-server/static
diff --git a/desktop/.gitignore b/desktop/.gitignore
index 98f3f4a19..9fcfde761 100644
--- a/desktop/.gitignore
+++ b/desktop/.gitignore
@@ -7,6 +7,7 @@ node_modules/
 /app/src/defaultPlugins/index.tsx
 /flipper-ui-browser/src/defaultPlugins/index.tsx
 /flipper-server-core/src/defaultPlugins/index.tsx
+/flipper-server-companion/src/defaultPlugins/index.tsx
 /coverage
 .env
 tsc-error.log
diff --git a/desktop/flipper-server-companion/README.md b/desktop/flipper-server-companion/README.md
new file mode 100644
index 000000000..ab2f44d90
--- /dev/null
+++ b/desktop/flipper-server-companion/README.md
@@ -0,0 +1,3 @@
+# flipper-server-companion (TBD)
+
+Flipper Server Companion runs Flipper plugins in Flipper Server context.
diff --git a/desktop/flipper-server-companion/package.json b/desktop/flipper-server-companion/package.json
new file mode 100644
index 000000000..347f4a003
--- /dev/null
+++ b/desktop/flipper-server-companion/package.json
@@ -0,0 +1,35 @@
+{
+  "name": "flipper-server-companion",
+  "private": true,
+  "version": "0.0.0",
+  "description": "Runs Flipper plugins on Flipper Server",
+  "repository": "facebook/flipper",
+  "main": "lib/index.js",
+  "flipperBundlerEntry": "src",
+  "types": "lib/index.d.ts",
+  "license": "MIT",
+  "bugs": "https://github.com/facebook/flipper/issues",
+  "dependencies": {
+    "flipper-common": "0.0.0",
+    "flipper-frontend-core": "0.0.0",
+    "flipper-plugin": "0.0.0",
+    "immer": "^9.0.12"
+  },
+  "devDependencies": {
+    "@types/node": "^17.0.29"
+  },
+  "peerDependencies": {},
+  "scripts": {
+    "reset": "rimraf lib *.tsbuildinfo",
+    "build": "tsc -b",
+    "prepack": "yarn reset && yarn build"
+  },
+  "files": [
+    "lib/**/*"
+  ],
+  "homepage": "https://github.com/facebook/flipper",
+  "keywords": [
+    "Flipper"
+  ],
+  "author": "Facebook, Inc"
+}
diff --git a/desktop/flipper-server-companion/tsconfig.json b/desktop/flipper-server-companion/tsconfig.json
new file mode 100644
index 000000000..e0c7516ab
--- /dev/null
+++ b/desktop/flipper-server-companion/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "lib",
+    "rootDir": "src",
+    "types": ["node", "../types/flipperGlobals"]
+  },
+  "references": [
+    {
+      "path": "../flipper-common"
+    },
+    {
+      "path": "../flipper-frontend-core"
+    },
+    {
+      "path": "../flipper-plugin"
+    }
+  ]
+}
diff --git a/desktop/package.json b/desktop/package.json
index f21a58c36..1b0ca565a 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -173,6 +173,7 @@
       "flipper-common",
       "flipper-frontend-core",
       "flipper-plugin",
+      "flipper-server-companion",
       "flipper-server-core",
       "flipper-ui-core",
       "flipper-ui-browser",
diff --git a/desktop/tsc-root/tsconfig.json b/desktop/tsc-root/tsconfig.json
index aefb26cc5..88ec25e84 100644
--- a/desktop/tsc-root/tsconfig.json
+++ b/desktop/tsc-root/tsconfig.json
@@ -21,6 +21,9 @@
     {
       "path": "../flipper-server"
     },
+    {
+      "path": "../flipper-server-companion"
+    },
     {
       "path": "../flipper-server-core"
     },
diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index d3322cab9..da3566b76 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -2769,21 +2769,16 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.0.tgz#4b95f2327bacd1ef8f08d8ceda193039c5d7f52e"
   integrity sha512-8MLkBIYQMuhRBQzGN9875bYsOhPnf/0rgXGo66S2FemHkhbn9qtsz9ywV1iCG+vbjigE4WUNVvw37Dx+L0qsPg==
 
-"@types/node@>=10.0.0":
-  version "17.0.21"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644"
-  integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==
-
-"@types/node@^12.0.12":
-  version "12.20.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.7.tgz#1cb61fd0c85cb87e728c43107b5fd82b69bc9ef8"
-  integrity sha512-gWL8VUkg8VRaCAUgG9WmhefMqHmMblxe2rVpMF86nZY/+ZysU+BkAp+3cz03AixWDSSz0ks5WX59yAhv/cDwFA==
-
-"@types/node@^17.0.31":
+"@types/node@>=10.0.0", "@types/node@^17.0.29", "@types/node@^17.0.31":
   version "17.0.31"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.31.tgz#a5bb84ecfa27eec5e1c802c6bbf8139bdb163a5d"
   integrity sha512-AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q==
 
+"@types/node@^12.0.12":
+  version "12.20.50"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.50.tgz#14ba5198f1754ffd0472a2f84ab433b45ee0b65e"
+  integrity sha512-+9axpWx2b2JCVovr7Ilgt96uc6C1zBKOQMpGtRbWT9IoR/8ue32GGMfGA4woP8QyP2gBs6GQWEVM3tCybGCxDA==
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"