@foldkit/vite-plugin 0.11.1 → 0.11.2

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAE,MAAM,EAAkC,MAAM,MAAM,CAAA;AAKlE,OAAO,EAAE,KAAK,eAAe,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AACzE,OAAO,EACL,KAAK,2BAA2B,EAChC,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,mBAAmB,CAAA;AAE1B,6CAA6C;AAC7C,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC;IAC1C;;;;;OAKG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAC,CAAA;AAgiBF;;;;;GAKG;AACH,eAAO,MAAM,OAAO,GAAI,UAAS,oBAAyB,KAAG,KAAK,CAAC,MAAM,CAuCxE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAoCA,OAAO,KAAK,EACV,MAAM,EAIP,MAAM,MAAM,CAAA;AAKb,OAAO,EAAE,KAAK,eAAe,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AACzE,OAAO,EACL,KAAK,2BAA2B,EAChC,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,mBAAmB,CAAA;AAE1B,6CAA6C;AAC7C,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC;IAC1C;;;;;OAKG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAC,CAAA;AA+kBF;;;;;GAKG;AACH,eAAO,MAAM,OAAO,GAAI,UAAS,oBAAyB,KAAG,KAAK,CAAC,MAAM,CA6DxE,CAAA"}

package/dist/index.js

@@ -1,4 +1,4 @@
-import { Array, Console, Data, Effect, Exit, Fiber, HashMap, HashSet, Match as M, Option, Queue, Ref, Schema as S, Stream, pipe, } from 'effect';
+import { Array, Console, Data, Duration, Effect, Exit, Fiber, HashMap, HashSet, Match as M, Option, Predicate, Queue, Ref, Schema as S, Schedule, Stream, pipe, } from 'effect';
 import { EventFrame, RequestFrame, ResponseFrame, ResponseRuntimes, } from 'foldkit/devtools-protocol';
 import { PreserveModelMessage, RequestModelMessage, RestoreModelMessage, } from 'foldkit/hmr-protocol';
 import { createRequire } from 'node:module';
@@ -81,7 +81,7 @@ const resolveInstalledFoldkitPackages = (root) => {
         }
         catch (error) {
             return !(error instanceof Error &&
-                'code' in error &&
+                Predicate.hasProperty(error, 'code') &&
                 error.code === 'MODULE_NOT_FOUND');
         }
     });
@@ -239,20 +239,18 @@ const registerViteWsHandlers = (server, state, enqueue) => Effect.sync(() => {
     server.ws.on('foldkit:devTools:response', (data) => enqueue(Event.BrowserResponseFrameReceived({ data })));
 });
 // MCP RELAY
-const startMcpRelay = (port, enqueue) => Effect.acquireRelease(Effect.sync(() => {
+// NOTE: Restarting a dev server briefly leaves two of them alive. Vite builds
+// the replacement, which binds its relay, before closing the server it
+// replaces, which still owns the port. The bind loses that race and has to
+// wait for the outgoing server to release the port, so it retries for four
+// seconds before reporting the port as taken.
+const RELAY_BIND_RETRY_DELAY = Duration.millis(100);
+const RELAY_BIND_RETRY_COUNT = 40;
+class RelayBindFailed extends Data.TaggedError('RelayBindFailed') {
+}
+const isPortInUse = (error) => Predicate.hasProperty(error, 'code') && error.code === 'EADDRINUSE';
+const bindMcpRelay = (port, enqueue) => Effect.callback(resume => {
     const wss = new WebSocketServer({ port });
-    wss.on('error', error => {
-        if ('code' in error && error.code === 'EADDRINUSE') {
-            console.error(`\n[foldkit:devTools] Port ${port} is already in use, so the DevTools MCP relay could not start.\n` +
-                `[foldkit:devTools] This usually means another Foldkit project is already running and bound to this port.\n` +
-                `[foldkit:devTools] Until the port is freed, agents will not be able to connect to this app via the Foldkit DevTools MCP server.\n` +
-                `[foldkit:devTools] Stop the other project, or set a different \`devToolsMcpPort\` in this project's vite config.\n` +
-                `[foldkit:devTools] If you change \`devToolsMcpPort\`, also set \`FOLDKIT_DEVTOOLS_MCP_PORT\` to the same value for your MCP server.\n`);
-        }
-        else {
-            console.error(`[foldkit:devTools] MCP relay failed to start on port ${port}; continuing without the relay`, error);
-        }
-    });
     wss.on('connection', client => {
         enqueue(Event.McpClientConnected({ client }));
         client.on('message', raw => enqueue(Event.McpRequestReceived({ client, raw: raw.toString() })));
@@ -261,14 +259,45 @@ const startMcpRelay = (port, enqueue) => Effect.acquireRelease(Effect.sync(() =>
             console.error('[foldkit:devTools] MCP client error', error);
         });
     });
-    wss.on('listening', () => {
+    const onListening = () => {
+        wss.off('error', onBindFailed);
+        wss.on('error', error => {
+            console.error('[foldkit:devTools] MCP relay error', error);
+        });
         console.log(`[foldkit:devTools] MCP relay listening on ws://localhost:${port}`);
-    });
-    return wss;
-}), wss => Effect.sync(() => {
+        resume(Effect.succeed(wss));
+    };
+    const onBindFailed = (cause) => {
+        wss.off('listening', onListening);
+        wss.close();
+        resume(Effect.fail(new RelayBindFailed({ cause })));
+    };
+    wss.once('listening', onListening);
+    wss.once('error', onBindFailed);
+});
+const reportRelayBindFailed = (port, cause) => {
+    if (isPortInUse(cause)) {
+        return Console.error(`\n[foldkit:devTools] Port ${port} is already in use, so the DevTools MCP relay could not start.\n` +
+            `[foldkit:devTools] This usually means another Foldkit project is already running and bound to this port.\n` +
+            `[foldkit:devTools] Until the port is freed, agents will not be able to connect to this app via the Foldkit DevTools MCP server.\n` +
+            `[foldkit:devTools] Stop the other project, or set a different \`devToolsMcpPort\` in this project's vite config.\n` +
+            `[foldkit:devTools] If you change \`devToolsMcpPort\`, also set \`FOLDKIT_DEVTOOLS_MCP_PORT\` to the same value for your MCP server.\n`);
+    }
+    else {
+        return Console.error(`[foldkit:devTools] MCP relay failed to start on port ${port}; continuing without the relay`, cause);
+    }
+};
+const startMcpRelay = (port, enqueue) => Effect.acquireRelease(bindMcpRelay(port, enqueue), wss => Effect.gen(function* () {
+    for (const client of wss.clients) {
+        client.terminate();
+    }
     wss.close();
-    console.log('[foldkit:devTools] MCP relay stopped');
-}));
+    yield* Console.log('[foldkit:devTools] MCP relay stopped');
+})).pipe(Effect.retry({
+    while: ({ cause }) => isPortInUse(cause),
+    times: RELAY_BIND_RETRY_COUNT,
+    schedule: Schedule.spaced(RELAY_BIND_RETRY_DELAY),
+}), Effect.catchTag('RelayBindFailed', ({ cause }) => reportRelayBindFailed(port, cause)));
 // PROGRAM
 const main = (server, events, options) => Effect.gen(function* () {
     const state = yield* makeState;
@@ -276,8 +305,13 @@ const main = (server, events, options) => Effect.gen(function* () {
         Queue.offerUnsafe(events, event);
     };
     yield* registerViteWsHandlers(server, state, enqueue);
+    // NOTE: Forked rather than awaited because binding the relay can retry for
+    // seconds. The HMR bridge is independent of the relay, and the runtime
+    // gives up on its boot-time model request in well under a second, so
+    // sequencing the dispatch loop behind the bind would cost model
+    // preservation whenever the port is contended.
     if (options.devToolsMcpPort !== undefined) {
-        yield* startMcpRelay(options.devToolsMcpPort, enqueue);
+        yield* Effect.forkScoped(startMcpRelay(options.devToolsMcpPort, enqueue));
     }
     yield* Stream.fromQueue(events).pipe(Stream.runForEach(event => dispatchEvent(server, state, event)));
 });
@@ -290,6 +324,21 @@ const main = (server, events, options) => Effect.gen(function* () {
  */
 export const foldkit = (options = {}) => {
     const events = Effect.runSync(Queue.unbounded());
+    // NOTE: One plugin instance can serve more than one dev server, and on
+    // restart Vite builds the replacement, running `configureServer` again,
+    // before closing the server being replaced. Keying by resolved config keeps
+    // each server's shutdown pointed at its own fiber.
+    const mainFibers = new WeakMap();
+    const stopMain = (config) => Effect.suspend(() => {
+        const fiber = mainFibers.get(config);
+        mainFibers.delete(config);
+        if (fiber === undefined) {
+            return Effect.void;
+        }
+        else {
+            return Fiber.interrupt(fiber);
+        }
+    });
     const hmrPlugin = {
         name: 'foldkit-hmr',
         apply: 'serve',
@@ -303,9 +352,14 @@ export const foldkit = (options = {}) => {
         }),
         configureServer: server => {
             const fiber = Effect.runFork(Effect.scoped(main(server, events, options)));
-            server.httpServer?.on('close', () => {
-                Effect.runFork(Fiber.interrupt(fiber));
-            });
+            mainFibers.set(server.config, fiber);
+        },
+        // NOTE: Vite awaits `closeBundle` when the dev server closes, once per
+        // environment plugin container. Hanging shutdown off `server.httpServer`
+        // instead would never run in middleware mode, which is how Vitest and
+        // other embedders run Vite, and the relay would outlive the server.
+        closeBundle() {
+            return Effect.runPromise(stopMain(this.environment.getTopLevelConfig()));
         },
         handleHotUpdate: ({ server, modules, }) => {
             if (modules.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foldkit/vite-plugin",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Vite plugin for Foldkit hot module reloading with state preservation",
   "type": "module",
   "main": "./dist/index.js",
@@ -16,7 +16,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "effect": "4.0.0-beta.101",
+    "effect": "4.0.0-beta.102",
     "foldkit": "^0",
     "vite": "^7.0.0 || ^8.0.0"
   },
@@ -27,13 +27,13 @@
   "devDependencies": {
     "@types/node": "^25.9.3",
     "@types/ws": "^8.18.1",
-    "effect": "4.0.0-beta.101",
+    "effect": "4.0.0-beta.102",
     "happy-dom": "^20.10.4",
     "rimraf": "^6.1.3",
     "typescript": "^6.0.3",
     "vite": "^8.0.16",
     "vitest": "^4.1.9",
-    "foldkit": "0.132.0"
+    "foldkit": "0.133.0"
   },
   "keywords": [
     "vite",