@ethlete/cli 3.0.0-next.26 → 3.0.0-next.27

package/src/lib/design/render.js

@@ -20,12 +20,13 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.forceMiddleware = exports.renderMiddleware = exports.createRenderer = exports.isStale = exports.FORCE_PATH = exports.RENDER_PATH = void 0;
+exports.forceMiddleware = exports.renderMiddleware = exports.createRenderer = exports.RENDER_TIMEOUT_MS = exports.isStale = exports.FORCE_PATH = exports.RENDER_PATH = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const worker_threads_1 = require("worker_threads");
 const force_interactions_1 = require("./force-interactions");
 const paths_1 = require("./paths");
+const wait_1 = require("./wait");
 const render_packages_1 = require("./render-packages");
 exports.RENDER_PATH = '/__design/render';
 exports.FORCE_PATH = '/__design/force';
@@ -44,8 +45,9 @@ exports.isStale = isStale;
  * Renders Angular templates in a worker that loads the target checkout's own packages. The worker
  * is replaced on the first request after a package it loaded was rebuilt.
  */
+exports.RENDER_TIMEOUT_MS = 120000;
 const createRenderer = (options) => {
-    const { target, config } = options;
+    const { target, config, timeout = exports.RENDER_TIMEOUT_MS } = options;
     const workerDataOf = () => {
         var _a, _b;
         return ({
@@ -56,6 +58,7 @@ const createRenderer = (options) => {
     };
     let startedWith = '';
     const pending = new Map();
+    const sentTo = new Map();
     let worker = null;
     let watched = {};
     let nextId = 0;
@@ -63,23 +66,31 @@ const createRenderer = (options) => {
         for (const settle of pending.values())
             settle({ error });
         pending.clear();
+        sentTo.clear();
+    };
+    const answer = (id, result) => {
+        var _a;
+        (_a = pending.get(id)) === null || _a === void 0 ? void 0 : _a(result);
+        pending.delete(id);
+        sentTo.delete(id);
     };
     const start = () => {
         const workerData = workerDataOf();
         startedWith = JSON.stringify(workerData);
         const started = new worker_threads_1.Worker((0, paths_1.packageFileOf)((0, path_1.resolve)(__dirname, 'render-worker.js')), { workerData });
         started.on('message', (response) => {
-            var _a;
             const { id, watched: loaded } = response, result = __rest(response, ["id", "watched"]);
             if (started === worker)
                 watched = Object.assign({}, loaded);
-            (_a = pending.get(id)) === null || _a === void 0 ? void 0 : _a(result);
-            pending.delete(id);
+            answer(id, result);
         });
         started.on('error', (error) => settleAll(`design-explore: the render worker failed: ${error instanceof Error ? error.message : String(error)}`));
         started.on('exit', () => {
             if (started === worker)
                 worker = null;
+            for (const [id, to] of sentTo)
+                if (to === started)
+                    answer(id, { error: 'design-explore: the render worker exited before it answered' });
         });
         watched = {};
         return started;
@@ -102,8 +113,22 @@ const createRenderer = (options) => {
             providers: providers ? (0, path_1.resolve)(target, providers) : null,
         };
         const result = new Promise((settle) => pending.set(request.id, settle));
-        worker.postMessage(request);
-        return result;
+        const sent = worker;
+        sentTo.set(request.id, sent);
+        sent.postMessage(request);
+        return (0, wait_1.withinLimit)(result, {
+            ms: timeout,
+            what: `the render worker to draw ${ask.call}`,
+            announceAfterMs: 10000,
+        }).catch((error) => {
+            const message = error instanceof Error ? error.message : String(error);
+            answer(request.id, { error: message });
+            if (sent === worker) {
+                worker = null;
+                void sent.terminate();
+            }
+            return { error: message };
+        });
     };
     const close = () => __awaiter(void 0, void 0, void 0, function* () {
         const stopped = worker;

package/src/lib/design/render.js.map

@@ -1 +1 @@
-{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/render.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/render.ts"],"names":[],"mappings":"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"}

package/src/lib/design/serve.d.ts

@@ -1,4 +1,19 @@
+import { ServerResponse } from 'http';
+import { CheckSketches } from './system/sketch/sketch-checker';
 import { DesignConfig } from './paths';
+export declare const KEEP_ALIVE_MS = 15000;
+/**
+ * Sends `answered` as JSON, and a space every `KEEP_ALIVE_MS` while it is pending: WebKit fails a fetch with "Load
+ * failed" when no byte arrives for 60 s. Once a space went out the status is 200, so a later failure arrives as its
+ * body alone.
+ */
+export declare const sendHeldJson: (response: ServerResponse, answered: Promise<{
+    status: number;
+    body: unknown;
+}>) => Promise<void>;
+export declare const DESIGN_EVENTS_HEARTBEAT_MS = 20000;
+/** The real directories a checkout's `node_modules` points into, which Vite refuses to serve unless allowed. */
+export declare const installedRootsOf: (target: string) => string[];
 /**
  * The Vite server that draws a checkout: listening on the configured port to serve the frames, or in
  * middleware mode only to load design modules for a command. With `port`, it listens there instead
@@ -13,12 +28,17 @@ export declare const createDesignServer: (options: {
     listenOn?: number;
     host?: string;
     sketchesRoot?: string;
+    checkSketches?: CheckSketches;
 }) => Promise<import("vite", { with: { "resolution-mode": "import" } }).ViteDevServer>;
 /**
  * Starts the design server for a checkout and keeps it running. The returned exit code is the
- * command's, not the server's: a listening server holds the process open on its own.
+ * command's, not the server's: a listening server holds the process open on its own. With
+ * `reloadOnRebuild`, a rebuild or reinstall of the cli restarts the server on the same port from
+ * the new build, inside the process that was started.
  */
 export declare const serveDesign: (options: {
     target: string;
     host?: string;
+    reloadOnRebuild?: boolean;
+    checkSketches?: CheckSketches;
 }) => Promise<number>;

package/src/lib/design/serve.js

@@ -9,12 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serveDesign = exports.createDesignServer = void 0;
+exports.serveDesign = exports.createDesignServer = exports.installedRootsOf = exports.DESIGN_EVENTS_HEARTBEAT_MS = exports.sendHeldJson = exports.KEEP_ALIVE_MS = void 0;
 const crypto_1 = require("crypto");
 const fs_1 = require("fs");
 const net_1 = require("net");
 const promises_1 = require("timers/promises");
 const path_1 = require("path");
+const rxjs_1 = require("rxjs");
 const calls_1 = require("./calls");
 const calls_tsconfig_1 = require("./calls-tsconfig");
 const legacy_1 = require("./legacy");
@@ -32,6 +33,7 @@ const shot_1 = require("./shot");
 const shot_store_1 = require("./shot-store");
 const imports_1 = require("./system/imports");
 const changed_parts_1 = require("./changed-parts");
+const server_identity_1 = require("./server-identity");
 const stamp_1 = require("./stamp");
 const list_system_1 = require("./system/list-system");
 const resolve_product_1 = require("./system/resolve-product");
@@ -39,11 +41,14 @@ const system_modules_1 = require("./system/system-modules");
 const kit_1 = require("./system/kit");
 const system_tsconfig_1 = require("./system/system-tsconfig");
 const sketch_1 = require("./system/sketch/sketch");
+const sketch_checker_1 = require("./system/sketch/sketch-checker");
 const unchanged_states_1 = require("./system/sketch/unchanged-states");
 const inventory_1 = require("./system/inventory");
 const thumb_1 = require("./thumb");
 const motion_endpoint_1 = require("./motion-endpoint");
 const paths_1 = require("./paths");
+const slow_run_1 = require("./system/slow-run");
+const build_watch_1 = require("./build-watch");
 const VIRTUAL = 'virtual:design-explore';
 const REBUILD_SETTLE_MS = 300;
 /** What a slug says about which project drew it: its first segment. */
@@ -188,6 +193,33 @@ const sendJson = (response, answer) => {
     response.setHeader('access-control-allow-origin', '*');
     (0, thumb_1.send)(response, { status: answer.status, type: 'application/json', body: JSON.stringify(answer.body) });
 };
+exports.KEEP_ALIVE_MS = 15000;
+/**
+ * Sends `answered` as JSON, and a space every `KEEP_ALIVE_MS` while it is pending: WebKit fails a fetch with "Load
+ * failed" when no byte arrives for 60 s. Once a space went out the status is 200, so a later failure arrives as its
+ * body alone.
+ */
+const sendHeldJson = (response, answered) => {
+    let started = false;
+    const tick = (0, rxjs_1.interval)(exports.KEEP_ALIVE_MS)
+        .pipe((0, rxjs_1.tap)(() => {
+        if (!started) {
+            started = true;
+            response.writeHead(200, { 'access-control-allow-origin': '*', 'content-type': 'application/json' });
+        }
+        response.write(' ');
+    }))
+        .subscribe();
+    response.once('close', () => tick.unsubscribe());
+    return answered.then((answer) => {
+        tick.unsubscribe();
+        if (started)
+            response.end(JSON.stringify(answer.body));
+        else
+            sendJson(response, answer);
+    });
+};
+exports.sendHeldJson = sendHeldJson;
 const isCommentFile = (file) => file.endsWith('.json') && (0, path_1.basename)((0, path_1.dirname)(file)) === 'comments';
 const isNoteFile = (file) => file.endsWith('.json') && (0, path_1.basename)((0, path_1.dirname)(file)) === 'notes';
 const isFlowFile = (file) => file.endsWith('.json') && (0, path_1.basename)((0, path_1.dirname)(file)) === 'flows';
@@ -196,6 +228,8 @@ const isSketchFile = (designRoot, file) => {
     const [product, folder, ...inside] = (0, path_1.relative)(designRoot, (0, path_1.resolve)(file)).split(path_1.sep);
     return !!product && product !== '..' && folder === 'sketches' && inside.length > 0;
 };
+// Workaround: WebKit drops an event stream that sends nothing for 60 seconds.
+exports.DESIGN_EVENTS_HEARTBEAT_MS = 20000;
 /**
  * A server-sent event stream for Studio: `comments`, `notes`, `flows`, `calls` and `sketches` when a file of that
  * kind changed, and `parts` with the parts a design system change redraws and the revision it gave them. A `parts`
@@ -203,6 +237,11 @@ const isSketchFile = (designRoot, file) => {
  */
 const createDesignEvents = () => {
     const listeners = new Set();
+    let heartbeat;
+    const beat = () => {
+        for (const response of listeners)
+            response.write(': heartbeat\n\n');
+    };
     return {
         middleware: (request, response) => {
             response.writeHead(200, {
@@ -213,13 +252,22 @@ const createDesignEvents = () => {
             });
             response.write(': open\n\n');
             listeners.add(response);
-            request.on('close', () => listeners.delete(response));
+            heartbeat !== null && heartbeat !== void 0 ? heartbeat : (heartbeat = (0, rxjs_1.interval)(exports.DESIGN_EVENTS_HEARTBEAT_MS).subscribe(beat));
+            request.on('close', () => {
+                listeners.delete(response);
+                if (listeners.size === 0) {
+                    heartbeat === null || heartbeat === void 0 ? void 0 : heartbeat.unsubscribe();
+                    heartbeat = undefined;
+                }
+            });
         },
         signal: (event, data = {}) => {
             for (const response of listeners)
                 response.write(`event: ${event}\ndata: ${JSON.stringify(data)}\n\n`);
         },
         close: () => {
+            heartbeat === null || heartbeat === void 0 ? void 0 : heartbeat.unsubscribe();
+            heartbeat = undefined;
             for (const response of listeners)
                 response.end();
             listeners.clear();
@@ -291,7 +339,7 @@ const shotStoreOf = (options) => {
         })),
     });
 };
-const designExplore = ({ target, config, system, stylesheetImports, shotCacheDir, }) => {
+const designExplore = ({ target, config, system, stylesheetImports, shotCacheDir, checkSketches, }) => {
     const renderer = (0, render_1.createRenderer)({ target, config });
     const transform = withAssetUrls(system);
     const packageDirs = () => (0, render_packages_1.renderPackageDirsOf)({ target, packages: (0, render_packages_1.renderPackagesOf)({ target, config }) });
@@ -352,14 +400,19 @@ const designExplore = ({ target, config, system, stylesheetImports, shotCacheDir
             const callsRoot = (0, paths_1.callsRootOf)(target);
             const designRoot = (0, path_1.resolve)(target, paths_1.DESIGN_DIR);
             const stamp = (0, stamp_1.buildStampOf)();
+            const identityOf = (0, server_identity_1.serverIdentityOf)(target);
             const base = () => {
                 var _a;
                 const address = (_a = vite.httpServer) === null || _a === void 0 ? void 0 : _a.address();
                 return `http://localhost:${address && typeof address === 'object' ? address.port : (0, paths_1.portOf)(config)}`;
             };
-            const ledger = (0, draw_ledger_1.createDrawLedger)(Date.now, ({ sketch }) => !sketch || system.drawnOf(sketch.product, sketch) !== null);
+            const ledger = (0, draw_ledger_1.createDrawLedger)(Date.now, ({ sketch }) => {
+                const drawn = sketch && system.drawnOf(sketch.product, sketch);
+                return !sketch || (!!drawn && !('sketchGone' in drawn));
+            });
             const thumbs = (0, thumb_1.createThumbnailer)({ target, base, ledger });
             const inventoryDraws = (0, thumb_1.createDrawQueue)({ target, ledger });
+            const sketchChecker = checkSketches ? undefined : (0, sketch_checker_1.createSketchChecker)();
             const shots = (0, shot_1.createPartShooter)(Object.assign(Object.assign({ target,
                 base,
                 ledger,
@@ -531,16 +584,25 @@ const designExplore = ({ target, config, system, stylesheetImports, shotCacheDir
                 const dependents = (0, shot_1.dependentIdsOf)((_a = vite.moduleGraph.getModulesByFile(file)) !== null && _a !== void 0 ? _a : [], stylesheetImports);
                 redraw((0, changed_parts_1.changedPartsOf)({ target, config, system, file, dependents }), isSystemFile(file));
             };
-            const answer = (handle) => (request, response) => {
+            const answer = (handle, held = false) => (request, response) => {
                 var _a;
-                return void handle(new URL((_a = request.url) !== null && _a !== void 0 ? _a : '', 'http://localhost'), request).then((answered) => sendJson(response, answered), (error) => sendJson(response, {
+                const closed = new AbortController();
+                response.once('close', () => {
+                    if (!response.writableFinished)
+                        closed.abort();
+                });
+                const answered = handle(new URL((_a = request.url) !== null && _a !== void 0 ? _a : '', 'http://localhost'), {
+                    request,
+                    signal: closed.signal,
+                }).catch((error) => ({
                     status: 500,
                     body: { error: error instanceof Error ? error.message : String(error) },
                 }));
+                void (held ? (0, exports.sendHeldJson)(response, answered) : answered.then((answer) => sendJson(response, answer)));
             };
             vite.middlewares.use(stamp_1.STAMP_PATH, (_request, response) => {
                 response.setHeader('content-type', 'application/json');
-                response.end(JSON.stringify(stamp));
+                response.end(JSON.stringify(Object.assign(Object.assign({}, stamp), identityOf())));
             });
             vite.middlewares.use(draw_ledger_1.QUEUE_PATH, (_request, response) => sendJson(response, { status: 200, body: ledger.report() }));
             vite.middlewares.use(render_1.RENDER_PATH, (0, render_1.renderMiddleware)(renderer));
@@ -576,7 +638,7 @@ const designExplore = ({ target, config, system, stylesheetImports, shotCacheDir
                 });
                 return { status: 200, body: products };
             })));
-            vite.middlewares.use(product_command_1.PRODUCT_PATH, answer((_url, request) => __awaiter(void 0, void 0, void 0, function* () {
+            vite.middlewares.use(product_command_1.PRODUCT_PATH, answer((_url_1, _a) => __awaiter(void 0, [_url_1, _a], void 0, function* (_url, { request }) {
                 const created = yield (0, product_command_1.newProductAnswer)({ target, request });
                 if (created.status === 201)
                     reloadConfig();
@@ -588,22 +650,24 @@ const designExplore = ({ target, config, system, stylesheetImports, shotCacheDir
                     body: yield (0, calls_1.listCalls)({ target, load: (file) => vite.ssrLoadModule(file) }),
                 });
             })));
-            vite.middlewares.use(legacy_1.TRANSFER_PATH, answer((url, request) => __awaiter(void 0, void 0, void 0, function* () {
-                var _a;
+            vite.middlewares.use(legacy_1.TRANSFER_PATH, answer((url_1, _a) => __awaiter(void 0, [url_1, _a], void 0, function* (url, { request }) {
+                var _b;
                 if (request.method !== 'POST')
                     return { status: 405, body: { error: 'POST only' } };
-                const result = (0, legacy_1.markTransferred)({ target, slug: (_a = url.searchParams.get('call')) !== null && _a !== void 0 ? _a : '' });
+                const result = (0, legacy_1.markTransferred)({ target, slug: (_b = url.searchParams.get('call')) !== null && _b !== void 0 ? _b : '' });
                 const status = result === 'missing' ? 404 : result === 'unreadable' ? 422 : 200;
                 return { status, body: { result } };
             })));
-            const studio = (path, handle) => vite.middlewares.use(path, answer((url, request) => __awaiter(void 0, void 0, void 0, function* () {
+            const studio = (path, handle) => vite.middlewares.use(path, answer((url_1, _a) => __awaiter(void 0, [url_1, _a], void 0, function* (url, { request, signal }) {
                 return handle({
                     target,
                     url,
                     request,
+                    signal,
                     load: ({ file, product, sketch }) => vite.ssrLoadModule((0, system_modules_1.productModuleIdOf)({ file, product, sketch })),
                     pictureOf: shots.pictureOf,
                     boxOf: shots.changedBoxesOf,
+                    checkSketches: checkSketches !== null && checkSketches !== void 0 ? checkSketches : sketchChecker,
                     inventoryOf: ({ product, part }) => (0, inventory_1.inventoryOf)({
                         product,
                         part,
@@ -613,7 +677,7 @@ const designExplore = ({ target, config, system, stylesheetImports, shotCacheDir
                         draw: (job) => inventoryDraws.run(job),
                     }),
                 });
-            })));
+            }), path === studio_api_1.SKETCHES_PATH));
             studio(studio_api_1.SKETCHES_PATH, studio_api_1.sketchesAnswer);
             studio(studio_api_1.SKETCH_PREVIEW_PATH, studio_api_1.sketchPreviewAnswer);
             studio(studio_api_1.SKETCH_COMPARE_PATH, studio_api_1.sketchCompareAnswer);
@@ -638,14 +702,15 @@ const designExplore = ({ target, config, system, stylesheetImports, shotCacheDir
             studio(studio_api_1.INVENTORY_PATH, studio_api_1.inventoryAnswer);
             studio(studio_api_1.INVENTORY_APPROVE_PATH, studio_api_1.inventoryApproveAnswer);
             studio(studio_api_1.OPEN_POINTS_PATH, studio_api_1.openPointsAnswer);
-            studio(studio_api_1.PART_READY_PATH, studio_api_1.partReadyAnswer);
+            studio(studio_api_1.PART_GO_PATH, studio_api_1.partGoAnswer);
+            studio(studio_api_1.PART_ACCEPT_PATH, studio_api_1.partAcceptAnswer);
             studio(studio_api_1.EXCEPTIONS_PATH, studio_api_1.exceptionsAnswer);
             studio(studio_api_1.EXCEPTION_APPROVE_PATH, studio_api_1.exceptionApproveAnswer);
             vite.middlewares.use(studio_api_1.COMMENT_EVENTS_PATH, events.middleware);
             (_c = vite.httpServer) === null || _c === void 0 ? void 0 : _c.on('close', () => {
                 events.close();
                 settling === null || settling === void 0 ? void 0 : settling.abort();
-                void Promise.all([thumbs.close(), shots.close(), inventoryDraws.close()]);
+                void Promise.all([thumbs.close(), shots.close(), inventoryDraws.close(), sketchChecker === null || sketchChecker === void 0 ? void 0 : sketchChecker.close()]);
             });
             vite.watcher.add([designRoot, ...baseDirs, ...packageDirs()]);
             vite.watcher.on('add', (file) => (isPackageFile(file) ? packageChanged(file) : refresh(file)));
@@ -663,6 +728,24 @@ const freePortOf = () => new Promise((resolvePort, reject) => {
         probe.close(() => resolvePort(port));
     });
 });
+/** The real directories a checkout's `node_modules` points into, which Vite refuses to serve unless allowed. */
+const installedRootsOf = (target) => {
+    const modules = (0, path_1.join)(target, 'node_modules');
+    const roots = new Set();
+    try {
+        roots.add((0, fs_1.realpathSync)(modules));
+        for (const entry of (0, fs_1.readdirSync)(modules, { withFileTypes: true })) {
+            if (entry.isSymbolicLink() && !entry.name.startsWith('.')) {
+                roots.add((0, path_1.dirname)((0, fs_1.realpathSync)((0, path_1.join)(modules, entry.name))));
+            }
+        }
+    }
+    catch (_a) {
+        return [...roots];
+    }
+    return [...roots];
+};
+exports.installedRootsOf = installedRootsOf;
 /**
  * The Vite server that draws a checkout: listening on the configured port to serve the frames, or in
  * middleware mode only to load design modules for a command. With `port`, it listens there instead
@@ -671,7 +754,7 @@ const freePortOf = () => new Promise((resolvePort, reject) => {
  */
 const createDesignServer = (options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const { target, config, listen, sketchesRoot } = options;
+    const { target, config, listen, sketchesRoot, checkSketches } = options;
     const host = options.host || process.env['DE_HOST'] || undefined;
     const own = listen && options.port !== undefined;
     const port = own ? yield freePortOf() : options.listenOn;
@@ -730,6 +813,7 @@ const createDesignServer = (options) => __awaiter(void 0, void 0, void 0, functi
                 system,
                 stylesheetImports,
                 shotCacheDir: listen && !own ? (0, paths_1.viteCacheOf)(target, 'shots') : null,
+                checkSketches,
             }),
         ] }, (listen ? {} : { appType: 'custom' })), (listen && !own ? {} : { logLevel: 'error' })), { server: Object.assign(Object.assign({ 
             // Studio swaps a frame for a fresh one once it has painted; a Vite reload would blank every frame at once.
@@ -737,7 +821,7 @@ const createDesignServer = (options) => __awaiter(void 0, void 0, void 0, functi
             ? Object.assign(Object.assign(Object.assign({ port: port !== null && port !== void 0 ? port : (0, paths_1.portOf)(config) }, (host ? { host } : {})), { strictPort: true }), (own ? { watch: null } : {})) : { middlewareMode: true, ws: false, watch: null })), { 
             // The frame page lives inside this package, which is outside the checkout it draws. Vite
             // serves neither root unless both are allowed.
-            fs: { allow: [target, here, ...baseDirs] } }) }));
+            fs: { allow: [target, here, ...baseDirs, ...(0, exports.installedRootsOf)(target)] } }) }));
     const closing = server.close.bind(server);
     server.close = () => closing().finally(() => cache === null || cache === void 0 ? void 0 : cache.release());
     const listening = server.listen.bind(server);
@@ -762,17 +846,22 @@ const exitWhenStdinCloses = (server) => {
     process.stdin.once('close', shutDown);
     process.stdin.resume();
 };
+const installedStampOf = () => (0, stamp_1.buildStampOf)((0, paths_1.installedAssetRoot)()).build;
 /**
  * Starts the design server for a checkout and keeps it running. The returned exit code is the
- * command's, not the server's: a listening server holds the process open on its own.
+ * command's, not the server's: a listening server holds the process open on its own. With
+ * `reloadOnRebuild`, a rebuild or reinstall of the cli restarts the server on the same port from
+ * the new build, inside the process that was started.
  */
 const serveDesign = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    const { target, host } = options;
+    const { target, host, reloadOnRebuild, checkSketches } = options;
     const config = (0, paths_1.readConfig)(target);
     if (!config) {
         console.error(`design-explore: no config at ${(0, paths_1.configPathOf)(target)}`);
         return 1;
     }
+    const cwd = process.cwd();
+    const served = reloadOnRebuild ? installedStampOf() : '';
     (0, paths_1.snapshotPackage)(target);
     const ownedByStudio = process.env['ETHLETE_DESIGN_EXIT_ON_STDIN_CLOSE'] === '1';
     const portPinned = ownedByStudio || !!Number(process.env['DE_PORT']);
@@ -782,6 +871,7 @@ const serveDesign = (options) => __awaiter(void 0, void 0, void 0, function* ()
         listen: true,
         host,
         listenOn: portPinned ? undefined : yield freePortOf(),
+        checkSketches,
     });
     yield server.listen();
     console.log(`design-explore: drawing ${target}`);
@@ -789,9 +879,33 @@ const serveDesign = (options) => __awaiter(void 0, void 0, void 0, function* ()
         console.log(`design-explore: not started by Studio, so it listens on a free port and leaves ${(0, paths_1.portOf)(config)} to Studio`);
     }
     server.printUrls();
+    if (process.env['ETHLETE_DESIGN_SLOW_CHECKS'] !== 'off')
+        (0, slow_run_1.startSlowRunner)({
+            target,
+            configOf: () => (0, paths_1.readConfig)(target),
+            log: (line) => console.log(`design-explore: ${line}`),
+        });
     if (ownedByStudio) {
         exitWhenStdinCloses(server);
     }
+    if (reloadOnRebuild) {
+        (0, build_watch_1.watchBuild)({
+            root: (0, path_1.dirname)((0, paths_1.installedAssetRoot)()),
+            served,
+            stampOf: installedStampOf,
+            onRebuild: () => {
+                var _a;
+                const address = (_a = server.httpServer) === null || _a === void 0 ? void 0 : _a.address();
+                const port = address && typeof address === 'object' ? address.port : (0, paths_1.portOf)(config);
+                console.log('design-explore: the cli was rebuilt, restarting the server from the new build');
+                void server
+                    .close()
+                    .then(() => process.env[build_watch_1.SUPERVISED_ENV] === '1'
+                    ? process.exit(build_watch_1.RELOAD_EXIT_CODE)
+                    : (0, build_watch_1.superviseReloads)(() => (0, build_watch_1.relaunch)({ port, cwd })).then((code) => process.exit(code)));
+            },
+        });
+    }
     return 0;
 });
 exports.serveDesign = serveDesign;