@gtkx/cli 1.0.0 → 1.1.0

package/dist/dev/runner-deps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner-deps.d.ts","sourceRoot":"","sources":["../../src/dev/runner-deps.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAyBjD,QAAA,MAAM,oBAAoB,QAAO,aAiC/B,CAAC;AAEH,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"runner-deps.d.ts","sourceRoot":"","sources":["../../src/dev/runner-deps.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAsCjD,QAAA,MAAM,oBAAoB,QAAO,aA8C/B,CAAC;AAEH,OAAO,EAAE,oBAAoB,EAAE,CAAC"}

package/dist/dev/runner-deps.js

@@ -1,26 +1,33 @@
 import { loadConfig } from "@gtkx/config";
 import * as Gio from "@gtkx/gi/gio";
 import { quitApplication } from "@gtkx/runtime";
+import { getApplicationInstance } from "@gtkx/runtime/internal";
 import { info, installGracefulShutdown } from "@gtkx/utils";
+import { readFile } from "node:fs/promises";
 import { createServer } from "vite";
 import { startMcpClient, stopMcpClient } from "../mcp/index.js";
-import { setTestingModuleLoader } from "../mcp/testing-loader.js";
-import { isRefreshBoundary, performRefresh } from "../refresh-runtime.js";
+import { mergeTestingModule, setTestingModuleLoader, } from "../mcp/testing-loader.js";
+import { isRefreshBoundary, performRefresh, staleExportName } from "../refresh-runtime.js";
 import { gtkxFastRefresh } from "../vite-plugins/fast-refresh/swc-refresh.js";
 import { gtkxVitePlugins } from "../vite-plugins/index.js";
 import { gtkxReactDomPrebundle } from "../vite-plugins/react-dom-prebundle.js";
 const DEV_MODE = "development";
 const APPLICATION_POLL_INTERVAL_MS = 50;
 const currentApplicationId = () => Gio.Application.getDefault()?.applicationId ?? null;
-const waitForApplicationId = async (timeoutMs) => {
+const currentApplicationInstance = () => {
+    const application = Gio.Application.getDefault();
+    return application === null ? "unregistered" : getApplicationInstance(application);
+};
+const waitForApplicationId = async (timeoutMs, shouldKeepWaiting) => {
     const deadline = Date.now() + timeoutMs;
     let applicationId = currentApplicationId();
-    while (applicationId === null && Date.now() < deadline) {
+    while (applicationId === null && Date.now() < deadline && shouldKeepWaiting()) {
         await new Promise((resolve) => setTimeout(resolve, APPLICATION_POLL_INTERVAL_MS));
         applicationId = currentApplicationId();
     }
     return applicationId;
 };
+const readFileRevision = (path) => readFile(path, "utf8");
 const defaultDevRunnerDeps = () => ({
     createServer,
     waitForApplicationId,
@@ -29,14 +36,24 @@ const defaultDevRunnerDeps = () => ({
         return loaded.config.applicationId;
     },
     startMcpClient: (applicationId, loadAppModule) => {
-        setTestingModuleLoader(() => loadAppModule("@gtkx/testing"));
+        setTestingModuleLoader(async () => {
+            const [publicApi, internals] = await Promise.all([
+                loadAppModule("@gtkx/testing"),
+                loadAppModule("@gtkx/testing/internal"),
+            ]);
+            return mergeTestingModule(publicApi, internals);
+        });
         return startMcpClient(applicationId);
     },
     stopMcpClient,
     watchApplicationShutdown: (onShutdown) => {
         Gio.Application.getDefault()?.on("shutdown", onShutdown);
     },
-    isApplicationRegistered: () => Gio.Application.getDefault()?.getIsRegistered() === true,
+    watchUncaughtErrors: (onUncaughtError) => {
+        process.on("uncaughtException", onUncaughtError);
+        process.on("unhandledRejection", onUncaughtError);
+    },
+    getApplicationInstance: currentApplicationInstance,
     installShutdownHandlers: (onSignal) => {
         installGracefulShutdown({ onSignal });
     },
@@ -48,6 +65,8 @@ const defaultDevRunnerDeps = () => ({
     },
     performRefresh,
     isRefreshBoundary,
+    staleExportName,
+    readFileRevision,
     plugins: () => [...gtkxVitePlugins(DEV_MODE), ...gtkxFastRefresh(), gtkxReactDomPrebundle()],
     log: info,
     exit: (code) => process.exit(code),

package/dist/dev/runner-deps.js.map

@@ -1 +1 @@
-{"version":3,"file":"runner-deps.js","sourceRoot":"","sources":["../../src/dev/runner-deps.ts"],"names":[],"mappings":"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","sourcesContent":["import { loadConfig } from \"@gtkx/config\";\nimport * as Gio from \"@gtkx/gi/gio\";\nimport { quitApplication } from \"@gtkx/runtime\";\nimport { info, installGracefulShutdown } from \"@gtkx/utils\";\nimport { createServer } from \"vite\";\nimport type { DevRunnerDeps } from \"./runner.js\";\nimport { startMcpClient, stopMcpClient } from \"../mcp/index.js\";\nimport { setTestingModuleLoader } from \"../mcp/testing-loader.js\";\nimport { isRefreshBoundary, performRefresh } from \"../refresh-runtime.js\";\nimport { gtkxFastRefresh } from \"../vite-plugins/fast-refresh/swc-refresh.js\";\nimport { gtkxVitePlugins } from \"../vite-plugins/index.js\";\nimport { gtkxReactDomPrebundle } from \"../vite-plugins/react-dom-prebundle.js\";\n\nconst DEV_MODE = \"development\";\nconst APPLICATION_POLL_INTERVAL_MS = 50;\n\nconst currentApplicationId = (): string | null => Gio.Application.getDefault()?.applicationId ?? null;\n\nconst waitForApplicationId = async (timeoutMs: number): Promise<string | null> => {\n    const deadline = Date.now() + timeoutMs;\n    let applicationId = currentApplicationId();\n\n    while (applicationId === null && Date.now() < deadline) {\n        await new Promise((resolve) => setTimeout(resolve, APPLICATION_POLL_INTERVAL_MS));\n        applicationId = currentApplicationId();\n    }\n\n    return applicationId;\n};\n\nconst defaultDevRunnerDeps = (): DevRunnerDeps => ({\n    createServer,\n    waitForApplicationId,\n    getConfiguredApplicationId: async (root: string) => {\n        const loaded = await loadConfig(root, { mode: DEV_MODE });\n\n        return loaded.config.applicationId;\n    },\n    startMcpClient: (applicationId, loadAppModule) => {\n        setTestingModuleLoader(() => loadAppModule(\"@gtkx/testing\") as Promise<typeof import(\"@gtkx/testing\")>);\n\n        return startMcpClient(applicationId);\n    },\n    stopMcpClient,\n    watchApplicationShutdown: (onShutdown) => {\n        Gio.Application.getDefault()?.on(\"shutdown\", onShutdown);\n    },\n    isApplicationRegistered: () => Gio.Application.getDefault()?.getIsRegistered() === true,\n    installShutdownHandlers: (onSignal) => {\n        installGracefulShutdown({ onSignal });\n    },\n    quitDefaultApplication: () => {\n        const application = Gio.Application.getDefault();\n\n        if (application) {\n            quitApplication(application);\n        }\n    },\n    performRefresh,\n    isRefreshBoundary,\n    plugins: () => [...gtkxVitePlugins(DEV_MODE), ...gtkxFastRefresh(), gtkxReactDomPrebundle()],\n    log: info,\n    exit: (code: number): never => process.exit(code),\n});\n\nexport { defaultDevRunnerDeps };\n"]}
+{"version":3,"file":"runner-deps.js","sourceRoot":"","sources":["../../src/dev/runner-deps.ts"],"names":[],"mappings":"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","sourcesContent":["import { loadConfig } from \"@gtkx/config\";\nimport * as Gio from \"@gtkx/gi/gio\";\nimport { quitApplication } from \"@gtkx/runtime\";\nimport { type ApplicationInstance, getApplicationInstance } from \"@gtkx/runtime/internal\";\nimport { info, installGracefulShutdown } from \"@gtkx/utils\";\nimport { readFile } from \"node:fs/promises\";\nimport { createServer } from \"vite\";\nimport type { DevRunnerDeps } from \"./runner.js\";\nimport { startMcpClient, stopMcpClient } from \"../mcp/index.js\";\nimport {\n    mergeTestingModule,\n    setTestingModuleLoader,\n    type TestingInternalModule,\n    type TestingPublicModule,\n} from \"../mcp/testing-loader.js\";\nimport { isRefreshBoundary, performRefresh, staleExportName } from \"../refresh-runtime.js\";\nimport { gtkxFastRefresh } from \"../vite-plugins/fast-refresh/swc-refresh.js\";\nimport { gtkxVitePlugins } from \"../vite-plugins/index.js\";\nimport { gtkxReactDomPrebundle } from \"../vite-plugins/react-dom-prebundle.js\";\n\nconst DEV_MODE = \"development\";\nconst APPLICATION_POLL_INTERVAL_MS = 50;\n\nconst currentApplicationId = (): string | null => Gio.Application.getDefault()?.applicationId ?? null;\n\nconst currentApplicationInstance = (): ApplicationInstance => {\n    const application = Gio.Application.getDefault();\n\n    return application === null ? \"unregistered\" : getApplicationInstance(application);\n};\n\nconst waitForApplicationId = async (timeoutMs: number, shouldKeepWaiting: () => boolean): Promise<string | null> => {\n    const deadline = Date.now() + timeoutMs;\n    let applicationId = currentApplicationId();\n\n    while (applicationId === null && Date.now() < deadline && shouldKeepWaiting()) {\n        await new Promise((resolve) => setTimeout(resolve, APPLICATION_POLL_INTERVAL_MS));\n        applicationId = currentApplicationId();\n    }\n\n    return applicationId;\n};\n\nconst readFileRevision = (path: string): Promise<string> => readFile(path, \"utf8\");\n\nconst defaultDevRunnerDeps = (): DevRunnerDeps => ({\n    createServer,\n    waitForApplicationId,\n    getConfiguredApplicationId: async (root: string) => {\n        const loaded = await loadConfig(root, { mode: DEV_MODE });\n\n        return loaded.config.applicationId;\n    },\n    startMcpClient: (applicationId, loadAppModule) => {\n        setTestingModuleLoader(async () => {\n            const [publicApi, internals] = await Promise.all([\n                loadAppModule(\"@gtkx/testing\") as Promise<TestingPublicModule>,\n                loadAppModule(\"@gtkx/testing/internal\") as Promise<TestingInternalModule>,\n            ]);\n\n            return mergeTestingModule(publicApi, internals);\n        });\n\n        return startMcpClient(applicationId);\n    },\n    stopMcpClient,\n    watchApplicationShutdown: (onShutdown) => {\n        Gio.Application.getDefault()?.on(\"shutdown\", onShutdown);\n    },\n    watchUncaughtErrors: (onUncaughtError) => {\n        process.on(\"uncaughtException\", onUncaughtError);\n        process.on(\"unhandledRejection\", onUncaughtError);\n    },\n    getApplicationInstance: currentApplicationInstance,\n    installShutdownHandlers: (onSignal) => {\n        installGracefulShutdown({ onSignal });\n    },\n    quitDefaultApplication: () => {\n        const application = Gio.Application.getDefault();\n\n        if (application) {\n            quitApplication(application);\n        }\n    },\n    performRefresh,\n    isRefreshBoundary,\n    staleExportName,\n    readFileRevision,\n    plugins: () => [...gtkxVitePlugins(DEV_MODE), ...gtkxFastRefresh(), gtkxReactDomPrebundle()],\n    log: info,\n    exit: (code: number): never => process.exit(code),\n});\n\nexport { defaultDevRunnerDeps };\n"]}

package/dist/dev/runner.d.ts

@@ -1,17 +1,22 @@
+import type { ApplicationInstance } from "@gtkx/runtime/internal";
 import type { InlineConfig, Plugin } from "vite";
 import { type DevServer } from "./vite-dev-server.js";
+type LoadAppModule = (id: string) => Promise<Record<string, unknown>>;
 type DevRunnerDeps = {
     createServer(config: InlineConfig): Promise<DevServer>;
-    waitForApplicationId(timeoutMs: number): Promise<string | null>;
+    waitForApplicationId(timeoutMs: number, shouldKeepWaiting: () => boolean): Promise<string | null>;
     getConfiguredApplicationId(root: string): Promise<string | undefined>;
-    startMcpClient(applicationId: string, loadAppModule: (id: string) => Promise<Record<string, unknown>>): Promise<unknown>;
+    startMcpClient(applicationId: string, loadAppModule: LoadAppModule): Promise<unknown>;
     stopMcpClient(): void;
     watchApplicationShutdown(onShutdown: () => void): void;
-    isApplicationRegistered(): boolean;
+    watchUncaughtErrors(onUncaughtError: (cause: unknown) => void): void;
+    getApplicationInstance(): ApplicationInstance;
     installShutdownHandlers(onSignal: () => void | Promise<void>): void;
     quitDefaultApplication(): void;
     performRefresh: () => void;
     isRefreshBoundary(module: Record<string, unknown>): boolean;
+    staleExportName(previous: Record<string, unknown>, current: Record<string, unknown>): string | null;
+    readFileRevision(path: string): Promise<string>;
     plugins(): Plugin[];
     log(message: string): void;
     exit(code: number): never;
@@ -20,6 +25,5 @@ type DevRunner = {
     run(entryPath: string): Promise<void>;
 };
 declare const createDevRunner: (deps: DevRunnerDeps) => DevRunner;
-export type { DevServer } from "./vite-dev-server.js";
 export { createDevRunner, type DevRunnerDeps };
 //# sourceMappingURL=runner.d.ts.map

package/dist/dev/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/dev/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAIjD,OAAO,EAAyB,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE7E,KAAK,aAAa,GAAG;IACjB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACvD,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAChE,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACtE,cAAc,CACV,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAChE,OAAO,CAAC,OAAO,CAAC,CAAC;IACpB,aAAa,IAAI,IAAI,CAAC;IACtB,wBAAwB,CAAC,UAAU,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IACvD,uBAAuB,IAAI,OAAO,CAAC;IACnC,uBAAuB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACpE,sBAAsB,IAAI,IAAI,CAAC;IAC/B,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC;IAC5D,OAAO,IAAI,MAAM,EAAE,CAAC;IACpB,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;CAC7B,CAAC;AAEF,KAAK,SAAS,GAAG;IACb,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzC,CAAC;AA0KF,QAAA,MAAM,eAAe,GAAI,MAAM,aAAa,KAAG,SAc7C,CAAC;AAEH,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,KAAK,aAAa,EAAE,CAAC"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/dev/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAQjD,OAAO,EAEH,KAAK,SAAS,EAIjB,MAAM,sBAAsB,CAAC;AAE9B,KAAK,aAAa,GAAG,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAEtE,KAAK,aAAa,GAAG;IACjB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACvD,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAClG,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACtE,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACtF,aAAa,IAAI,IAAI,CAAC;IACtB,wBAAwB,CAAC,UAAU,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IACvD,mBAAmB,CAAC,eAAe,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI,CAAC;IACrE,sBAAsB,IAAI,mBAAmB,CAAC;IAC9C,uBAAuB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACpE,sBAAsB,IAAI,IAAI,CAAC;IAC/B,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC;IAC5D,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC;IACpG,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD,OAAO,IAAI,MAAM,EAAE,CAAC;IACpB,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;CAC7B,CAAC;AAEF,KAAK,SAAS,GAAG;IACb,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzC,CAAC;AAijBF,QAAA,MAAM,eAAe,GAAI,MAAM,aAAa,KAAG,SAe7C,CAAC;AAEH,OAAO,EAAE,eAAe,EAAE,KAAK,aAAa,EAAE,CAAC"}

package/dist/dev/runner.js

@@ -1,36 +1,198 @@
-import { error } from "@gtkx/utils";
+import { error, warn } from "@gtkx/utils";
+import { loadModuleExclusively, withExclusiveLoad } from "../internal/module-loads.js";
+import { createChangeQueue } from "./change-queue.js";
+import { createFailureTracker } from "./failure-tracker.js";
+import { isMissingImport, missingImportName } from "./missing-import.js";
 import { createRefreshTracker } from "./refresh-tracker.js";
 import { RESTART_EXIT_CODE } from "./supervisor.js";
-import { createDevServerConfig } from "./vite-dev-server.js";
+import { createDevServerConfig, isServerConfigFile, } from "./vite-dev-server.js";
 const APPLICATION_MOUNT_TIMEOUT_MS = 10_000;
-const requestRestart = async (server, deps) => {
-    deps.log("Full restart (process restart)");
-    await server.close();
-    return deps.exit(RESTART_EXIT_CODE);
+const OWNED_ID_EXIT_CODE = 1;
+const LOAD_ATTEMPT_LIMIT = 5;
+const WATCH_EVENTS = ["add", "change", "unlink"];
+const SKIP_REASON = `did not settle in ${String(LOAD_ATTEMPT_LIMIT)} attempts; save it again to patch the window.`;
+const DROPPED_REFRESH = "Fast Refresh dropped";
+const SAVE_ACTION = "File changed";
+const RETRY_ACTION = "Retrying pending save";
+const announceFailure = (server, cause) => {
+    if (cause instanceof Error) {
+        server.ssrFixStacktrace(cause);
+    }
+    error("Application error; keeping the dev server up. Fix the error and save again.", cause);
+};
+const parkSession = (session) => {
+    session.deps.log("Waiting for a change to restart the application...");
+};
+const requestRestart = async (session) => {
+    session.deps.log("Full restart (process restart)");
+    try {
+        await session.server.close();
+    }
+    catch (error_) {
+        error("Error closing server before the restart:", error_);
+    }
+    return session.deps.exit(RESTART_EXIT_CODE);
+};
+const requiresRestart = (session, module) => {
+    if (session.failure.isDown()) {
+        return true;
+    }
+    const loadedExports = module.ssrModule;
+    if (!loadedExports) {
+        return false;
+    }
+    return !session.deps.isRefreshBoundary(loadedExports);
+};
+const invalidateChangedModule = (session, module) => {
+    session.server.moduleGraph.invalidateModule(module);
+    for (const importer of module.importers) {
+        session.server.moduleGraph.invalidateModule(importer);
+    }
+};
+const isEvaluationCurrent = (session, changedPath, loadedExports) => {
+    const evaluated = session.server.moduleGraph.getModuleById(changedPath);
+    if (!evaluated?.ssrTransformResult) {
+        return false;
+    }
+    return evaluated.ssrModule === loadedExports;
 };
-const handleFileChange = async (server, deps, changedPath) => {
-    const module = server.moduleGraph.getModuleById(changedPath);
+const loadInvalidatedModule = (session, changedPath, module) => withExclusiveLoad(session.server, async () => {
+    const revision = await session.deps.readFileRevision(changedPath);
+    invalidateChangedModule(session, module);
+    const loadedExports = await session.server.ssrLoadModule(changedPath);
+    const settledRevision = await session.deps.readFileRevision(changedPath);
+    return {
+        loadedExports,
+        isSettled: settledRevision === revision && isEvaluationCurrent(session, changedPath, loadedExports),
+    };
+});
+const settleAttempt = async (session, changedPath, module) => {
+    const { loadedExports, isSettled } = await loadInvalidatedModule(session, changedPath, module);
+    if (isSettled) {
+        return { loadedExports, module };
+    }
+    return { loadedExports: null, module: session.server.moduleGraph.getModuleById(changedPath) ?? module };
+};
+const loadSettledExports = async (session, changedPath, changedModule) => {
+    let module = changedModule;
+    for (let round = 0; round < LOAD_ATTEMPT_LIMIT && !session.controller.isShuttingDown(); round++) {
+        const attempt = await settleAttempt(session, changedPath, module);
+        if (attempt.loadedExports) {
+            return attempt.loadedExports;
+        }
+        module = attempt.module;
+    }
+    return null;
+};
+const droppedExportName = (previous, current) => {
+    const kept = new Set(Object.keys(current));
+    for (const name of Object.keys(previous)) {
+        if (!kept.has(name)) {
+            return name;
+        }
+    }
+    return null;
+};
+const unpatchedExportReason = (session, previous, current) => {
+    if (!previous) {
+        return null;
+    }
+    const dropped = droppedExportName(previous, current);
+    if (dropped !== null) {
+        return `no longer exports ${dropped}, which its importers still hold`;
+    }
+    const stale = session.deps.staleExportName(previous, current);
+    if (stale === null) {
+        return null;
+    }
+    return `renamed the component it exports as ${stale}, which the window is still rendering`;
+};
+const refreshChangedModule = async (session, changedPath, changedModule, previous) => {
+    const loadedExports = await loadSettledExports(session, changedPath, changedModule);
+    if (session.controller.isShuttingDown()) {
+        return;
+    }
+    if (!loadedExports) {
+        warn(`Fast Refresh skipped: ${changedPath} ${SKIP_REASON}`);
+        return;
+    }
+    if (!session.deps.isRefreshBoundary(loadedExports)) {
+        await requestRestart(session);
+        return;
+    }
+    const unpatched = unpatchedExportReason(session, previous, loadedExports);
+    if (unpatched !== null) {
+        warn(`${DROPPED_REFRESH}: ${changedPath} ${unpatched}`);
+        await requestRestart(session);
+        return;
+    }
+    session.pendingSaves.delete(changedPath);
+    session.deps.log("Running Fast Refresh...");
+    session.deps.performRefresh();
+    session.deps.log("Fast Refresh complete");
+};
+const applyModuleChange = async (session, changedPath, action) => {
+    const module = session.server.moduleGraph.getModuleById(changedPath);
     if (!module) {
         return;
     }
-    deps.log(`File changed: ${changedPath}`);
-    const loadedExports = module.ssrModule;
-    if (loadedExports && !deps.isRefreshBoundary(loadedExports)) {
-        await requestRestart(server, deps);
+    session.deps.log(`${action}: ${changedPath}`);
+    if (requiresRestart(session, module)) {
+        await requestRestart(session);
         return;
     }
-    server.moduleGraph.invalidateModule(module);
-    for (const importer of module.importers) {
-        server.moduleGraph.invalidateModule(importer);
+    await refreshChangedModule(session, changedPath, module, module.ssrModule ?? null);
+};
+const awaitMissingImport = (session, changedPath, cause) => {
+    const missingName = missingImportName(cause);
+    if (missingName === null) {
+        session.pendingSaves.delete(changedPath);
+        return;
+    }
+    session.pendingSaves.set(changedPath, missingName);
+};
+const applySave = async (session, changedPath, action) => {
+    try {
+        await applyModuleChange(session, changedPath, action);
     }
-    const newMod = await server.ssrLoadModule(changedPath);
-    if (deps.isRefreshBoundary(newMod)) {
-        deps.log("Running Fast Refresh...");
-        deps.performRefresh();
-        deps.log("Fast Refresh complete");
+    catch (error_) {
+        if (session.controller.isShuttingDown()) {
+            return;
+        }
+        awaitMissingImport(session, changedPath, error_);
+        error("Hot reload failed:", error_);
+    }
+};
+const savesAwaiting = (session, createdPath) => [...session.pendingSaves]
+    .filter(([, missingName]) => isMissingImport(createdPath, missingName))
+    .map(([changedPath]) => changedPath);
+const retryPendingSaves = async (session, waiting) => {
+    for (const changedPath of waiting) {
+        if (session.controller.isShuttingDown()) {
+            return;
+        }
+        session.pendingSaves.delete(changedPath);
+        await applySave(session, changedPath, RETRY_ACTION);
+    }
+};
+const handleFileCreate = async (session, createdPath) => {
+    const waiting = savesAwaiting(session, createdPath);
+    if (waiting.length === 0) {
         return;
     }
-    await requestRestart(server, deps);
+    session.deps.log(`File created: ${createdPath}`);
+    if (session.failure.isDown()) {
+        await requestRestart(session);
+        return;
+    }
+    await retryPendingSaves(session, waiting);
+};
+const handleFileRemove = async (session, removedPath) => {
+    if (!session.server.moduleGraph.getModuleById(removedPath)) {
+        return;
+    }
+    session.deps.log(`File removed: ${removedPath}`);
+    await requestRestart(session);
 };
 const createShutdownController = (server, deps) => {
     let isShuttingDown = false;
@@ -47,82 +209,188 @@ const createShutdownController = (server, deps) => {
         },
     };
 };
-const reloadChangedFile = async (server, deps, changedPath) => {
-    try {
-        await handleFileChange(server, deps, changedPath);
+const restartForServerConfig = async (session, changedPath) => {
+    session.deps.log(`Server config changed: ${changedPath}`);
+    await requestRestart(session);
+};
+const applyChange = async (session, change) => {
+    if (session.controller.isShuttingDown()) {
+        return;
     }
-    catch (error_) {
-        error("Hot reload failed:", error_);
+    if (isServerConfigFile(session.server.config, change.path)) {
+        await restartForServerConfig(session, change.path);
+        return;
     }
-};
-const onFileChange = (server, deps, controller) => (changedPath) => {
-    if (controller.isShuttingDown()) {
+    if (change.event === "add") {
+        await handleFileCreate(session, change.path);
         return;
     }
-    void reloadChangedFile(server, deps, changedPath);
+    if (change.event === "unlink") {
+        await handleFileRemove(session, change.path);
+        return;
+    }
+    await applySave(session, change.path, SAVE_ACTION);
+};
+const watchProjectFiles = (session) => {
+    const queue = createChangeQueue((change) => applyChange(session, change));
+    for (const event of WATCH_EVENTS) {
+        session.server.watcher.on(event, (path) => {
+            queue.enqueue({ event, path });
+        });
+    }
 };
-const onShutdownSignal = (deps, controller) => async () => {
-    if (controller.isShuttingDown()) {
+const onShutdownSignal = (session) => async () => {
+    if (session.controller.isShuttingDown()) {
         return;
     }
-    deps.log("Received shutdown signal - stopping dev runner...");
-    await controller.shutdown(() => {
-        deps.quitDefaultApplication();
+    session.deps.log("Received shutdown signal - stopping dev runner...");
+    await session.controller.shutdown(() => {
+        session.deps.quitDefaultApplication();
     });
 };
-const closeAndExit = async (deps, controller, code = 0) => {
+const closeAndExit = async (session, code = 0) => {
     try {
-        await controller.shutdown(() => undefined);
+        await session.controller.shutdown(() => undefined);
     }
     catch (error_) {
         error("Error closing server:", error_);
-        return deps.exit(1);
+        return session.deps.exit(1);
+    }
+    return session.deps.exit(code);
+};
+const isSessionInactive = (session) => {
+    if (session.controller.isShuttingDown()) {
+        return true;
+    }
+    if (!session.failure.isDown()) {
+        return false;
     }
-    return deps.exit(code);
+    parkSession(session);
+    return true;
 };
-const onApplicationShutdown = (deps, refreshTracker, controller) => () => {
-    if (controller.isShuttingDown()) {
+const stopForApplicationQuit = (session) => {
+    session.deps.log("Application quit - stopping dev runner...");
+    return closeAndExit(session);
+};
+const settleUnmount = (session, wasRefreshing) => {
+    if (isSessionInactive(session)) {
+        return;
+    }
+    if (!wasRefreshing) {
+        void stopForApplicationQuit(session);
         return;
     }
-    if (refreshTracker.isRefreshing()) {
-        deps.log("Application unmounted during Fast Refresh - restarting dev runner...");
-        return deps.exit(RESTART_EXIT_CODE);
+    session.deps.log("Application unmounted during Fast Refresh - restarting dev runner...");
+    session.deps.exit(RESTART_EXIT_CODE);
+};
+const handleApplicationShutdown = (session) => {
+    if (isSessionInactive(session)) {
+        return;
     }
-    deps.log("Application quit - stopping dev runner...");
-    void closeAndExit(deps, controller);
+    const wasRefreshing = session.refreshTracker.isRefreshing();
+    session.failure.settleUnmount(() => {
+        settleUnmount(session, wasRefreshing);
+    });
+};
+const onApplicationShutdown = (session) => () => {
+    handleApplicationShutdown(session);
 };
 const refusedExitCode = () => (process.exitCode === undefined ? 1 : Number(process.exitCode));
-const connectApplication = async (deps, server, liveApplicationId, tracked) => {
-    deps.watchApplicationShutdown(onApplicationShutdown(deps, tracked.refreshTracker, tracked.controller));
+const connectApplication = async (session, liveApplicationId) => {
+    const { deps, server } = session;
+    deps.watchApplicationShutdown(onApplicationShutdown(session));
     const applicationId = (await deps.getConfiguredApplicationId(process.cwd())) ?? liveApplicationId;
     deps.log(`Connected application ID: ${applicationId}`);
-    await deps.startMcpClient(applicationId, (id) => server.ssrLoadModule(id));
+    await deps.startMcpClient(applicationId, (id) => loadModuleExclusively(server, id));
+};
+const stopForOwnedApplicationId = async (session, liveApplicationId) => {
+    session.deps.log(`Another process already owns ${liveApplicationId}, so this session can never show a window - ` +
+        "stopping dev runner. Quit that instance or change applicationId, then start gtkx dev again.");
+    await closeAndExit(session, OWNED_ID_EXIT_CODE);
+};
+const stopForStoppedApplication = async (session, instance) => {
+    if (session.failure.hasReported()) {
+        session.deps.log("Application stopped before the dev runner attached.");
+        session.failure.fail();
+        return;
+    }
+    if (instance === "shutDown") {
+        await stopForApplicationQuit(session);
+        return;
+    }
+    session.deps.log("Application refused its command line - stopping dev runner...");
+    await closeAndExit(session, refusedExitCode());
 };
-const attachApplication = async (deps, server, tracked) => {
-    const liveApplicationId = await deps.waitForApplicationId(APPLICATION_MOUNT_TIMEOUT_MS);
+const connectLiveApplication = async (session, liveApplicationId) => {
+    const instance = session.deps.getApplicationInstance();
+    if (instance === "primary") {
+        await connectApplication(session, liveApplicationId);
+        return;
+    }
+    if (instance === "remote") {
+        await stopForOwnedApplicationId(session, liveApplicationId);
+        return;
+    }
+    await stopForStoppedApplication(session, instance);
+};
+const attachApplication = async (session) => {
+    const { deps, failure } = session;
+    const liveApplicationId = await deps.waitForApplicationId(APPLICATION_MOUNT_TIMEOUT_MS, () => !failure.isDown());
+    if (failure.isDown()) {
+        return;
+    }
     if (liveApplicationId === null) {
         deps.log("Entry did not mount an application - MCP client not started.");
         return;
     }
-    if (!deps.isApplicationRegistered()) {
-        deps.log("Application refused its command line - stopping dev runner...");
-        return closeAndExit(deps, tracked.controller, refusedExitCode());
+    await connectLiveApplication(session, liveApplicationId);
+};
+const loadEntry = async (session, entryPath) => {
+    session.deps.log(`Loading entry: ${entryPath}`);
+    try {
+        await loadModuleExclusively(session.server, entryPath);
+    }
+    catch (error_) {
+        awaitMissingImport(session, entryPath, error_);
+        session.failure.fail(error_);
+    }
+};
+const hasApplicationStopped = (instance) => instance === "shutDown" || instance === "unregistered";
+const isApplicationLost = (session) => session.failure.hasReported() && hasApplicationStopped(session.deps.getApplicationInstance());
+const announceReady = (session) => {
+    if (isApplicationLost(session)) {
+        session.failure.fail();
+    }
+    if (isSessionInactive(session)) {
+        return;
     }
-    await connectApplication(deps, server, liveApplicationId, tracked);
+    session.deps.log("HMR enabled - watching for changes...");
+};
+const createSession = (server, deps) => {
+    const refreshTracker = createRefreshTracker(deps.performRefresh);
+    return {
+        server,
+        deps: { ...deps, performRefresh: refreshTracker.performRefresh },
+        controller: createShutdownController(server, deps),
+        refreshTracker,
+        failure: createFailureTracker((cause) => {
+            announceFailure(server, cause);
+        }, refreshTracker.isRefreshing),
+        pendingSaves: new Map(),
+    };
 };
 const createDevRunner = (deps) => ({
     async run(entryPath) {
-        const root = process.cwd();
-        const server = await deps.createServer(createDevServerConfig(root, deps.plugins()));
-        const refreshTracker = createRefreshTracker(deps.performRefresh);
-        const refreshTrackingDeps = { ...deps, performRefresh: refreshTracker.performRefresh };
-        const controller = createShutdownController(server, deps);
-        deps.installShutdownHandlers(onShutdownSignal(deps, controller));
-        server.watcher.on("change", onFileChange(server, refreshTrackingDeps, controller));
-        deps.log(`Loading entry: ${entryPath}`);
-        await server.ssrLoadModule(entryPath);
-        await attachApplication(deps, server, { refreshTracker, controller });
-        deps.log("HMR enabled - watching for changes...");
+        const server = await deps.createServer(createDevServerConfig(process.cwd(), deps.plugins()));
+        const session = createSession(server, deps);
+        deps.installShutdownHandlers(onShutdownSignal(session));
+        deps.watchUncaughtErrors((cause) => {
+            session.failure.report(cause);
+        });
+        watchProjectFiles(session);
+        await loadEntry(session, entryPath);
+        await attachApplication(session);
+        announceReady(session);
     },
 });
 export { createDevRunner };