@dimina-kit/devtools 0.4.0-dev.20260625063832 → 0.4.0-dev.20260630033804

package/dist/main/app/app.js

@@ -151,6 +151,7 @@ function createContext(config, mainWindow, rendererDir) {
         rendererDir,
         appName: config.appName,
         apiNamespaces: config.apiNamespaces,
+        fileTypes: config.fileTypes,
         brandingProvider: config.brandingProvider,
         // The host-supplied ProjectsProvider / template types in `shared/types`
         // are structurally compatible with the main-process equivalents —
@@ -558,6 +559,7 @@ export async function createDevtoolsRuntime(config = {}) {
             rootDir: bundleDir,
             getProjectRoot: () => context.workspace.getProjectPath(),
             extensionsDir: config.editorViewConfig?.extensionsDir,
+            getFileTypes: () => context.fileTypes,
         });
         // Return the close promise so the registry awaits server shutdown on dispose
         // instead of fire-and-forgetting it (a dangling http server would keep the

package/dist/main/index.bundle.js

@@ -1653,6 +1653,9 @@ function buildElementsHookScript() {
     return 'partial';
   }catch(e){ return 'error:' + (e && e.message); }})()`;
 }
+function buildReconcileScript() {
+  return `(function(){var status; try { status = ${buildElementsHookScript()}; } catch(e){ status = 'error:'+(e&&e.message); }var batch = []; try { if (globalThis.__diminaElementsOutbound) batch = globalThis.__diminaElementsOutbound.splice(0); } catch(_){}return { status: status, batch: batch };})()`;
+}
 var PROBE_DEVTOOLS_API = `(window.DevToolsAPI && typeof window.DevToolsAPI.dispatchMessage === 'function')`;
 var MAX_SINGLE_DISPATCH_CHARS = 1e6;
 var CHUNK_CHARS = 256 * 1024;
@@ -1668,13 +1671,11 @@ function buildDocumentUpdatedScript() {
   return buildDispatchScript(msg);
 }
 var DRAIN_INTERVAL_MS = 150;
-var INSTALL_POLL_TRIES = 200;
-var INSTALL_POLL_INTERVAL_MS = 50;
 function installElementsForward(deps) {
   const { devtoolsWc, bridge } = deps;
   let disposed = false;
-  let installTimer = null;
-  let drainTimer = null;
+  let reconcileTimer = null;
+  let lateCleanup = null;
   const isActiveWcId = (id) => {
     const a = activeRenderWc();
     return a != null && a.id === id;
@@ -1683,13 +1684,9 @@ function installElementsForward(deps) {
   const selfAttached = /* @__PURE__ */ new Set();
   const stop = () => {
     disposed = true;
-    if (installTimer) {
-      clearInterval(installTimer);
-      installTimer = null;
-    }
-    if (drainTimer) {
-      clearInterval(drainTimer);
-      drainTimer = null;
+    if (reconcileTimer) {
+      clearInterval(reconcileTimer);
+      reconcileTimer = null;
     }
     for (const cleanup of wiredGuests.values()) {
       try {
@@ -1699,6 +1696,14 @@ function installElementsForward(deps) {
     }
     wiredGuests.clear();
     detachSelfAttached();
+    if (lateCleanup) {
+      const c = lateCleanup;
+      lateCleanup = null;
+      try {
+        c();
+      } catch {
+      }
+    }
   };
   function detachSelfAttached() {
     for (const wcId of selfAttached) {
@@ -1908,46 +1913,26 @@ function installElementsForward(deps) {
   const unsubscribeRenderEvents = bridge.onRenderEvent(onRenderEvent);
   const onReady = () => {
     if (disposed) return;
-    if (installTimer) {
-      clearInterval(installTimer);
-      installTimer = null;
-    }
-    if (drainTimer) {
-      clearInterval(drainTimer);
-      drainTimer = null;
+    if (reconcileTimer) {
+      clearInterval(reconcileTimer);
+      reconcileTimer = null;
     }
-    let tries = 0;
-    installTimer = setInterval(() => {
-      tries++;
+    reconcileTimer = setInterval(() => {
       if (disposed || devtoolsWc.isDestroyed()) {
         stop();
         return;
       }
-      devtoolsWc.executeJavaScript(buildElementsHookScript()).then((status2) => {
+      devtoolsWc.executeJavaScript(buildReconcileScript()).then((res) => {
         if (disposed) return;
-        if (status2 === "installed" || status2 === "already") {
-          if (installTimer) {
-            clearInterval(installTimer);
-            installTimer = null;
-          }
+        const r = res ?? {};
+        if (r.status === "installed") {
           const wc = activeRenderWc();
           if (wc) primeGuest(wc);
           pushDocumentUpdated();
         }
+        handleOutbound(r.batch);
       }).catch(() => {
       });
-      if (tries > INSTALL_POLL_TRIES && installTimer) {
-        clearInterval(installTimer);
-        installTimer = null;
-      }
-    }, INSTALL_POLL_INTERVAL_MS);
-    drainTimer = setInterval(() => {
-      if (disposed || devtoolsWc.isDestroyed()) {
-        stop();
-        return;
-      }
-      devtoolsWc.executeJavaScript("(globalThis.__diminaElementsOutbound ? __diminaElementsOutbound.splice(0) : [])").then(handleOutbound).catch(() => {
-      });
     }, DRAIN_INTERVAL_MS);
   };
   devtoolsWc.on("dom-ready", onReady);
@@ -1958,7 +1943,7 @@ function installElementsForward(deps) {
     else devtoolsWc.once("destroyed", stop);
   } catch {
   }
-  return () => {
+  lateCleanup = () => {
     try {
       unsubscribeRenderEvents();
     } catch {
@@ -1971,8 +1956,8 @@ function installElementsForward(deps) {
       devtoolsWc.removeListener("dom-ready", onReady);
     } catch {
     }
-    stop();
   };
+  return stop;
 }
 
 // src/main/services/service-console/console-api.ts
@@ -2190,15 +2175,15 @@ function createSimulatorApiRegistry() {
 import * as electron from "electron";
 var SHARED_MINIAPP_PARTITION = "persist:simulator";
 var PARTITION_PREFIX = "persist:miniapp-";
-function miniappPartitionKey(appId) {
+function miniappPartitionKey(appId, projectPath) {
   const safe = appId.replace(/[^A-Za-z0-9_-]/g, "");
-  if (safe === appId && safe.length > 0) return safe;
-  const hash = djb2(appId).toString(36);
-  return safe.length > 0 ? `${safe}-${hash}` : hash;
+  const base = safe === appId && safe.length > 0 ? safe : safe.length > 0 ? `${safe}-${djb2(appId).toString(36)}` : djb2(appId).toString(36);
+  if (!projectPath) return base;
+  return `${base}-p${djb2(projectPath).toString(36)}`;
 }
-function miniappPartition(appId) {
+function miniappPartition(appId, projectPath) {
   if (!appId) return SHARED_MINIAPP_PARTITION;
-  return `${PARTITION_PREFIX}${miniappPartitionKey(appId)}`;
+  return `${PARTITION_PREFIX}${miniappPartitionKey(appId, projectPath)}`;
 }
 function djb2(input) {
   let h = 5381;
@@ -2802,13 +2787,17 @@ function createViewManager(ctx) {
   }
   const openInEditorWiredWcIds = /* @__PURE__ */ new Set();
   function injectOpenResourceHandler(serviceWc, devtoolsWc) {
-    const sourceContext = projectSourceContextFromServiceHostUrl(
-      serviceWc.getURL(),
-      ctx.workspace?.getProjectPath?.()
-    );
-    if (!sourceContext) return;
-    devtoolsWc.executeJavaScript(buildDevtoolsProjectSourceLinksScript(sourceContext)).catch(() => {
-    });
+    if (serviceWc.isDestroyed() || devtoolsWc.isDestroyed()) return;
+    try {
+      const sourceContext = projectSourceContextFromServiceHostUrl(
+        serviceWc.getURL(),
+        ctx.workspace?.getProjectPath?.()
+      );
+      if (!sourceContext) return;
+      devtoolsWc.executeJavaScript(buildDevtoolsProjectSourceLinksScript(sourceContext)).catch(() => {
+      });
+    } catch {
+    }
   }
   function customizeDevtoolsTabs(devtoolsWc) {
     try {
@@ -2938,13 +2927,14 @@ function createViewManager(ctx) {
         stopElementsForward?.();
       } catch {
       }
-      stopElementsForward = installElementsForward({ devtoolsWc, bridge: ctx.bridge, connections: ctx.connections });
+      const thisForward = installElementsForward({ devtoolsWc, bridge: ctx.bridge, connections: ctx.connections });
+      stopElementsForward = thisForward;
       devtoolsWc.once("destroyed", () => {
         try {
-          stopElementsForward?.();
+          thisForward();
         } catch {
         }
-        stopElementsForward = null;
+        if (stopElementsForward === thisForward) stopElementsForward = null;
       });
     }
     devtoolsWc.once("dom-ready", () => {
@@ -2987,6 +2977,24 @@ function createViewManager(ctx) {
       nativeCustomApiBridgeHandler = null;
     }
   }
+  function tearDownNativeSimulatorView(label) {
+    if (!nativeSimulatorView) return;
+    if (nativeSimulatorViewAdded && !ctx.windows.mainWindow.isDestroyed()) {
+      try {
+        ctx.windows.mainWindow.contentView.removeChildView(nativeSimulatorView);
+      } catch {
+      }
+    }
+    try {
+      if (!nativeSimulatorView.webContents.isDestroyed()) {
+        ctx.bridge?.disposeSessionsForSimulator?.(nativeSimulatorView.webContents.id)?.catch((err) => console.warn(`[view-manager] dispose sessions (${label}) failed:`, err));
+        nativeSimulatorView.webContents.close();
+      }
+    } catch {
+    }
+    nativeSimulatorView = null;
+    nativeSimulatorViewAdded = false;
+  }
   function attachNativeCustomApiBridge(simWc) {
     detachNativeCustomApiBridge();
     const apis = ctx.simulatorApis;
@@ -3015,27 +3023,14 @@ function createViewManager(ctx) {
     settleNativeSimulatorReady = null;
     if (nativeSimulatorView) {
       detachNativeCustomApiBridge();
-      if (nativeSimulatorViewAdded) {
-        try {
-          ctx.windows.mainWindow.contentView.removeChildView(nativeSimulatorView);
-        } catch {
-        }
-        nativeSimulatorViewAdded = false;
-      }
-      try {
-        if (!nativeSimulatorView.webContents.isDestroyed()) {
-          nativeSimulatorView.webContents.close();
-        }
-      } catch {
-      }
-      nativeSimulatorView = null;
+      tearDownNativeSimulatorView("relaunch");
     }
     nativeSimulatorProjectPath = null;
     const ready = new Promise((resolve) => {
       settleNativeSimulatorReady = resolve;
     });
     const route = parseRoute(simulatorUrl);
-    const partition = miniappPartition(route?.appId);
+    const partition = miniappPartition(route?.appId, ctx.workspace?.getProjectPath());
     configureMiniappSession(partition);
     const view = new WebContentsView2({
       webPreferences: {
@@ -3145,22 +3140,7 @@ function createViewManager(ctx) {
     stopElementsForward = null;
     ctx.networkForward?.detachSimulator();
     ctx.networkForward?.setDevtoolsHost(null);
-    if (nativeSimulatorView) {
-      if (nativeSimulatorViewAdded && !ctx.windows.mainWindow.isDestroyed()) {
-        try {
-          ctx.windows.mainWindow.contentView.removeChildView(nativeSimulatorView);
-        } catch {
-        }
-      }
-      try {
-        if (!nativeSimulatorView.webContents.isDestroyed()) {
-          nativeSimulatorView.webContents.close();
-        }
-      } catch {
-      }
-      nativeSimulatorView = null;
-      nativeSimulatorViewAdded = false;
-    }
+    tearDownNativeSimulatorView("close");
     hidePopover();
     destroyViewInternal(settingsView);
     settingsView = null;
@@ -3616,13 +3596,38 @@ function getSimulatorServicewechatReferer() {
   return cachedRefererUrl;
 }
 
+// src/main/services/workspace/op-lock.ts
+function createOpLock() {
+  let chain = Promise.resolve();
+  let requestSeq = 0;
+  let ownerSeq = 0;
+  return {
+    nextSeq: () => ++requestSeq,
+    takeOwnership: (seq) => {
+      if (seq > ownerSeq) ownerSeq = seq;
+    },
+    isOwner: (seq) => seq === ownerSeq,
+    acquire: () => {
+      let release;
+      const next = new Promise((resolve) => {
+        release = resolve;
+      });
+      const prior = chain;
+      chain = prior.then(() => next);
+      return prior.then(() => release);
+    }
+  };
+}
+
 // src/main/services/workspace/workspace-service.ts
-var SessionAppInfoSchema = z2.looseObject({ appId: z2.string() });
+var SessionAppInfoSchema = z2.looseObject({ appId: z2.string().min(1) });
 function createWorkspaceService(ctx) {
   let currentSession = null;
   let currentProjectPath = "";
+  let closing = false;
   let lastClosedProjectPath = "";
   let logGeneration = 0;
+  const opLock = createOpLock();
   function sendStatus(status2, message, hotReload) {
     ctx.notify.projectStatus(hotReload ? { status: status2, message, hotReload: true } : { status: status2, message });
   }
@@ -3648,6 +3653,65 @@ function createWorkspaceService(ctx) {
       console.error("[workspace] session close failed:", err);
     }
   }
+  async function runOpenTeardown(mySeq) {
+    const release = await opLock.acquire();
+    try {
+      if (!opLock.isOwner(mySeq)) return true;
+      clearSimulatorServicewechatReferer();
+      if (currentSession !== null) {
+        ctx.views.detachWorkbench();
+        ctx.views.detachSimulator();
+      }
+      logGeneration++;
+      await disposeSession();
+      currentProjectPath = "";
+      lastClosedProjectPath = "";
+      return false;
+    } finally {
+      release();
+    }
+  }
+  async function runOpenCommit(mySeq, session5, projectPath) {
+    const release = await opLock.acquire();
+    try {
+      if (!opLock.isOwner(mySeq)) return false;
+      currentSession = session5;
+      currentProjectPath = projectPath;
+      return true;
+    } finally {
+      release();
+    }
+  }
+  async function runCompile(projectPath, sessionGeneration) {
+    const { compile } = loadWorkbenchSettings();
+    try {
+      const session5 = await ctx.adapter.openProject({
+        projectPath,
+        sourcemap: true,
+        fileTypes: ctx.fileTypes,
+        watch: compile.watch,
+        onRebuild: () => sendStatus("ready", "\u7F16\u8BD1\u5B8C\u6210\uFF0C\u5DF2\u70ED\u66F4\u65B0", true),
+        onBuildError: (err) => sendStatus("error", String(err)),
+        onLog: (entry) => {
+          if (sessionGeneration !== logGeneration) return;
+          ctx.notify.compileLog({ stream: entry.stream, text: entry.text, at: Date.now() });
+        }
+      });
+      return { session: session5 };
+    } catch (err) {
+      clearSimulatorServicewechatReferer();
+      return { error: String(err) };
+    }
+  }
+  async function rejectInvalidAppId(session5) {
+    if (SessionAppInfoSchema.safeParse(session5.appInfo).success) return null;
+    try {
+      await session5.close();
+    } catch (closeErr) {
+      console.warn("[workspace] closing appId-less adapter session failed (non-fatal):", closeErr);
+    }
+    return "adapter returned session.appInfo without a string appId \u2014 the CompilationAdapter must supply appInfo.appId";
+  }
   function applyRefererFromSession(session5) {
     const appInfo = session5.appInfo;
     if (appInfo && typeof appInfo.appId === "string" && appInfo.appId.length > 0) {
@@ -3670,6 +3734,7 @@ function createWorkspaceService(ctx) {
     },
     validateProjectDir: async (dirPath) => provider.validateProjectDir ? provider.validateProjectDir(dirPath) : null,
     async openProject(projectPath) {
+      const mySeq = opLock.nextSeq();
       if (ctx.onBeforeOpenProject) {
         try {
           await ctx.onBeforeOpenProject(projectPath);
@@ -3679,65 +3744,36 @@ function createWorkspaceService(ctx) {
           return { success: false, error };
         }
       }
-      clearSimulatorServicewechatReferer();
-      if (currentSession !== null) {
-        ctx.views.detachWorkbench();
+      opLock.takeOwnership(mySeq);
+      if (await runOpenTeardown(mySeq)) {
+        return { success: false, error: "superseded by a newer project open/close" };
       }
-      logGeneration++;
-      await disposeSession();
-      currentProjectPath = "";
-      lastClosedProjectPath = "";
       const dirError = provider.validateProjectDir ? await provider.validateProjectDir(projectPath) : null;
       if (dirError) {
         sendStatus("error", dirError);
         return { success: false, error: dirError };
       }
       sendStatus("compiling", "\u6B63\u5728\u7F16\u8BD1...");
-      const { compile } = loadWorkbenchSettings();
       const sessionGeneration = ++logGeneration;
-      let session5;
-      try {
-        session5 = await ctx.adapter.openProject({
-          projectPath,
-          sourcemap: true,
-          watch: compile.watch,
-          onRebuild: () => sendStatus("ready", "\u7F16\u8BD1\u5B8C\u6210\uFF0C\u5DF2\u70ED\u66F4\u65B0", true),
-          onBuildError: (err) => sendStatus("error", String(err)),
-          // Per-line dmcc log (already filtered in devkit). Stamp the
-          // wall-clock capture time here and push verbatim on the dedicated
-          // compile-log channel — never through projectStatus, whose
-          // one-event-per-payload contract feeds compileEvents. Stale lines
-          // (a closed/replaced session's worker flushing its buffers) are
-          // dropped via the generation check.
-          onLog: (entry) => {
-            if (sessionGeneration !== logGeneration) return;
-            ctx.notify.compileLog({
-              stream: entry.stream,
-              text: entry.text,
-              at: Date.now()
-            });
-          }
-        });
-      } catch (err) {
-        clearSimulatorServicewechatReferer();
-        sendStatus("error", String(err));
-        return { success: false, error: String(err) };
-      }
-      if (!SessionAppInfoSchema.safeParse(session5.appInfo).success) {
+      const compiled = await runCompile(projectPath, sessionGeneration);
+      if ("error" in compiled) {
+        sendStatus("error", compiled.error);
+        return { success: false, error: compiled.error };
+      }
+      const session5 = compiled.session;
+      const appIdError = await rejectInvalidAppId(session5);
+      if (appIdError) {
+        sendStatus("error", appIdError);
+        return { success: false, error: appIdError };
+      }
+      if (!await runOpenCommit(mySeq, session5, projectPath)) {
         try {
           await session5.close();
         } catch (closeErr) {
-          console.warn(
-            "[workspace] closing appId-less adapter session failed (non-fatal):",
-            closeErr
-          );
+          console.warn("[workspace] closing superseded open session failed (non-fatal):", closeErr);
         }
-        const error = "adapter returned session.appInfo without a string appId \u2014 the CompilationAdapter must supply appInfo.appId";
-        sendStatus("error", error);
-        return { success: false, error };
+        return { success: false, error: "superseded by a newer project open/close" };
       }
-      currentSession = session5;
-      currentProjectPath = projectPath;
       bestEffort("updateLastOpened", () => {
         if (provider.updateLastOpened) provider.updateLastOpened(projectPath);
       });
@@ -3750,26 +3786,43 @@ function createWorkspaceService(ctx) {
       };
     },
     async closeProject() {
-      logGeneration++;
-      clearSimulatorServicewechatReferer();
-      await disposeSession();
-      if (currentProjectPath !== "") lastClosedProjectPath = currentProjectPath;
-      currentProjectPath = "";
-      ctx.views.disposeAll();
+      const mySeq = opLock.nextSeq();
+      opLock.takeOwnership(mySeq);
+      const release = await opLock.acquire();
+      try {
+        if (!opLock.isOwner(mySeq)) return;
+        closing = true;
+        logGeneration++;
+        clearSimulatorServicewechatReferer();
+        await disposeSession();
+        if (currentProjectPath !== "") lastClosedProjectPath = currentProjectPath;
+        currentProjectPath = "";
+        ctx.views.disposeAll();
+      } finally {
+        closing = false;
+        release();
+      }
     },
     getSession: () => currentSession,
     getProjectPath: () => currentProjectPath,
     getLastClosedProjectPath: () => lastClosedProjectPath,
     hasActiveSession: () => currentSession !== null,
+    isClosing: () => closing,
     async captureThumbnail(projectPath) {
       if (!currentSession || projectPath !== currentProjectPath) return null;
-      const wc = ctx.views.getSimulatorWebContents();
-      if (!wc) return null;
+      const simulatorWc = ctx.views.getSimulatorWebContents();
+      if (!simulatorWc) return null;
       if (ctx.views.getSimulatorProjectPath() !== projectPath) return null;
       const session5 = currentSession;
+      const bridge = ctx.bridge;
+      const nativeHost = bridge?.isNativeHost() ?? false;
+      const renderGuest = nativeHost ? bridge?.getActiveRenderWc() ?? null : null;
+      if (nativeHost && !renderGuest) return null;
+      const captureTarget = renderGuest ?? simulatorWc;
+      if (captureTarget.isDestroyed()) return null;
       try {
-        const image = await wc.capturePage();
-        if (currentSession !== session5 || currentProjectPath !== projectPath || ctx.views.getSimulatorWebContents() !== wc || ctx.views.getSimulatorProjectPath() !== projectPath) {
+        const image = await captureTarget.capturePage();
+        if (currentSession !== session5 || currentProjectPath !== projectPath || ctx.views.getSimulatorWebContents() !== simulatorWc || ctx.views.getSimulatorProjectPath() !== projectPath || (nativeHost ? bridge?.getActiveRenderWc() ?? null : simulatorWc) !== captureTarget) {
           return null;
         }
         const dataUrl = `data:image/png;base64,${image.toPNG().toString("base64")}`;
@@ -3900,6 +3953,7 @@ function createWorkbenchContext(opts) {
     preloadPath: opts.preloadPath,
     rendererDir: opts.rendererDir,
     apiNamespaces: opts.apiNamespaces ?? [],
+    fileTypes: opts.fileTypes ?? {},
     appName: opts.appName ?? "Dimina DevTools",
     brandingProvider: opts.brandingProvider
   };
@@ -4702,12 +4756,15 @@ function navigateServiceHost(win, url) {
   }
   return loaded;
 }
-function serviceHostSpec(appId) {
+function serviceHostSpec(appId, projectPath) {
   return {
     // Per-project partition when an appId is known (so this project's service
     // host shares storage ONLY with its own render side); the shared partition
     // for the pre-warm pool's default spec (no appId — see KNOWN BLOCKER below).
-    partition: appId ? miniappPartition(appId) : SERVICE_HOST_PARTITION,
+    // projectPath joins the key so same-appId/different-path projects isolate;
+    // it must match the simulator WCV's partition (view-manager passes the same
+    // (appId, projectPath)).
+    partition: appId ? miniappPartition(appId, projectPath) : SERVICE_HOST_PARTITION,
     preloadPath: serviceHostPreloadPath,
     size: { width: 980, height: 720 },
     contextIsolation: false,
@@ -4717,7 +4774,7 @@ function serviceHostSpec(appId) {
   };
 }
 function createServiceHostWindow(opts) {
-  const win = constructServiceHostWindow({ appId: opts.appId, partition: miniappPartition(opts.appId) });
+  const win = constructServiceHostWindow({ appId: opts.appId, partition: miniappPartition(opts.appId, opts.projectPath) });
   void navigateServiceHost(win, buildServiceHostSpawnUrl(opts));
   return win;
 }
@@ -5625,9 +5682,14 @@ function resolveCurrentApp(state, ctx, appId) {
     for (const ap of state.appSessions.values()) if (ap.appId === activeAppId) match = ap;
     if (match) return match;
   }
+  if (ctx.workspace?.isClosing?.()) return void 0;
   let last;
-  for (const ap of state.appSessions.values()) last = ap;
-  return last;
+  const distinctAppIds = /* @__PURE__ */ new Set();
+  for (const ap of state.appSessions.values()) {
+    last = ap;
+    distinctAppIds.add(ap.appId);
+  }
+  return distinctAppIds.size <= 1 ? last : void 0;
 }
 function installBridgeRouter(ctx) {
   const state = {
@@ -5731,6 +5793,14 @@ function installBridgeRouter(ctx) {
         }
       }
     },
+    disposeSessionsForSimulator: (simulatorWcId) => {
+      const ids = [];
+      for (const [id, ap] of state.appSessions) {
+        if (ap.simulatorWc.id === simulatorWcId) ids.push(id);
+      }
+      return Promise.all(ids.map((id) => disposeAppSession(state, id))).then(() => {
+      });
+    },
     debugTap: state.debugTap
   };
   ctx.bridge = bridgeHandle;
@@ -5944,6 +6014,13 @@ async function handleSpawn(state, ctx, event, opts) {
     serviceWindow = createServiceHostWindow({
       bridgeId,
       appId,
+      // Same (appId, projectPath) pair the simulator WCV uses, so this project's
+      // service host and render guests land on ONE partition while a different
+      // project with the same appId is isolated. Use the path captured at spawn
+      // ENTRY (workspaceProjectPath), not a re-read: a project switch during the
+      // awaits above would otherwise give the service host a different path than
+      // the simulator WCV was built with, splitting the partition.
+      projectPath: workspaceProjectPath || void 0,
       pagePath,
       pkgRoot,
       root,
@@ -6004,6 +6081,9 @@ async function handleSpawn(state, ctx, event, opts) {
     void disposeAppSession(state, appSessionId);
   };
   simulatorWc.once("destroyed", onSimulatorDestroyed);
+  if (simulatorWc.isDestroyed()) {
+    void disposeAppSession(state, appSessionId);
+  }
   if (usedPool) {
     const bootOnServiceLoad = () => {
       if (serviceWindow.isDestroyed()) return;
@@ -6518,6 +6598,10 @@ async function disposeAppSession(state, appSessionId, opts = {}) {
   for (const page of ap.pages.values()) {
     if (page.renderWc && !page.renderWc.isDestroyed()) {
       state.wcIdToBridgeId.delete(page.renderWc.id);
+      try {
+        page.renderWc.close();
+      } catch {
+      }
     }
     state.pageSessions.delete(page.bridgeId);
   }
@@ -9792,6 +9876,10 @@ async function startWorkbenchCoiServer(options) {
       });
       return;
     }
+    if (url.pathname === "/__filetypes") {
+      jsonRes(res, 200, options.getFileTypes?.() ?? {});
+      return;
+    }
     if (url.pathname.startsWith("/__contrib/")) {
       if (!contribRoot) {
         res.writeHead(404);
@@ -10017,6 +10105,7 @@ function createContext(config, mainWindow, rendererDir2) {
     rendererDir: rendererDir2,
     appName: config.appName,
     apiNamespaces: config.apiNamespaces,
+    fileTypes: config.fileTypes,
     brandingProvider: config.brandingProvider,
     // The host-supplied ProjectsProvider / template types in `shared/types`
     // are structurally compatible with the main-process equivalents —
@@ -10291,7 +10380,8 @@ async function createDevtoolsRuntime(config = {}) {
     const coiServer = await startWorkbenchCoiServer({
       rootDir: bundleDir,
       getProjectRoot: () => context.workspace.getProjectPath(),
-      extensionsDir: config.editorViewConfig?.extensionsDir
+      extensionsDir: config.editorViewConfig?.extensionsDir,
+      getFileTypes: () => context.fileTypes
     });
     context.registry.add(() => coiServer.close());
     context.registry.add(() => context.views.detachWorkbench());