@dimina-kit/devtools 0.3.1-dev.20260518114324 → 0.3.2-dev.20260522085907

package/dist/main/index.bundle.js

@@ -1,6 +1,10 @@
 // src/main/app/bootstrap.ts
 import { app as app2 } from "electron";
 
+// src/shared/constants.ts
+var DEFAULT_CDP_PORT = 9222;
+var DEFAULT_SCENE = 1001;
+
 // src/main/services/settings/index.ts
 import { app, nativeTheme } from "electron";
 import fs from "fs";
@@ -8,7 +12,7 @@ import path from "path";
 var DEFAULTS = {
   cdp: {
     enabled: false,
-    port: 9222
+    port: DEFAULT_CDP_PORT
   },
   mcp: {
     enabled: false,
@@ -70,12 +74,12 @@ function setupCdpPort() {
   if (settings.cdp.enabled || settings.mcp.enabled) {
     app2.commandLine.appendSwitch("remote-debugging-port", String(settings.cdp.port));
   } else if (!app2.isPackaged) {
-    app2.commandLine.appendSwitch("remote-debugging-port", String(settings.cdp.port || 9222));
+    app2.commandLine.appendSwitch("remote-debugging-port", String(settings.cdp.port || DEFAULT_CDP_PORT));
   }
 }
 
 // src/main/app/app.ts
-import { app as app13, BrowserWindow as BrowserWindow3, nativeImage } from "electron";
+import { app as app13, BrowserWindow as BrowserWindow4, nativeImage } from "electron";
 import fs7 from "fs";
 import path12 from "path";
 
@@ -103,6 +107,83 @@ var defaultPreloadPath = path2.join(devtoolsPackageRoot, "dist/preload/windows/s
 var mainPreloadPath = path2.join(devtoolsPackageRoot, "dist/preload/windows/main.cjs");
 var simulatorDir = path2.join(devtoolsPackageRoot, "dist/simulator");
 
+// src/main/utils/theme.ts
+import { BrowserWindow, nativeTheme as nativeTheme2 } from "electron";
+
+// src/main/utils/disposable.ts
+function toDisposable(fn) {
+  let done = false;
+  return {
+    dispose() {
+      if (done) return;
+      done = true;
+      return fn();
+    }
+  };
+}
+var DisposableRegistry = class {
+  entries = [];
+  _disposed = false;
+  add(d) {
+    if (this._disposed) {
+      throw new Error("cannot add to disposed registry");
+    }
+    const fn = typeof d === "function" ? d : () => d.dispose();
+    const entry = { fn, released: false };
+    this.entries.push(entry);
+    return {
+      dispose: () => {
+        if (entry.released) return;
+        entry.released = true;
+        const i = this.entries.indexOf(entry);
+        if (i >= 0) this.entries.splice(i, 1);
+        return fn();
+      }
+    };
+  }
+  async disposeAll() {
+    if (this._disposed) return;
+    this._disposed = true;
+    const items = this.entries.slice().reverse();
+    this.entries = [];
+    const errors = [];
+    for (const entry of items) {
+      if (entry.released) continue;
+      entry.released = true;
+      try {
+        await entry.fn();
+      } catch (e) {
+        errors.push(e);
+      }
+    }
+    if (errors.length > 0) {
+      throw new AggregateError(errors, "DisposableRegistry encountered errors during disposeAll");
+    }
+  }
+  dispose() {
+    return this.disposeAll();
+  }
+};
+
+// src/main/utils/theme.ts
+function themeBg() {
+  return nativeTheme2.shouldUseDarkColors ? "#1a1a1a" : "#fafafa";
+}
+function installThemeBackgroundSync() {
+  const apply = () => {
+    const bg = themeBg();
+    for (const win of BrowserWindow.getAllWindows()) {
+      if (!win.isDestroyed()) {
+        win.setBackgroundColor(bg);
+      }
+    }
+  };
+  nativeTheme2.on("updated", apply);
+  return toDisposable(() => {
+    nativeTheme2.removeListener("updated", apply);
+  });
+}
+
 // src/main/app/lifecycle.ts
 import { app as app3, globalShortcut } from "electron";
 function registerAppLifecycle() {
@@ -116,7 +197,7 @@ function registerAppLifecycle() {
 }
 
 // src/main/windows/main-window/create.ts
-import { app as app4, BrowserWindow, View, session, shell as shell2 } from "electron";
+import { app as app4, BrowserWindow as BrowserWindow2, View, session, shell as shell2 } from "electron";
 import path4 from "path";
 
 // src/main/services/simulator/referer.ts
@@ -138,12 +219,6 @@ function getSimulatorServicewechatReferer() {
   return cachedRefererUrl;
 }
 
-// src/main/utils/theme.ts
-import { nativeTheme as nativeTheme2 } from "electron";
-function themeBg() {
-  return nativeTheme2.shouldUseDarkColors ? "#1a1a1a" : "#fafafa";
-}
-
 // src/main/windows/navigation-hardening.ts
 import { shell } from "electron";
 import path3 from "path";
@@ -208,7 +283,7 @@ function configureSimulatorSession(simulatorPreloadPath) {
 }
 function createMainWindow(opts) {
   configureSimulatorSession(opts.simulatorPreloadPath);
-  const mainWindow = new BrowserWindow({
+  const mainWindow = new BrowserWindow2({
     width: opts.width ?? 1280,
     height: opts.height ?? 980,
     minWidth: opts.minWidth ?? 1e3,
@@ -274,63 +349,6 @@ function createMainWindow(opts) {
 
 // src/main/windows/main-window/events.ts
 import { globalShortcut as globalShortcut2 } from "electron";
-
-// src/main/utils/disposable.ts
-function toDisposable(fn) {
-  let done = false;
-  return {
-    dispose() {
-      if (done) return;
-      done = true;
-      return fn();
-    }
-  };
-}
-var DisposableRegistry = class {
-  entries = [];
-  _disposed = false;
-  add(d) {
-    if (this._disposed) {
-      throw new Error("cannot add to disposed registry");
-    }
-    const fn = typeof d === "function" ? d : () => d.dispose();
-    const entry = { fn, released: false };
-    this.entries.push(entry);
-    return {
-      dispose: () => {
-        if (entry.released) return;
-        entry.released = true;
-        const i = this.entries.indexOf(entry);
-        if (i >= 0) this.entries.splice(i, 1);
-        return fn();
-      }
-    };
-  }
-  async disposeAll() {
-    if (this._disposed) return;
-    this._disposed = true;
-    const items = this.entries.slice().reverse();
-    this.entries = [];
-    const errors = [];
-    for (const entry of items) {
-      if (entry.released) continue;
-      entry.released = true;
-      try {
-        await entry.fn();
-      } catch (e) {
-        errors.push(e);
-      }
-    }
-    if (errors.length > 0) {
-      throw new AggregateError(errors, "DisposableRegistry encountered errors during disposeAll");
-    }
-  }
-  dispose() {
-    return this.disposeAll();
-  }
-};
-
-// src/main/windows/main-window/events.ts
 function wireMainWindowEvents(win, state = {}) {
   const registry = new DisposableRegistry();
   const mainWebView = win.contentView.children[0];
@@ -387,12 +405,12 @@ import { app as app5 } from "electron";
 var defaultAdapter = {
   async openProject(opts) {
     const diminaKit = await import("@dimina-kit/devkit");
-    const openProject = diminaKit.openProject;
-    return openProject({
+    const openProjectOpts = {
       outputDir: path5.join(app5.getPath("userData"), "dimina-fe-output"),
       ...opts,
       simulatorDir
-    });
+    };
+    return diminaKit.openProject(openProjectOpts);
   }
 };
 
@@ -402,10 +420,7 @@ var SimulatorChannel = {
   Detach: "simulator:detach",
   Resize: "simulator:resize",
   SetVisible: "simulator:setVisible",
-  Console: "simulator:console",
-  Wxml: "simulator:wxml",
-  AppData: "simulator:appdata",
-  AppDataAll: "simulator:appdata-all"
+  Console: "simulator:console"
 };
 var SimulatorCustomApiChannel = {
   List: "simulator:custom-apis:list",
@@ -424,16 +439,12 @@ var SimulatorElementChannel = {
   Inspect: "simulator:element:inspect",
   Clear: "simulator:element:clear"
 };
-var WorkbenchChannel = {
-  GetPanelConfig: "workbench:getPanelConfig",
-  GetApiNamespaces: "workbench:getApiNamespaces",
-  Reset: "workbench:reset"
-};
 var WorkbenchSettingsChannel = {
   Get: "workbenchSettings:get",
   Save: "workbenchSettings:save",
   SetTheme: "workbenchSettings:setTheme",
   GetCdpStatus: "workbenchSettings:getCdpStatus",
+  GetMcpStatus: "workbenchSettings:getMcpStatus",
   SetVisible: "workbenchSettings:setVisible",
   Init: "workbenchSettings:init"
 };
@@ -516,8 +527,8 @@ function liveWebContents(wc) {
 }
 function createRendererNotifier(ctx) {
   function sendToMain(channel, ...args) {
-    if (ctx.mainWindow.isDestroyed()) return;
-    const wc = liveWebContents(ctx.mainWindow.webContents);
+    if (ctx.windows.mainWindow.isDestroyed()) return;
+    const wc = liveWebContents(ctx.windows.mainWindow.webContents);
     if (!wc) return;
     wc.send(channel, ...args);
   }
@@ -540,9 +551,6 @@ function createRendererNotifier(ctx) {
     popoverRelaunch(config) {
       sendToMain(PopoverChannel.Relaunch, config);
     },
-    workbenchReset() {
-      sendToMain(WorkbenchChannel.Reset);
-    },
     toolbarActionsChanged() {
       sendToMain(ToolbarChannel.ActionsChanged);
     },
@@ -616,9 +624,9 @@ function createViewManager(ctx) {
   let simulatorWebContentsId = null;
   function destroyViewInternal(view) {
     if (!view) return;
-    if (!ctx.mainWindow.isDestroyed()) {
+    if (!ctx.windows.mainWindow.isDestroyed()) {
       try {
-        ctx.mainWindow.contentView.removeChildView(view);
+        ctx.windows.mainWindow.contentView.removeChildView(view);
       } catch {
       }
     }
@@ -630,18 +638,18 @@ function createViewManager(ctx) {
     }
   }
   function applySimulatorBounds(simWidth) {
-    if (!simulatorView || ctx.mainWindow.isDestroyed()) return;
-    const [w = 0, h = 0] = ctx.mainWindow.getContentSize();
+    if (!simulatorView || ctx.windows.mainWindow.isDestroyed()) return;
+    const [w = 0, h = 0] = ctx.windows.mainWindow.getContentSize();
     simulatorView.setBounds(computeSimulatorBounds(w, h, simWidth));
   }
   function applySettingsBounds() {
-    if (!settingsView || ctx.mainWindow.isDestroyed()) return;
-    const [w = 0, h = 0] = ctx.mainWindow.getContentSize();
+    if (!settingsView || ctx.windows.mainWindow.isDestroyed()) return;
+    const [w = 0, h = 0] = ctx.windows.mainWindow.getContentSize();
     settingsView.setBounds(computeSettingsBounds(w, h));
   }
   function applyPopoverBounds() {
-    if (!popoverView || ctx.mainWindow.isDestroyed()) return;
-    const [w = 0, h = 0] = ctx.mainWindow.getContentSize();
+    if (!popoverView || ctx.windows.mainWindow.isDestroyed()) return;
+    const [w = 0, h = 0] = ctx.windows.mainWindow.getContentSize();
     popoverView.setBounds(computePopoverBounds(w, h));
   }
   function attachSimulator(simWcId, simWidth) {
@@ -689,7 +697,7 @@ function createViewManager(ctx) {
       });
     });
     if (getDefaultTab(ctx) === "simulator") {
-      ctx.mainWindow.contentView.addChildView(simulatorView);
+      ctx.windows.mainWindow.contentView.addChildView(simulatorView);
       simulatorViewAdded = true;
       applySimulatorBounds(simWidth);
     }
@@ -708,7 +716,7 @@ function createViewManager(ctx) {
     lastSimWidth = simWidth;
     if (!simulatorView) return;
     if (!simulatorViewAdded) {
-      ctx.mainWindow.contentView.addChildView(simulatorView);
+      ctx.windows.mainWindow.contentView.addChildView(simulatorView);
       simulatorViewAdded = true;
     }
     applySimulatorBounds(simWidth);
@@ -716,7 +724,7 @@ function createViewManager(ctx) {
   function hideSimulator() {
     if (simulatorView && simulatorViewAdded) {
       try {
-        ctx.mainWindow.contentView.removeChildView(simulatorView);
+        ctx.windows.mainWindow.contentView.removeChildView(simulatorView);
       } catch (e) {
         console.error("[workbench] hideSimulator error", e);
       }
@@ -739,7 +747,7 @@ function createViewManager(ctx) {
       );
     }
     if (!settingsViewAdded) {
-      ctx.mainWindow.contentView.addChildView(settingsView);
+      ctx.windows.mainWindow.contentView.addChildView(settingsView);
       settingsViewAdded = true;
     }
     applySettingsBounds();
@@ -747,7 +755,7 @@ function createViewManager(ctx) {
   function hideSettings() {
     if (settingsView && settingsViewAdded) {
       try {
-        ctx.mainWindow.contentView.removeChildView(settingsView);
+        ctx.windows.mainWindow.contentView.removeChildView(settingsView);
       } catch {
       }
       settingsViewAdded = false;
@@ -766,7 +774,7 @@ function createViewManager(ctx) {
     applyNavigationHardening(popover.webContents, ctx.rendererDir);
     popoverView = popover;
     popover.setBackgroundColor("#00000000");
-    ctx.mainWindow.contentView.addChildView(popover);
+    ctx.windows.mainWindow.contentView.addChildView(popover);
     applyPopoverBounds();
     popover.webContents.once("did-finish-load", () => {
       ctx.notify.popoverInit(popover, data);
@@ -793,14 +801,6 @@ function createViewManager(ctx) {
   function disposeAll() {
     detachSimulator();
   }
-  function logChildViews(_label) {
-  }
-  function positionSimulator(simWidth) {
-    applySimulatorBounds(simWidth);
-  }
-  function positionSettings() {
-    applySettingsBounds();
-  }
   function resize(simWidth) {
     lastSimWidth = simWidth;
     if (simulatorViewAdded) applySimulatorBounds(simWidth);
@@ -826,10 +826,12 @@ function createViewManager(ctx) {
     hidePopover,
     repositionAll,
     disposeAll,
-    logChildViews,
-    positionSimulator,
-    positionSettings,
     getSimulatorWebContentsId: () => simulatorWebContentsId,
+    getSimulatorWebContents: () => {
+      if (simulatorWebContentsId == null) return null;
+      const wc = webContents.fromId(simulatorWebContentsId);
+      return wc && !wc.isDestroyed() ? wc : null;
+    },
     getLastSimWidth: () => lastSimWidth,
     isSimulatorAdded: () => simulatorViewAdded,
     hasSimulatorView: () => simulatorView !== null,
@@ -879,17 +881,11 @@ function createWindowService(mainWindow) {
   };
 }
 
-// src/main/services/workspace/workspace-service.ts
-import { webContents as webContents2 } from "electron";
-
 // src/main/services/projects/project-repository.ts
 import { app as app6 } from "electron";
 import path7 from "path";
 import fs3 from "fs";
 
-// src/shared/constants.ts
-var DEFAULT_SCENE = 1001;
-
 // src/main/utils/logger.ts
 var LEVEL_PRIORITY = {
   debug: 0,
@@ -1077,8 +1073,8 @@ var DEFAULT_COMPILE_CONFIG = {
 function createWorkspaceService(ctx) {
   let currentSession = null;
   let currentProjectPath = "";
-  function sendStatus(status, message, hotReload) {
-    ctx.notify.projectStatus(hotReload ? { status, message, hotReload: true } : { status, message });
+  function sendStatus(status2, message, hotReload) {
+    ctx.notify.projectStatus(hotReload ? { status: status2, message, hotReload: true } : { status: status2, message });
   }
   function bestEffort(label, fn) {
     try {
@@ -1111,15 +1107,7 @@ function createWorkspaceService(ctx) {
       );
     }
   }
-  const provider = ctx.projectsProvider ?? {
-    listProjects: () => listProjects(),
-    addProject: (p) => addProject(p),
-    removeProject: (p) => removeProject(p),
-    validateProjectDir: (p) => validateProjectDir(p),
-    updateLastOpened: (p) => updateLastOpened(p),
-    getCompileConfig: (p) => getCompileConfig(p),
-    saveCompileConfig: (p, c) => saveCompileConfig(p, c)
-  };
+  const provider = ctx.projectsProvider;
   return {
     listProjects: async () => provider.listProjects(),
     addProject: async (dirPath) => provider.addProject(dirPath),
@@ -1179,10 +1167,8 @@ function createWorkspaceService(ctx) {
     getProjectPath: () => currentProjectPath,
     hasActiveSession: () => currentSession !== null,
     async captureThumbnail(projectPath) {
-      const simWcId = ctx.views.getSimulatorWebContentsId();
-      if (!simWcId) return null;
-      const wc = webContents2.fromId(simWcId);
-      if (!wc || wc.isDestroyed()) return null;
+      const wc = ctx.views.getSimulatorWebContents();
+      if (!wc) return null;
       try {
         const image = await wc.capturePage();
         const dataUrl = `data:image/png;base64,${image.toPNG().toString("base64")}`;
@@ -1317,7 +1303,6 @@ function getDefaultTab(ctx) {
 }
 function createWorkbenchContext(opts) {
   const ctx = {
-    mainWindow: opts.mainWindow,
     adapter: opts.adapter ?? defaultAdapter,
     preloadPath: opts.preloadPath,
     rendererDir: opts.rendererDir,
@@ -1325,11 +1310,10 @@ function createWorkbenchContext(opts) {
     apiNamespaces: opts.apiNamespaces ?? [],
     appName: opts.appName ?? "Dimina DevTools",
     toolbarActions: opts.toolbarActions,
-    brandingProvider: opts.brandingProvider,
-    workbenchSettingsWindow: null
+    brandingProvider: opts.brandingProvider
   };
   ctx.registry = new DisposableRegistry();
-  ctx.windows = createWindowService(ctx.mainWindow);
+  ctx.windows = createWindowService(opts.mainWindow);
   ctx.views = createViewManager(ctx);
   ctx.notify = createRendererNotifier(ctx);
   ctx.projectsProvider = opts.projectsProvider ?? createLocalProjectsProvider();
@@ -1644,17 +1628,10 @@ function registerSimulatorIpc(ctx) {
   }).handle(SimulatorCustomApiChannel.Invoke, (_, ...args) => {
     const [name, params] = validate(SimulatorCustomApiChannel.Invoke, SimulatorCustomApiInvokeSchema, args);
     return simulatorApiRegistry.invoke(name, params);
-  }).handle(WorkbenchChannel.GetPanelConfig, () => {
-    return ctx.panels;
-  }).handle(WorkbenchChannel.GetApiNamespaces, () => {
-    return ctx.apiNamespaces;
-  }).on(WorkbenchChannel.Reset, () => {
-    ctx.notify.workbenchReset();
   });
 }
 
 // src/main/ipc/panels.ts
-import { webContents as webContents3 } from "electron";
 var BUILTIN_PANELS = [
   { id: "wxml", label: "WXML" },
   { id: "appdata", label: "AppData" },
@@ -1665,10 +1642,9 @@ function registerPanelsIpc(ctx) {
     return BUILTIN_PANELS.filter((p) => ctx.panels.includes(p.id));
   }).handle(PanelChannel.Eval, async (_event, ...args) => {
     const [expression] = validate(PanelChannel.Eval, PanelEvalSchema, args);
-    const simWcId = ctx.views.getSimulatorWebContentsId();
-    if (!ctx.workspace.hasActiveSession() || simWcId == null) return void 0;
-    const sim = webContents3.fromId(simWcId);
-    if (!sim || sim.isDestroyed()) return void 0;
+    if (!ctx.workspace.hasActiveSession()) return void 0;
+    const sim = ctx.views.getSimulatorWebContents();
+    if (!sim) return void 0;
     try {
       return await sim.executeJavaScript(expression);
     } catch {
@@ -1776,7 +1752,7 @@ function registerProjectsIpc(ctx) {
   return new IpcRegistry(ctx.senderPolicy).handle(ProjectsChannel.List, () => {
     return ctx.workspace.listProjects();
   }).handle(DialogChannel.OpenDirectory, async () => {
-    const result = await dialog.showOpenDialog(ctx.mainWindow, {
+    const result = await dialog.showOpenDialog(ctx.windows.mainWindow, {
       properties: ["openDirectory"],
       title: "\u9009\u62E9\u5C0F\u7A0B\u5E8F\u9879\u76EE\u76EE\u5F55"
     });
@@ -1785,7 +1761,7 @@ function registerProjectsIpc(ctx) {
     const [dirPath] = validate(ProjectsChannel.Add, ProjectsAddSchema, args);
     const dirError = await ctx.workspace.validateProjectDir(dirPath);
     if (dirError) {
-      await dialog.showMessageBox(ctx.mainWindow, {
+      await dialog.showMessageBox(ctx.windows.mainWindow, {
         type: "error",
         title: "\u65E0\u6CD5\u5BFC\u5165\u9879\u76EE",
         message: "\u8BE5\u76EE\u5F55\u4E0D\u662F\u6709\u6548\u7684\u5C0F\u7A0B\u5E8F\u9879\u76EE",
@@ -1797,7 +1773,7 @@ function registerProjectsIpc(ctx) {
     const duplicate = await ctx.workspace.hasProject(dirPath);
     const project = await ctx.workspace.addProject(dirPath);
     if (duplicate) {
-      await dialog.showMessageBox(ctx.mainWindow, {
+      await dialog.showMessageBox(ctx.windows.mainWindow, {
         type: "info",
         title: "\u9879\u76EE\u5DF2\u5B58\u5728",
         message: "\u8BE5\u9879\u76EE\u5DF2\u5728\u5217\u8868\u4E2D",
@@ -1815,7 +1791,7 @@ function registerProjectsIpc(ctx) {
     if (!ctx.customCreateProjectDialog) return null;
     const sanitized = sanitizeTemplates(ctx.projectTemplates ?? []);
     return await ctx.customCreateProjectDialog({
-      parentWindow: ctx.mainWindow,
+      parentWindow: ctx.windows.mainWindow,
       templates: sanitized
     });
   }).handle(ProjectsChannel.Create, async (_event, ...args) => {
@@ -1831,7 +1807,7 @@ function registerProjectsIpc(ctx) {
         projectsProvider: ctx.projectsProvider
       });
     } catch (err) {
-      await dialog.showMessageBox(ctx.mainWindow, {
+      await dialog.showMessageBox(ctx.windows.mainWindow, {
         type: "error",
         title: "\u521B\u5EFA\u9879\u76EE\u5931\u8D25",
         message: "\u65E0\u6CD5\u521B\u5EFA\u9879\u76EE",
@@ -1913,6 +1889,23 @@ var sessionModule = {
 
 // src/main/ipc/settings.ts
 import { app as app9 } from "electron";
+
+// src/main/services/mcp/status.ts
+var status = { running: false, port: null, error: null };
+function getMcpStatus() {
+  return { ...status };
+}
+function recordMcpStarted(port) {
+  status = { running: true, port, error: null };
+}
+function recordMcpFailed(error) {
+  status = { running: false, port: null, error };
+}
+function recordMcpStopped() {
+  status = { running: false, port: null, error: null };
+}
+
+// src/main/ipc/settings.ts
 function registerSettingsIpc(ctx) {
   return new IpcRegistry(ctx.senderPolicy).handle(WorkbenchSettingsChannel.Get, () => {
     return loadWorkbenchSettings();
@@ -1935,7 +1928,7 @@ function registerSettingsIpc(ctx) {
   }).handle(WorkbenchSettingsChannel.GetCdpStatus, () => {
     const settings = loadWorkbenchSettings();
     const switchValue = app9.commandLine.getSwitchValue("remote-debugging-port");
-    const implicitDevDefault = !app9.isPackaged && !settings.cdp.enabled && switchValue === "9222";
+    const implicitDevDefault = !app9.isPackaged && !settings.cdp.enabled && switchValue === String(DEFAULT_CDP_PORT);
     return {
       configured: settings.cdp.enabled,
       port: settings.cdp.port,
@@ -1943,6 +1936,16 @@ function registerSettingsIpc(ctx) {
       activePort: switchValue ? parseInt(switchValue, 10) : null,
       implicitDevDefault
     };
+  }).handle(WorkbenchSettingsChannel.GetMcpStatus, () => {
+    const settings = loadWorkbenchSettings();
+    const runtime = getMcpStatus();
+    return {
+      configured: settings.mcp.enabled,
+      configuredPort: settings.mcp.port,
+      running: runtime.running,
+      activePort: runtime.port,
+      error: runtime.error
+    };
   }).handle(WorkbenchSettingsChannel.SetVisible, async (_, ...args) => {
     const [visible] = validate(
       WorkbenchSettingsChannel.SetVisible,
@@ -2018,13 +2021,9 @@ var simulatorModule = {
 import { WebSocketServer } from "ws";
 
 // src/main/services/automation/exec.ts
-import { webContents as webContents4 } from "electron";
 function getSimulator(ctx) {
-  const simWcId = ctx.views.getSimulatorWebContentsId();
-  if (!ctx.workspace.hasActiveSession() || simWcId == null) return null;
-  const sim = webContents4.fromId(simWcId);
-  if (!sim || sim.isDestroyed()) return null;
-  return sim;
+  if (!ctx.workspace.hasActiveSession()) return null;
+  return ctx.views.getSimulatorWebContents();
 }
 async function evalInSim(ctx, expression) {
   const sim = getSimulator(ctx);
@@ -2032,8 +2031,11 @@ async function evalInSim(ctx, expression) {
   return sim.executeJavaScript(expression);
 }
 function buildElAccess(ref, varName = "el") {
-  const escaped = ref.selector.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
-  return `const ${varName} = _doc.querySelectorAll('${escaped}')[${ref.index}]`;
+  return `const ${varName} = _doc.querySelectorAll(${JSON.stringify(ref.selector)})[${ref.index}]`;
+}
+function evalInElement(ctx, ref, body, varName = "el") {
+  return evalInSim(ctx, inIframe(`${buildElAccess(ref, varName)}
+${body}`));
 }
 function inIframe(code) {
   return `(() => {
@@ -2053,47 +2055,57 @@ toolHandlers["Tool.close"] = async (ctx) => {
   return {};
 };
 
+// src/shared/simulator-route.ts
+function decodePageSpec(value) {
+  const qIdx = value.indexOf("?");
+  if (qIdx < 0) return { pagePath: value, query: {} };
+  const pagePath = value.slice(0, qIdx);
+  const query = {};
+  for (const pair of value.slice(qIdx + 1).split("&")) {
+    if (!pair) continue;
+    const eqIdx = pair.indexOf("=");
+    const k = eqIdx >= 0 ? pair.slice(0, eqIdx) : pair;
+    const v = eqIdx >= 0 ? pair.slice(eqIdx + 1) : "";
+    if (k) query[decodeURIComponent(k)] = decodeURIComponent(v);
+  }
+  return { pagePath, query };
+}
+function parseLocationRoute(search) {
+  const params = new URLSearchParams(search.startsWith("?") ? search.slice(1) : search);
+  const appId = params.get("appId");
+  const entryRaw = params.get("entry");
+  if (!appId || !entryRaw) return null;
+  const entry = decodePageSpec(entryRaw);
+  const pageRaw = params.get("page");
+  const current = pageRaw && pageRaw !== entryRaw ? decodePageSpec(pageRaw) : entry;
+  return { appId, entry, current };
+}
+
 // src/main/services/automation/handlers/app.ts
 var appHandlers = {};
+async function readRoute(ctx) {
+  const { search } = await evalInSim(
+    ctx,
+    `({ search: location.search })`
+  );
+  return parseLocationRoute(search);
+}
 appHandlers["App.getCurrentPage"] = async (ctx) => {
-  const hash = await evalInSim(ctx, "location.hash");
-  const clean = hash.replace(/^#/, "");
-  const qIdx = clean.indexOf("?");
-  const pathPart = qIdx >= 0 ? clean.substring(0, qIdx) : clean;
-  const queryPart = qIdx >= 0 ? clean.substring(qIdx + 1) : "";
-  let pagePath;
-  if (pathPart.includes("|")) {
-    const parts = pathPart.split("|");
-    pagePath = parts[parts.length - 1] ?? "";
-  } else {
-    const slashIdx = pathPart.indexOf("/");
-    pagePath = slashIdx >= 0 ? pathPart.substring(slashIdx + 1) : pathPart;
-  }
-  const query = {};
-  if (queryPart) {
-    for (const pair of queryPart.split("&")) {
-      const [k, v] = pair.split("=");
-      if (k) query[k] = decodeURIComponent(v || "");
-    }
-  }
+  const route = await readRoute(ctx);
   const iframeCount = await evalInSim(ctx, `document.querySelectorAll('iframe').length`);
-  return { pageId: iframeCount, path: pagePath, query };
+  return {
+    pageId: iframeCount,
+    path: route?.current.pagePath ?? "",
+    query: route?.current.query ?? {}
+  };
 };
 appHandlers["App.getPageStack"] = async (ctx) => {
-  const hash = await evalInSim(ctx, "location.hash");
-  const clean = hash.replace(/^#/, "").replace(/\?.*$/, "");
+  const route = await readRoute(ctx);
   const pageStack = [];
-  if (clean.includes("|")) {
-    const parts = clean.split("|");
-    for (let i = 1; i < parts.length; i++) {
-      pageStack.push({ pageId: i, path: parts[i] ?? "", query: {} });
-    }
-  } else {
-    const slashIdx = clean.indexOf("/");
-    const currentPath = slashIdx >= 0 ? clean.substring(slashIdx + 1) : clean;
-    if (currentPath) {
-      pageStack.push({ pageId: 1, path: currentPath, query: {} });
-    }
+  if (!route) return { pageStack };
+  pageStack.push({ pageId: 1, path: route.entry.pagePath, query: route.entry.query });
+  if (route.current.pagePath !== route.entry.pagePath) {
+    pageStack.push({ pageId: 2, path: route.current.pagePath, query: route.current.query });
   }
   return { pageStack };
 };
@@ -2106,18 +2118,29 @@ appHandlers["App.callWxMethod"] = async (ctx, params) => {
     if (url) {
       const cleanUrl = url.startsWith("/") ? url : `/${url}`;
       const clicked = await evalInSim(ctx, inIframe(`
-        const el = _doc.querySelector('[data-path="${cleanUrl}"]')
+        const path = ${JSON.stringify(cleanUrl)}
+        const el = Array.from(_doc.querySelectorAll('[data-path]'))
+          .find(e => e.getAttribute('data-path') === path)
         if (el) { el.click(); return true }
         return false
       `)).catch(() => false);
       if (!clicked) {
-        const hash = await evalInSim(ctx, "location.hash");
-        const appId = hash.replace(/^#/, "").split("/")[0];
-        if (method === "reLaunch" || method === "redirectTo") {
-          await evalInSim(ctx, `location.href = location.pathname + '#${appId}${cleanUrl}'`);
-        } else {
-          await evalInSim(ctx, `location.hash = '#${appId}${cleanUrl}'`);
-        }
+        const apiName = JSON.stringify(method);
+        const urlJson = JSON.stringify(cleanUrl);
+        await evalInSim(
+          ctx,
+          `(() => {
+            const iframes = Array.from(document.querySelectorAll('iframe'))
+            for (const f of iframes) {
+              try {
+                if (f.contentWindow && f.contentWindow.wx && typeof f.contentWindow.wx[${apiName}] === 'function') {
+                  f.contentWindow.wx[${apiName}]({ url: ${urlJson} })
+                  return
+                }
+              } catch (_) {}
+            }
+          })()`
+        );
       }
       await new Promise((r) => setTimeout(r, 2e3));
     }
@@ -2252,109 +2275,97 @@ pageHandlers["Page.getWindowProperties"] = async (ctx, params) => {
 var elementHandlers = {};
 elementHandlers["Element.tap"] = async (ctx, params) => {
   const ref = getElementRef(params);
-  await evalInSim(ctx, inIframe(`
-    ${buildElAccess(ref)}
+  await evalInElement(ctx, ref, `
     if (!el) throw new Error('Element not found')
     el.click()
-  `));
+  `);
   return {};
 };
 elementHandlers["Element.triggerEvent"] = async (ctx, params) => {
   const ref = getElementRef(params);
   const type = params.type;
   const detail = params.detail || {};
-  await evalInSim(ctx, inIframe(`
-    ${buildElAccess(ref)}
+  await evalInElement(ctx, ref, `
     if (!el) throw new Error('Element not found')
     el.dispatchEvent(new CustomEvent('${type}', { detail: ${JSON.stringify(detail)}, bubbles: true }))
-  `));
+  `);
   return {};
 };
 elementHandlers["Element.touchstart"] = async (ctx, params) => {
   const ref = getElementRef(params);
-  await evalInSim(ctx, inIframe(`
-    ${buildElAccess(ref)}
+  await evalInElement(ctx, ref, `
     if (el) el.dispatchEvent(new TouchEvent('touchstart', { bubbles: true }))
-  `));
+  `);
   return {};
 };
 elementHandlers["Element.touchmove"] = async (ctx, params) => {
   const ref = getElementRef(params);
-  await evalInSim(ctx, inIframe(`
-    ${buildElAccess(ref)}
+  await evalInElement(ctx, ref, `
     if (el) el.dispatchEvent(new TouchEvent('touchmove', { bubbles: true }))
-  `));
+  `);
   return {};
 };
 elementHandlers["Element.touchend"] = async (ctx, params) => {
   const ref = getElementRef(params);
-  await evalInSim(ctx, inIframe(`
-    ${buildElAccess(ref)}
+  await evalInElement(ctx, ref, `
     if (el) el.dispatchEvent(new TouchEvent('touchend', { bubbles: true }))
-  `));
+  `);
   return {};
 };
 elementHandlers["Element.getDOMProperties"] = async (ctx, params) => {
   const ref = getElementRef(params);
   const names = params.names;
-  const properties = await evalInSim(ctx, inIframe(`
-    ${buildElAccess(ref)}
+  const properties = await evalInElement(ctx, ref, `
     if (!el) return ${JSON.stringify(names.map(() => null))}
     return ${JSON.stringify(names)}.map(n => el[n])
-  `));
+  `);
   return { properties };
 };
 elementHandlers["Element.getAttributes"] = async (ctx, params) => {
   const ref = getElementRef(params);
   const names = params.names;
-  const attributes = await evalInSim(ctx, inIframe(`
-    ${buildElAccess(ref)}
+  const attributes = await evalInElement(ctx, ref, `
     if (!el) return ${JSON.stringify(names.map(() => null))}
     return ${JSON.stringify(names)}.map(n => el.getAttribute(n))
-  `));
+  `);
   return { attributes };
 };
 elementHandlers["Element.getStyles"] = async (ctx, params) => {
   const ref = getElementRef(params);
   const names = params.names;
-  const styles = await evalInSim(ctx, inIframe(`
-    ${buildElAccess(ref)}
+  const styles = await evalInElement(ctx, ref, `
     if (!el) return ${JSON.stringify(names.map(() => ""))}
     const cs = getComputedStyle(el)
     return ${JSON.stringify(names)}.map(n => cs.getPropertyValue(n))
-  `));
+  `);
   return { styles };
 };
 elementHandlers["Element.getWXML"] = async (ctx, params) => {
   const ref = getElementRef(params);
   const type = params.type || "inner";
   const prop = type === "outer" ? "outerHTML" : "innerHTML";
-  const wxml = await evalInSim(ctx, inIframe(`
-    ${buildElAccess(ref)}
+  const wxml = await evalInElement(ctx, ref, `
     return el ? el.${prop} : ''
-  `));
+  `);
   return { wxml };
 };
 elementHandlers["Element.getOffset"] = async (ctx, params) => {
   const ref = getElementRef(params);
-  return evalInSim(ctx, inIframe(`
-    ${buildElAccess(ref)}
+  return evalInElement(ctx, ref, `
     if (!el) return { left: 0, top: 0 }
     const r = el.getBoundingClientRect()
     return { left: r.left, top: r.top }
-  `));
+  `);
 };
 elementHandlers["Element.getElement"] = async (ctx, params) => {
   const parentRef = getElementRef(params);
   const selector = params.selector;
-  const escaped = selector.replace(/'/g, "\\'");
-  const info = await evalInSim(ctx, inIframe(`
-    ${buildElAccess(parentRef, "parent")}
+  const info = await evalInElement(ctx, parentRef, `
     if (!parent) return null
-    const child = parent.querySelector('${escaped}')
+    const child = parent.querySelector(${JSON.stringify(selector)})
     if (!child) return null
     return { tagName: child.tagName.toLowerCase() }
-  `));
+  `, "parent");
   if (!info) throw new Error(`Child element not found: ${selector}`);
   const combinedSelector = `${parentRef.selector} ${selector}`;
   const elementId = registerElement(combinedSelector, 0, parentRef.pageId);
@@ -2363,14 +2374,12 @@ elementHandlers["Element.getElement"] = async (ctx, params) => {
 elementHandlers["Element.getElements"] = async (ctx, params) => {
   const parentRef = getElementRef(params);
   const selector = params.selector;
-  const escaped = selector.replace(/'/g, "\\'");
-  const items = await evalInSim(ctx, inIframe(`
-    ${buildElAccess(parentRef, "parent")}
+  const items = await evalInElement(ctx, parentRef, `
     if (!parent) return []
-    return Array.from(parent.querySelectorAll('${escaped}')).map(el => ({
+    return Array.from(parent.querySelectorAll(${JSON.stringify(selector)})).map(el => ({
       tagName: el.tagName.toLowerCase(),
     }))
-  `));
+  `, "parent");
   const combinedSelector = `${parentRef.selector} ${selector}`;
   return {
     elements: items.map((item, i) => ({
@@ -2556,7 +2565,7 @@ import CDP from "chrome-remote-interface";
 var SIMULATOR_URL_PATTERN = "localhost:7788";
 var MAX_BUFFER = 500;
 var RECONNECT_INTERVAL_MS = 3e3;
-var cdpPort = 9222;
+var cdpPort = DEFAULT_CDP_PORT;
 var targets = {
   simulator: { client: null, connected: false, timer: null, consoleLogs: [], networkRequests: [] },
   workbench: { client: null, connected: false, timer: null, consoleLogs: [], networkRequests: [] }
@@ -3174,16 +3183,20 @@ function startMcpServer(resolvedCdpPort, mcpPort) {
   httpServer.on("error", (err) => {
     if (err.code === "EADDRINUSE") {
       console.warn(`[MCP] Port ${mcpPort} already in use \u2014 MCP server not started`);
+      recordMcpFailed("port-in-use");
     } else {
       console.error("[MCP] Server error:", err);
+      recordMcpFailed(err.message);
     }
   });
   httpServer.listen(mcpPort, "127.0.0.1", () => {
     console.log(`[MCP] SSE server listening on http://127.0.0.1:${mcpPort}/sse`);
+    recordMcpStarted(mcpPort);
   });
   return toDisposable(() => {
     transports.clear();
     httpServer.close();
+    recordMcpStopped();
   });
 }
 
@@ -3316,13 +3329,7 @@ function setupSimulatorStorage(host, options) {
     }
     return { securityOrigin: cachedOrigin, isLocalStorage: true };
   }
-  function pushSyntheticEvent(evt) {
-    if (host.isDestroyed()) return;
-    const prefix = activePrefix();
-    if (prefix && !evt.key.startsWith(prefix)) return;
-    host.send(SimulatorStorageChannel.Event, evt);
-  }
-  async function setItem(key, value) {
+  async function withStorageWrite(fn) {
     await ensureAttached();
     if (!attachedWc || attachedWc.isDestroyed()) {
       return { ok: false, error: "simulator not attached" };
@@ -3330,92 +3337,74 @@ function setupSimulatorStorage(host, options) {
     const storageId = await getStorageId();
     if (!storageId) return { ok: false, error: "failed to resolve simulator origin" };
     try {
-      await attachedWc.debugger.sendCommand("DOMStorage.setDOMStorageItem", {
-        storageId,
-        key,
-        value
-      });
-      pushSyntheticEvent({ type: "added", key, newValue: value });
-      return { ok: true };
+      return await fn({ wc: attachedWc, storageId });
     } catch (e) {
       return { ok: false, error: e.message };
     }
   }
-  async function removeItem(key) {
+  async function withStorageRead(fallback, fn) {
     await ensureAttached();
-    if (!attachedWc || attachedWc.isDestroyed()) {
-      return { ok: false, error: "simulator not attached" };
-    }
-    const storageId = await getStorageId();
-    if (!storageId) return { ok: false, error: "failed to resolve simulator origin" };
+    if (!attachedWc || attachedWc.isDestroyed()) return fallback;
     try {
-      await attachedWc.debugger.sendCommand("DOMStorage.removeDOMStorageItem", {
-        storageId,
-        key
-      });
+      const storageId = await getStorageId();
+      if (!storageId) return fallback;
+      return await fn({ wc: attachedWc, storageId });
+    } catch {
+      return fallback;
+    }
+  }
+  function pushSyntheticEvent(evt) {
+    if (host.isDestroyed()) return;
+    const prefix = activePrefix();
+    if (prefix && !evt.key.startsWith(prefix)) return;
+    host.send(SimulatorStorageChannel.Event, evt);
+  }
+  async function setItem(key, value) {
+    return withStorageWrite(async ({ wc, storageId }) => {
+      await wc.debugger.sendCommand("DOMStorage.setDOMStorageItem", { storageId, key, value });
+      pushSyntheticEvent({ type: "added", key, newValue: value });
+      return { ok: true };
+    });
+  }
+  async function removeItem(key) {
+    return withStorageWrite(async ({ wc, storageId }) => {
+      await wc.debugger.sendCommand("DOMStorage.removeDOMStorageItem", { storageId, key });
       pushSyntheticEvent({ type: "removed", key });
       return { ok: true };
-    } catch (e) {
-      return { ok: false, error: e.message };
-    }
+    });
   }
   async function clearScoped() {
-    await ensureAttached();
-    if (!attachedWc || attachedWc.isDestroyed()) {
-      return { ok: false, error: "simulator not attached" };
-    }
-    const storageId = await getStorageId();
-    if (!storageId) return { ok: false, error: "failed to resolve simulator origin" };
-    const prefix = activePrefix();
-    try {
+    return withStorageWrite(async ({ wc, storageId }) => {
+      const prefix = activePrefix();
       if (!prefix) {
-        await attachedWc.debugger.sendCommand("DOMStorage.clear", { storageId });
+        await wc.debugger.sendCommand("DOMStorage.clear", { storageId });
         return { ok: true };
       }
-      const result = await attachedWc.debugger.sendCommand("DOMStorage.getDOMStorageItems", {
+      const result = await wc.debugger.sendCommand("DOMStorage.getDOMStorageItems", {
         storageId
       });
       for (const [key] of result.entries) {
         if (!key.startsWith(prefix)) continue;
-        await attachedWc.debugger.sendCommand("DOMStorage.removeDOMStorageItem", {
-          storageId,
-          key
-        });
+        await wc.debugger.sendCommand("DOMStorage.removeDOMStorageItem", { storageId, key });
       }
       return { ok: true };
-    } catch (e) {
-      return { ok: false, error: e.message };
-    }
+    });
   }
   async function clearAll() {
-    await ensureAttached();
-    if (!attachedWc || attachedWc.isDestroyed()) {
-      return { ok: false, error: "simulator not attached" };
-    }
-    const storageId = await getStorageId();
-    if (!storageId) return { ok: false, error: "failed to resolve simulator origin" };
-    try {
-      await attachedWc.debugger.sendCommand("DOMStorage.clear", { storageId });
+    return withStorageWrite(async ({ wc, storageId }) => {
+      await wc.debugger.sendCommand("DOMStorage.clear", { storageId });
       return { ok: true };
-    } catch (e) {
-      return { ok: false, error: e.message };
-    }
+    });
   }
   async function getSnapshot() {
-    await ensureAttached();
-    if (!attachedWc || attachedWc.isDestroyed()) return [];
-    try {
-      const storageId = await getStorageId();
-      if (!storageId) return [];
-      const result = await attachedWc.debugger.sendCommand("DOMStorage.getDOMStorageItems", {
+    return withStorageRead([], async ({ wc, storageId }) => {
+      const result = await wc.debugger.sendCommand("DOMStorage.getDOMStorageItems", {
         storageId
       });
       const prefix = activePrefix();
       const filtered = prefix ? result.entries.filter(([key]) => key.startsWith(prefix)) : result.entries;
       return filtered.map(([key, value]) => ({ key, value }));
-    } catch {
-      return [];
-    }
+    });
   }
   for (const wc of wcStatic.getAllWebContents()) {
     if (isSimulatorWebview(wc)) {
@@ -3729,7 +3718,7 @@ function enableDevRendererAutoReload(rendererDir2) {
   const watcher = fs7.watch(rendererDir2, { recursive: true }, () => {
     if (reloadTimer) clearTimeout(reloadTimer);
     reloadTimer = setTimeout(() => {
-      for (const win of BrowserWindow3.getAllWindows()) {
+      for (const win of BrowserWindow4.getAllWindows()) {
         win.webContents.reload();
       }
     }, 300);
@@ -3754,6 +3743,7 @@ function createWorkbenchApp(config = {}) {
       const mainWindow = createConfiguredMainWindow(config, rendererDir2);
       const context = createContext(config, mainWindow, rendererDir2);
       context.registry.add(registerAppIpc(context));
+      context.registry.add(installThemeBackgroundSync());
       registerBuiltinModules(config, context);
       installMenu(config, mainWindow, context);
       const instance = {
@@ -3811,10 +3801,10 @@ function createWorkbenchApp(config = {}) {
 }
 
 // src/main/windows/settings-window/create.ts
-import { BrowserWindow as BrowserWindow4 } from "electron";
+import { BrowserWindow as BrowserWindow5 } from "electron";
 import path13 from "path";
 async function createSettingsWindow(parent, rendererDir2) {
-  const win = new BrowserWindow4({
+  const win = new BrowserWindow5({
     width: 420,
     height: 560,
     minWidth: 380,
@@ -3846,18 +3836,17 @@ function launch(config = {}) {
   return createWorkbenchApp(config).start();
 }
 async function openSettingsWindow(ctx) {
-  if (!ctx.workbenchSettingsWindow || ctx.workbenchSettingsWindow.isDestroyed()) {
-    const win = await createSettingsWindow(ctx.mainWindow, ctx.rendererDir);
-    ctx.workbenchSettingsWindow = win;
+  let win = ctx.windows.settingsWindow;
+  if (!win || win.isDestroyed()) {
+    win = await createSettingsWindow(ctx.windows.mainWindow, ctx.rendererDir);
     ctx.windows.setSettingsWindow(win);
     wireSettingsWindowEvents(win, () => {
-      ctx.workbenchSettingsWindow = null;
       ctx.windows.setSettingsWindow(null);
     });
   }
-  ctx.workbenchSettingsWindow.show();
-  ctx.workbenchSettingsWindow.focus();
-  ctx.notify.workbenchSettingsInit(ctx.workbenchSettingsWindow, {
+  win.show();
+  win.focus();
+  ctx.notify.workbenchSettingsInit(win, {
     settings: loadWorkbenchSettings()
   });
 }