@ollie-shop/cli 1.3.3 → 1.4.1

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @ollie-shop/cli@1.3.3 build /home/runner/work/ollie-shop/ollie-shop/packages/cli
+> @ollie-shop/cli@1.4.1 build /home/runner/work/ollie-shop/ollie-shop/packages/cli
 > tsup
 
 CLI Building entry: src/index.tsx
@@ -9,5 +9,5 @@
 CLI Target: node22
 CLI Cleaning output folder
 ESM Build start
-ESM dist/index.js 92.64 KB
-ESM ⚡️ Build success in 300ms
+ESM dist/index.js 95.89 KB
+ESM ⚡️ Build success in 248ms

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ollie-shop/cli
 
+## 1.4.1
+
+### Patch Changes
+
+- 630ae3e: Keep Studio live reload working after a component is added or removed. The dev server proxy now owns the `/esbuild` connection and re-subscribes across context recreates, so the browser's EventSource no longer drops when the esbuild context is disposed.
+
+## 1.4.0
+
+### Minor Changes
+
+- bac681e: Add a `--no-open` flag to `ollieshop start` (also honored via the `CI` env var) so the dev server can run headless without auto-opening Studio in the browser — useful when an agent spawns it and drives its own preview harness. `ollieshop start` now also runs without a TTY: it no longer crashes with "Raw mode is not supported" when backgrounded, and simply disables keyboard shortcuts in that case. Upgrade the CLI to React 19 and Ink 6.
+
 ## 1.3.3
 
 ### Patch Changes

package/CONTEXT.md

@@ -78,6 +78,14 @@ The `deploy` command bundles a component directory into a zip, uploads it to the
 
 Terminal build statuses: `SUCCEEDED`, `FAILED`, `STOPPED`, `TIMED_OUT`, `FAULT`
 
+## Dev Server (agent / harness mode)
+
+`ollieshop start` runs the local build+serve dev server (port 4000: `/manifest.json`, `/<Name>/index.js`, `/<Name>/index.css`, SSE `/esbuild`) and normally **auto-opens the admin Studio in a browser**. When you (an agent) are spawning it, pass `--no-open` so it does **not** open a browser — then drive your own preview harness against the dev server instead. The flag is also honored automatically when the `CI` env var is set.
+
+```bash
+ollieshop start --no-open    # build+serve only; no browser is opened
+```
+
 ## Response Format
 
 All commands return:

package/README.md

@@ -172,6 +172,7 @@ ollieshop init --store-id <STORE_UUID> --version-id <VERSION_UUID> -o json
 | `--fields a,b,c` | | Limit output fields (comma-separated) |
 | `--data '{...}'` | `-d` | Raw JSON payload for mutations (alternative to individual flags) |
 | `--stage <name>` | `-s` | Config stage — loads `ollie.<stage>.json` instead of `ollie.json` |
+| `--no-open` | | `start` only: don't auto-open Studio in the browser (also honored via the `CI` env var) |
 
 ## Response Format
 

package/dist/index.js

@@ -107,12 +107,17 @@ function HelpCommand() {
           "{stage}",
           ".json)"
         ] })
+      ] }),
+      /* @__PURE__ */ jsxs(Box, { children: [
+        /* @__PURE__ */ jsx(Box, { width: 24, children: /* @__PURE__ */ jsx(Text, { color: "yellow", children: "--no-open" }) }),
+        /* @__PURE__ */ jsx(Text, { children: "start: don't auto-open Studio (also honored via CI env)" })
       ] })
     ] }),
     /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(Text, { bold: true, children: "Examples:" }) }),
     /* @__PURE__ */ jsxs(Box, { marginLeft: 2, flexDirection: "column", children: [
       /* @__PURE__ */ jsx(Text, { dimColor: true, children: "$ ollieshop login" }),
       /* @__PURE__ */ jsx(Text, { dimColor: true, children: "$ ollieshop start --stage dev" }),
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "$ ollieshop start --no-open" }),
       /* @__PURE__ */ jsx(Text, { dimColor: true, children: "$ ollieshop whoami -o json" }),
       /* @__PURE__ */ jsx(Text, { dimColor: true, children: "$ ollieshop schema store.create" }),
       /* @__PURE__ */ jsx(Text, { dimColor: true, children: '$ ollieshop store create --name "My Store" --platform vtex --platform-store-id mystore' }),
@@ -695,6 +700,7 @@ async function startDevServer(options = {}) {
     ctx = null;
     if (oldCtx) await oldCtx.dispose();
     await buildAndServe(components);
+    notifyComponentsChanged(components);
   }
   await buildAndServe(await discoverComponents({ cwd, stage }));
   async function currentComponentNames() {
@@ -732,8 +738,80 @@ async function startDevServer(options = {}) {
     if (watchTimer) clearTimeout(watchTimer);
     watchTimer = setTimeout(maybeRecreate, 150);
   });
+  const sseClients = /* @__PURE__ */ new Set();
+  let upstreamReq = null;
+  let upstreamRetry = null;
+  function broadcast(chunk) {
+    for (const client of sseClients) {
+      if (!client.writableEnded) client.write(chunk);
+    }
+  }
+  function connectUpstream() {
+    if (upstreamReq || sseClients.size === 0) return;
+    const req = http.request(
+      {
+        hostname: host,
+        port: internalPort,
+        path: "/esbuild",
+        method: "GET",
+        headers: { accept: "text/event-stream" }
+      },
+      (upstream) => {
+        upstream.on("data", broadcast);
+        upstream.on("close", onUpstreamLost);
+        upstream.on("error", onUpstreamLost);
+      }
+    );
+    req.on("error", onUpstreamLost);
+    req.end();
+    upstreamReq = req;
+  }
+  function onUpstreamLost() {
+    if (!upstreamReq) return;
+    upstreamReq = null;
+    if (upstreamRetry) clearTimeout(upstreamRetry);
+    if (sseClients.size === 0) return;
+    upstreamRetry = setTimeout(connectUpstream, 200);
+  }
+  function teardownUpstream() {
+    if (upstreamRetry) {
+      clearTimeout(upstreamRetry);
+      upstreamRetry = null;
+    }
+    const req = upstreamReq;
+    upstreamReq = null;
+    req?.destroy();
+  }
+  function notifyComponentsChanged(components) {
+    if (sseClients.size === 0) return;
+    const updated = components.map((c) => `/${c.name}/index.js`);
+    const payload = JSON.stringify({ added: [], removed: [], updated });
+    broadcast(`event: change
+data: ${payload}
+
+`);
+  }
   const proxyServer = http.createServer(async (req, res) => {
     const url = new URL(req.url || "/", `http://${host}:${port}`);
+    if (url.pathname === "/esbuild" && req.method === "GET") {
+      res.writeHead(200, {
+        "Content-Type": "text/event-stream",
+        "Cache-Control": "no-cache",
+        Connection: "keep-alive",
+        "Access-Control-Allow-Origin": "*",
+        "Access-Control-Allow-Private-Network": "true"
+      });
+      res.write("retry: 500\n\n");
+      sseClients.add(res);
+      connectUpstream();
+      const dropClient = () => {
+        sseClients.delete(res);
+        if (sseClients.size === 0) teardownUpstream();
+      };
+      req.on("close", dropClient);
+      res.on("error", dropClient);
+      return;
+    }
     if (url.pathname === "/bundle" && req.method === "GET") {
       const componentPath = url.searchParams.get("path");
       if (!componentPath) {
@@ -891,6 +969,9 @@ async function startDevServer(options = {}) {
     stop: async () => {
       if (watchTimer) clearTimeout(watchTimer);
       componentsWatcher.close();
+      teardownUpstream();
+      for (const client of sseClients) client.end();
+      sseClients.clear();
       proxyServer.close();
       await ctx?.dispose();
     }
@@ -945,6 +1026,8 @@ function StartCommand({ args }) {
   const rebuildRef = useRef(null);
   const stopRef = useRef(null);
   const stage = resolveStage(parseArg(args, "--stage", "-s"));
+  const noOpen = args.includes("--no-open") || Boolean(process.env.CI);
+  const isInteractive = Boolean(process.stdin.isTTY);
   const addLog = useCallback((log) => {
     setLogs((prev) => {
       const newLog = {
@@ -1015,12 +1098,14 @@ function StartCommand({ args }) {
           storeId: config.storeId,
           versionId: config.versionId
         });
-        const studioUrl = new URL(STUDIO_BASE_URL);
-        studioUrl.searchParams.set("storeId", config.storeId);
-        if (config.versionId) {
-          studioUrl.searchParams.set("versionId", config.versionId);
+        if (!noOpen) {
+          const studioUrl = new URL(STUDIO_BASE_URL);
+          studioUrl.searchParams.set("storeId", config.storeId);
+          if (config.versionId) {
+            studioUrl.searchParams.set("versionId", config.versionId);
+          }
+          open(studioUrl.toString());
         }
-        open(studioUrl.toString());
       } catch (error) {
         if (!mounted) return;
         setState({
@@ -1034,23 +1119,26 @@ function StartCommand({ args }) {
       mounted = false;
       stopRef.current?.();
     };
-  }, [stage, handleRequest]);
-  useInput((input, key) => {
-    if (input === "q" || input === "c" && key.ctrl) {
-      stopRef.current?.().then(() => exit());
-    }
-    if (input === "r" && state.status === "running") {
-      rebuildRef.current?.();
-    }
-    if (input === "o" && state.status === "running") {
-      const studioUrl = new URL(STUDIO_BASE_URL);
-      studioUrl.searchParams.set("storeId", state.storeId);
-      if (state.versionId) {
-        studioUrl.searchParams.set("versionId", state.versionId);
+  }, [stage, handleRequest, noOpen]);
+  useInput(
+    (input, key) => {
+      if (input === "q" || input === "c" && key.ctrl) {
+        stopRef.current?.().then(() => exit());
       }
-      open(studioUrl.toString());
-    }
-  });
+      if (input === "r" && state.status === "running") {
+        rebuildRef.current?.();
+      }
+      if (input === "o" && state.status === "running") {
+        const studioUrl = new URL(STUDIO_BASE_URL);
+        studioUrl.searchParams.set("storeId", state.storeId);
+        if (state.versionId) {
+          studioUrl.searchParams.set("versionId", state.versionId);
+        }
+        open(studioUrl.toString());
+      }
+    },
+    { isActive: isInteractive }
+  );
   return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", gap: 1, children: [
     /* @__PURE__ */ jsx3(Header, {}),
     state.status === "initializing" && /* @__PURE__ */ jsxs3(Box3, { children: [
@@ -1081,13 +1169,14 @@ function StartCommand({ args }) {
           port: state.port,
           stage,
           storeId: state.storeId,
-          versionId: state.versionId
+          versionId: state.versionId,
+          noOpen
         }
       ),
       /* @__PURE__ */ jsx3(ComponentList, { components }),
       /* @__PURE__ */ jsx3(BuildInfo, { buildCount, lastBuildTime }),
       /* @__PURE__ */ jsx3(RequestLogs, { logs }),
-      /* @__PURE__ */ jsx3(Footer, {})
+      /* @__PURE__ */ jsx3(Footer, { interactive: isInteractive })
     ] })
   ] });
 }
@@ -1102,7 +1191,8 @@ function ServerInfo({
   port,
   stage,
   storeId,
-  versionId
+  versionId,
+  noOpen
 }) {
   const studioUrl = new URL(STUDIO_BASE_URL);
   studioUrl.searchParams.set("storeId", storeId);
@@ -1129,7 +1219,8 @@ function ServerInfo({
     /* @__PURE__ */ jsxs3(Box3, { marginTop: 1, children: [
       /* @__PURE__ */ jsx3(Text3, { color: "green", children: "\u2713 " }),
       /* @__PURE__ */ jsx3(Text3, { children: "Studio: " }),
-      /* @__PURE__ */ jsx3(Text3, { bold: true, color: "magenta", children: studioUrl.toString() })
+      /* @__PURE__ */ jsx3(Text3, { bold: true, color: "magenta", children: studioUrl.toString() }),
+      noOpen && /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: " (auto-open off \u2014 press o)" })
     ] }),
     /* @__PURE__ */ jsx3(Box3, { marginLeft: 2, marginTop: 1, children: /* @__PURE__ */ jsxs3(Text3, { dimColor: true, children: [
       "Components: http://",
@@ -1213,7 +1304,10 @@ function RequestLogs({ logs }) {
     ] }, log.id)) })
   ] });
 }
-function Footer() {
+function Footer({ interactive = true }) {
+  if (!interactive) {
+    return /* @__PURE__ */ jsx3(Box3, { marginTop: 1, borderStyle: "single", borderColor: "gray", paddingX: 1, children: /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "Headless (no TTY) \u2014 Ctrl+C to stop" }) });
+  }
   return /* @__PURE__ */ jsxs3(Box3, { marginTop: 1, borderStyle: "single", borderColor: "gray", paddingX: 1, children: [
     /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "Press " }),
     /* @__PURE__ */ jsx3(Text3, { bold: true, children: "q" }),
@@ -1246,7 +1340,7 @@ function App({ command, args }) {
   }
 }
 function VersionCommand() {
-  const version = "1.3.3" ? "1.3.3" : "unknown";
+  const version = "1.4.1" ? "1.4.1" : "unknown";
   return /* @__PURE__ */ jsx4(Box4, { children: /* @__PURE__ */ jsxs4(Text4, { children: [
     "ollieshop v",
     version

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ollie-shop/cli",
-  "version": "1.3.3",
+  "version": "1.4.1",
   "description": "Ollie Shop CLI - Development tools for custom checkouts",
   "type": "module",
   "main": "dist/index.js",
@@ -13,18 +13,17 @@
     "archiver": "^7.0.1",
     "esbuild": "^0.24.0",
     "glob": "^11.0.0",
-    "ink": "^5.0.1",
+    "ink": "^6.8.0",
     "jwt-decode": "^4.0.0",
     "open": "^10.1.0",
-    "react": "^18.3.1",
+    "react": "^19.2.0",
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.5"
   },
   "devDependencies": {
     "@types/archiver": "^6.0.3",
-    "@types/ink": "^2.0.3",
     "@types/node": "^22.15.23",
-    "@types/react": "^18.3.12",
+    "@types/react": "^19.2.0",
     "tsup": "^8.0.1",
     "typescript": "^5.7.3"
   },

package/src/commands/help.tsx

@@ -139,6 +139,12 @@ export function HelpCommand() {
           </Box>
           <Text>Config stage (loads ollie.{"{stage}"}.json)</Text>
         </Box>
+        <Box>
+          <Box width={24}>
+            <Text color="yellow">--no-open</Text>
+          </Box>
+          <Text>start: don't auto-open Studio (also honored via CI env)</Text>
+        </Box>
       </Box>
 
       <Box marginTop={1}>
@@ -147,6 +153,7 @@ export function HelpCommand() {
       <Box marginLeft={2} flexDirection="column">
         <Text dimColor>$ ollieshop login</Text>
         <Text dimColor>$ ollieshop start --stage dev</Text>
+        <Text dimColor>$ ollieshop start --no-open</Text>
         <Text dimColor>$ ollieshop whoami -o json</Text>
         <Text dimColor>$ ollieshop schema store.create</Text>
         <Text dimColor>

package/src/commands/start.tsx

@@ -59,6 +59,15 @@ export function StartCommand({ args }: StartCommandProps) {
 
   // Parse args
   const stage = resolveStage(parseArg(args, "--stage", "-s"));
+  // Suppress auto-opening Studio in the browser (Storybook-style). Useful when an
+  // agent spawns the dev server and drives its own harness instead. Also honored
+  // via the conventional CI env var.
+  const noOpen = args.includes("--no-open") || Boolean(process.env.CI);
+  // Keyboard shortcuts need raw mode, which Ink can only enable on a TTY stdin.
+  // When spawned headless (agent/CI/backgrounded), stdin isn't a TTY — guard the
+  // input handler so the server runs instead of crashing with "Raw mode is not
+  // supported on the current process.stdin".
+  const isInteractive = Boolean(process.stdin.isTTY);
 
   const addLog = useCallback((log: Omit<RequestLog, "id" | "timestamp">) => {
     setLogs((prev) => {
@@ -148,13 +157,15 @@ export function StartCommand({ args }: StartCommandProps) {
           versionId: config.versionId,
         });
 
-        // Open Studio in browser
-        const studioUrl = new URL(STUDIO_BASE_URL);
-        studioUrl.searchParams.set("storeId", config.storeId);
-        if (config.versionId) {
-          studioUrl.searchParams.set("versionId", config.versionId);
+        // Open Studio in browser (unless suppressed)
+        if (!noOpen) {
+          const studioUrl = new URL(STUDIO_BASE_URL);
+          studioUrl.searchParams.set("storeId", config.storeId);
+          if (config.versionId) {
+            studioUrl.searchParams.set("versionId", config.versionId);
+          }
+          open(studioUrl.toString());
         }
-        open(studioUrl.toString());
       } catch (error) {
         if (!mounted) return;
         setState({
@@ -170,29 +181,32 @@ export function StartCommand({ args }: StartCommandProps) {
       mounted = false;
       stopRef.current?.();
     };
-  }, [stage, handleRequest]);
+  }, [stage, handleRequest, noOpen]);
 
-  // Handle keyboard input
-  useInput((input, key) => {
-    if (input === "q" || (input === "c" && key.ctrl)) {
-      stopRef.current?.().then(() => exit());
-    }
+  // Handle keyboard input (only when attached to a TTY — see isInteractive above)
+  useInput(
+    (input, key) => {
+      if (input === "q" || (input === "c" && key.ctrl)) {
+        stopRef.current?.().then(() => exit());
+      }
 
-    // Manual rebuild with 'r' (manifest is updated by the plugin)
-    if (input === "r" && state.status === "running") {
-      rebuildRef.current?.();
-    }
+      // Manual rebuild with 'r' (manifest is updated by the plugin)
+      if (input === "r" && state.status === "running") {
+        rebuildRef.current?.();
+      }
 
-    // Open Studio in browser with 'o'
-    if (input === "o" && state.status === "running") {
-      const studioUrl = new URL(STUDIO_BASE_URL);
-      studioUrl.searchParams.set("storeId", state.storeId);
-      if (state.versionId) {
-        studioUrl.searchParams.set("versionId", state.versionId);
+      // Open Studio in browser with 'o'
+      if (input === "o" && state.status === "running") {
+        const studioUrl = new URL(STUDIO_BASE_URL);
+        studioUrl.searchParams.set("storeId", state.storeId);
+        if (state.versionId) {
+          studioUrl.searchParams.set("versionId", state.versionId);
+        }
+        open(studioUrl.toString());
       }
-      open(studioUrl.toString());
-    }
-  });
+    },
+    { isActive: isInteractive },
+  );
 
   return (
     <Box flexDirection="column" gap={1}>
@@ -236,11 +250,12 @@ export function StartCommand({ args }: StartCommandProps) {
             stage={stage}
             storeId={state.storeId}
             versionId={state.versionId}
+            noOpen={noOpen}
           />
           <ComponentList components={components} />
           <BuildInfo buildCount={buildCount} lastBuildTime={lastBuildTime} />
           <RequestLogs logs={logs} />
-          <Footer />
+          <Footer interactive={isInteractive} />
         </>
       )}
     </Box>
@@ -264,12 +279,14 @@ function ServerInfo({
   stage,
   storeId,
   versionId,
+  noOpen,
 }: {
   host: string;
   port: number;
   stage?: string;
   storeId: string;
   versionId?: string;
+  noOpen?: boolean;
 }) {
   const studioUrl = new URL(STUDIO_BASE_URL);
 
@@ -301,6 +318,7 @@ function ServerInfo({
         <Text bold color="magenta">
           {studioUrl.toString()}
         </Text>
+        {noOpen && <Text dimColor> (auto-open off — press o)</Text>}
       </Box>
       <Box marginLeft={2} marginTop={1}>
         <Text dimColor>
@@ -386,7 +404,15 @@ function RequestLogs({ logs }: { logs: RequestLog[] }) {
   );
 }
 
-function Footer() {
+function Footer({ interactive = true }: { interactive?: boolean }) {
+  if (!interactive) {
+    return (
+      <Box marginTop={1} borderStyle="single" borderColor="gray" paddingX={1}>
+        <Text dimColor>Headless (no TTY) — Ctrl+C to stop</Text>
+      </Box>
+    );
+  }
+
   return (
     <Box marginTop={1} borderStyle="single" borderColor="gray" paddingX={1}>
       <Text dimColor>Press </Text>

package/src/utils/esbuild.ts

@@ -267,6 +267,7 @@ export async function startDevServer(
     ctx = null;
     if (oldCtx) await oldCtx.dispose();
     await buildAndServe(components);
+    notifyComponentsChanged(components);
   }
 
   await buildAndServe(await discoverComponents({ cwd, stage }));
@@ -313,10 +314,92 @@ export async function startDevServer(
     watchTimer = setTimeout(maybeRecreate, 150);
   });
 
+  // esbuild's /esbuild live-reload stream lives on the context, so disposing it
+  // during a recreate drops the browser's EventSource — and Studio closes that
+  // connection for good on the first error. The proxy owns the downstream
+  // connection instead and re-subscribes to esbuild's stream across recreates,
+  // so live reload survives a component being added or removed.
+  const sseClients = new Set<http.ServerResponse>();
+  let upstreamReq: http.ClientRequest | null = null;
+  let upstreamRetry: ReturnType<typeof setTimeout> | null = null;
+
+  function broadcast(chunk: string | Buffer): void {
+    for (const client of sseClients) {
+      if (!client.writableEnded) client.write(chunk);
+    }
+  }
+
+  function connectUpstream(): void {
+    if (upstreamReq || sseClients.size === 0) return;
+    const req = http.request(
+      {
+        hostname: host,
+        port: internalPort,
+        path: "/esbuild",
+        method: "GET",
+        headers: { accept: "text/event-stream" },
+      },
+      (upstream) => {
+        upstream.on("data", broadcast);
+        upstream.on("close", onUpstreamLost);
+        upstream.on("error", onUpstreamLost);
+      },
+    );
+    req.on("error", onUpstreamLost);
+    req.end();
+    upstreamReq = req;
+  }
+
+  function onUpstreamLost(): void {
+    if (!upstreamReq) return;
+    upstreamReq = null;
+    if (upstreamRetry) clearTimeout(upstreamRetry);
+    if (sseClients.size === 0) return;
+    upstreamRetry = setTimeout(connectUpstream, 200);
+  }
+
+  function teardownUpstream(): void {
+    if (upstreamRetry) {
+      clearTimeout(upstreamRetry);
+      upstreamRetry = null;
+    }
+    const req = upstreamReq;
+    upstreamReq = null;
+    req?.destroy();
+  }
+
+  function notifyComponentsChanged(components: ComponentInfo[]): void {
+    if (sseClients.size === 0) return;
+    const updated = components.map((c) => `/${c.name}/index.js`);
+    const payload = JSON.stringify({ added: [], removed: [], updated });
+    broadcast(`event: change\ndata: ${payload}\n\n`);
+  }
+
   // Create proxy server that handles /bundle/* and forwards to esbuild
   const proxyServer = http.createServer(async (req, res) => {
     const url = new URL(req.url || "/", `http://${host}:${port}`);
 
+    // Hold the Studio live-reload stream open across esbuild recreates
+    if (url.pathname === "/esbuild" && req.method === "GET") {
+      res.writeHead(200, {
+        "Content-Type": "text/event-stream",
+        "Cache-Control": "no-cache",
+        Connection: "keep-alive",
+        "Access-Control-Allow-Origin": "*",
+        "Access-Control-Allow-Private-Network": "true",
+      });
+      res.write("retry: 500\n\n");
+      sseClients.add(res);
+      connectUpstream();
+      const dropClient = () => {
+        sseClients.delete(res);
+        if (sseClients.size === 0) teardownUpstream();
+      };
+      req.on("close", dropClient);
+      res.on("error", dropClient);
+      return;
+    }
+
     // Handle /bundle?path=/ComponentName/index.js
     if (url.pathname === "/bundle" && req.method === "GET") {
       const componentPath = url.searchParams.get("path");
@@ -520,6 +603,9 @@ export async function startDevServer(
     stop: async () => {
       if (watchTimer) clearTimeout(watchTimer);
       componentsWatcher.close();
+      teardownUpstream();
+      for (const client of sseClients) client.end();
+      sseClients.clear();
       proxyServer.close();
       await ctx?.dispose();
     },