From 448d85febbd5f7854b782858badd6b0b32e343f6 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Thu, 26 Mar 2026 11:54:58 +0100
Subject: [PATCH] :bug: Fix regression on mcp server listen port

---
 docker/devenv/files/bashrc       | 3 +++
 docker/images/Dockerfile.mcp     | 3 ++-
 mcp/packages/plugin/package.json | 2 +-
 mcp/packages/server/package.json | 1 +
 mcp/pnpm-lock.yaml               | 3 +++
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docker/devenv/files/bashrc b/docker/devenv/files/bashrc
index 98fc4a96dc..79ef2bd532 100644
--- a/docker/devenv/files/bashrc
+++ b/docker/devenv/files/bashrc
@@ -5,6 +5,9 @@ EMSDK_QUIET=1 . /opt/emsdk/emsdk_env.sh;
 export PATH="/home/penpot/.cargo/bin:/opt/jdk/bin:/opt/utils/bin:/opt/clojure/bin:/opt/node/bin:/opt/imagick/bin:/opt/cargo/bin:$PATH"
 export CARGO_HOME="/home/penpot/.cargo"
 
+export PENPOT_MCP_PLUGIN_SERVER_HOST=0.0.0.0
+export PENPOT_MCP_SERVER_HOST=0.0.0.0
+
 alias l='ls --color -GFlh'
 alias ll='ls --color -GFlh'
 alias rm='rm -rf'
diff --git a/docker/images/Dockerfile.mcp b/docker/images/Dockerfile.mcp
index f4d5544c89..14b1172035 100644
--- a/docker/images/Dockerfile.mcp
+++ b/docker/images/Dockerfile.mcp
@@ -5,7 +5,8 @@ ENV LANG=en_US.UTF-8 \
     LC_ALL=en_US.UTF-8 \
     NODE_VERSION=v22.21.1 \
     DEBIAN_FRONTEND=noninteractive \
-    PATH=/opt/node/bin:$PATH
+    PATH=/opt/node/bin:$PATH \
+    PENPOT_MCP_SERVER_HOST=0.0.0.0
 
 RUN set -ex; \
     useradd -U -M -u 1001 -s /bin/false -d /opt/penpot penpot; \
diff --git a/mcp/packages/plugin/package.json b/mcp/packages/plugin/package.json
index 2aad3625f1..0ccf276181 100644
--- a/mcp/packages/plugin/package.json
+++ b/mcp/packages/plugin/package.json
@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "type": "module",
   "scripts": {
-    "start": "cross-env PENPOT_MCP_PLUGIN_SERVER_HOST=0.0.0.0 vite build --watch --config vite.config.ts",
+    "start": "vite build --watch --config vite.config.ts",
     "start:multi-user": "pnpm run start",
     "build": "tsc && vite build --config vite.release.config.ts",
     "types:check": "tsc --noEmit",
diff --git a/mcp/packages/server/package.json b/mcp/packages/server/package.json
index c64de4c303..922be86975 100644
--- a/mcp/packages/server/package.json
+++ b/mcp/packages/server/package.json
@@ -38,6 +38,7 @@
     "zod": "^4.3.6"
   },
   "devDependencies": {
+    "cross-env": "^7.0.3",
     "@penpot/mcp-common": "workspace:../common",
     "@types/express": "^4.17.0",
     "@types/js-yaml": "^4.0.9",
diff --git a/mcp/pnpm-lock.yaml b/mcp/pnpm-lock.yaml
index 15088c9791..c90b714cc5 100644
--- a/mcp/pnpm-lock.yaml
+++ b/mcp/pnpm-lock.yaml
@@ -97,6 +97,9 @@ importers:
       '@types/ws':
         specifier: ^8.5.10
         version: 8.18.1
+      cross-env:
+        specifier: ^7.0.3
+        version: 7.0.3
       esbuild:
         specifier: ^0.25.0
         version: 0.25.12