@dimina-kit/devtools 0.3.1-dev.20260513123738 → 0.3.1-dev.20260515105504

package/README.md

@@ -150,9 +150,6 @@ src/
       app.ts                             # createWorkbenchApp 工厂
       bootstrap.ts                       # suppressEpipe / setupCdpPort
       lifecycle.ts                       # Electron app 生命周期注册
-    windows/
-      main-window/                       # 主窗口创建 + 事件接线
-      settings-window/                   # 独立设置窗口
     ipc/                                 # 只做 handler 注册，不写业务
       index.ts                           # 聚合 register 函数导出
       simulator.ts                       # simulator attach/detach/resize
@@ -166,17 +163,33 @@ src/
       settings/                          # 用户级 workbench 设置读写 + 主题应用
       projects/                          # 项目列表 CRUD（持久化）
       layout/                            # 布局常量 + bounds 计算
+      views/                             # ViewManager（settings / popover overlay 等）
+      workspace/                         # 项目会话生命周期
+      notifications/                     # 主进程 → renderer 的事件通知
       mcp/                               # MCP server
       automation/                        # 自动化 WebSocket 服务
       simulator/                         # simulator dir / referer
+      simulator-storage/                 # CDP DOMStorage + 元素 inspect 桥接
+      update/                            # UpdateManager + GitHubReleaseChecker
       workbench-context.ts               # 共享状态类型 + 工厂 + 辅助函数
+      window-service.ts                  # main / settings 窗口聚合访问
+      module.ts                          # WorkbenchModule 协议
       default-adapter.ts                 # 默认 CompilationAdapter
     menu/                                # 应用菜单
-    utils/paths.ts                       # rendererDir / defaultPreloadPath
+    utils/
+      paths.ts                           # rendererDir / defaultPreloadPath / simulatorDir
+      disposable.ts                      # DisposableRegistry + AggregateError 聚合
+      ipc-registry.ts                    # ipcMain.handle 包装 + SenderPolicy 闸门
+      sender-policy.ts                   # sender webContents id 白名单
+      ipc-schema.ts                      # zod schema 校验工具
+    windows/
+      main-window/                       # 主窗口创建 + 事件接线
+      settings-window/                   # 独立设置窗口
+      navigation-hardening.ts            # will-navigate / setWindowOpenHandler 限流
 
   preload/                               # 按注入目标分
     windows/                             # contextBridge 类型 preload
-      main.ts                            # 主窗口 preload，可组合导出 install*Instrumentation
+      main.ts                            # workbench 三窗口 preload，仅暴露 window.devtools.ipc
       simulator.ts                       # simulator webview 的默认 preload
     shared/                              # preload 之间共享
       api-compat.ts                      # setupApiCompatHook
@@ -329,33 +342,72 @@ launch({ preloadPath: '/absolute/path/to/my-preload.js' })
 
 ---
 
+## Simulator 自定义 API
+
+下游可以通过 `registerSimulatorApi` 把业务 API 注入到模拟器内运行的小程序。Handler 在 Electron **主进程**执行，能用任何 Node 能力（fs、net、原生模块、持久状态）；模拟器侧拿到 `wx.<name>(params)` 调用后通过 IPC 转发到主进程，await 返回结果，handler 抛错则原型回传给小程序。
+
+```typescript
+import { registerSimulatorApi } from '@dimina-kit/devtools/simulator-apis'
+
+const dispose = registerSimulatorApi('myCompany.login', async ({ username }) => {
+  // 主进程上下文：可调用内部 HTTP、读取凭证文件、访问原生模块
+  return await callInternalAuth(username)
+})
+
+// 不再需要时取消注册（不传也行，进程退出会一起清理）
+dispose()
+```
+
+几点行为约定：
+
+- 同名重复注册：后注册的覆盖前者，静默替换。
+- `dispose()` 只会移除自己创建的那次注册——如果之后被别人覆盖了，旧的 disposer 是 no-op。
+- 调用未注册的 name：小程序侧拿到 reject，错误信息里带 name。
+- Handler 可同步或异步返回；返回值需可 JSON 序列化（IPC 限制）。
+
+对小程序侧来说，这些 name 和内置 API（`wx.getStorage` 等）走同一个 `AppManager.apiRegistry`，没有区别。
+
+---
+
 ## 模块导出一览
 
+### Stable public exports
+
+`@dimina-kit/devtools` 的稳定入口，签名遵循 semver；新版本不会做破坏性改动（除非 major bump）。
+
 ```
 @dimina-kit/devtools                        launch, createWorkbenchApp, buildDefaultMenu,
                                        openSettingsWindow, suppressEpipe, setupCdpPort,
-                                       createWorkbenchContext, createMainWindow, ...
-                                       （api.ts 聚合了下方全部入口）
+                                       createWorkbenchContext, createMainWindow,
+                                       createViewManager, register*Ipc,
+                                       registerSimulatorApi,
+                                       setHeaderHeight, UpdateManager,
+                                       createGitHubReleaseChecker, ...
+                                       （api.ts 聚合了所有公共 API；优先从根入口导入）
 @dimina-kit/devtools/launch                 launch(config?), buildDefaultMenu, openSettingsWindow
 @dimina-kit/devtools/app                    createWorkbenchApp(config?)
 @dimina-kit/devtools/types                  TypeScript 类型定义
+@dimina-kit/devtools/bootstrap              suppressEpipe(), setupCdpPort()
+@dimina-kit/devtools/paths                  rendererDir, defaultPreloadPath, simulatorDir,
+                                       getRendererDir, getPreloadDir, getRendererHtml
+@dimina-kit/devtools/simulator-apis         registerSimulatorApi(name, handler) →
+                                       注入由主进程托管的小程序 API（详见上方"Simulator 自定义 API"）
+@dimina-kit/devtools/preload                installConsoleInstrumentation,
+                                       installStorageInstrumentation,
+                                       installAppDataInstrumentation, sendAllAppData,
+                                       installWxmlInstrumentation, sendWxmlTree,
+                                       setupWxmlObserver, installSimulatorBridge,
+                                       setupApiCompatHook
+```
+
+### Experimental exports (v0.x — signatures may change in minor versions)
+
+下列子路径主要用于"模块组装"等深度定制场景。在 0.x 阶段，函数签名和模块边界可能在 minor 版本之间调整；如果你不需要逐模块组装，请优先使用上方的 stable 入口或根 barrel。
+
+```
 @dimina-kit/devtools/context                createWorkbenchContext(opts),
                                        hasBuiltinPanel(ctx, panelId), getDefaultTab(ctx)
 @dimina-kit/devtools/create-window          createMainWindow(opts)
-@dimina-kit/devtools/view-manager           createViewManager(ctx) → ViewManager
-                                       (attachSimulator, detachSimulator, showSimulator,
-                                        hideSimulator, showSettings, hideSettings,
-                                        showPopover, hidePopover, resize,
-                                        setVisible, repositionAll, disposeAll)
-@dimina-kit/devtools/layout                 computeRightPanelBounds, computeSimulatorBounds,
-                                       computeSettingsBounds, computePopoverBounds,
-                                       setHeaderHeight, getRightX,
-                                       HEADER_H, SPLITTER_W, SETTINGS_W
-@dimina-kit/devtools/projects               listProjects, addProject, removeProject,
-                                       getCompileConfig, saveCompileConfig,
-                                       updateLastOpened
-@dimina-kit/devtools/paths                  rendererDir, defaultPreloadPath,
-                                       getRendererDir, getPreloadDir, getRendererHtml
 @dimina-kit/devtools/ipc-simulator          registerSimulatorIpc(ctx)
 @dimina-kit/devtools/ipc-panels             registerPanelsIpc(ctx)
 @dimina-kit/devtools/ipc-toolbar            registerToolbarIpc(ctx)
@@ -363,17 +415,17 @@ launch({ preloadPath: '/absolute/path/to/my-preload.js' })
 @dimina-kit/devtools/ipc-settings           registerSettingsIpc(ctx)
 @dimina-kit/devtools/ipc-projects           registerProjectsIpc(ctx)
 @dimina-kit/devtools/ipc-session            registerSessionIpc(ctx), sendStatus(ctx, status, msg)
-@dimina-kit/devtools/bootstrap              suppressEpipe(), setupCdpPort()
 @dimina-kit/devtools/workbench-settings     loadWorkbenchSettings(), saveWorkbenchSettings(), applyTheme()
-@dimina-kit/devtools/preload                installConsoleInstrumentation,
-                                       installStorageInstrumentation,
-                                       installAppDataInstrumentation, sendAllAppData,
-                                       installWxmlInstrumentation, sendWxmlTree,
-                                       setupWxmlObserver, installSimulatorBridge,
-                                       setupApiCompatHook
-@dimina-kit/devtools/simulator-dir          simulatorDir
 ```
 
+> 注：以下子路径在过去版本曾被导出，已收敛到根 barrel 或内部实现，请改从 `@dimina-kit/devtools` 根入口导入（`createViewManager`、`registerAppIpc`、`simulatorDir`、`Project` 等类型）：
+>
+> - `@dimina-kit/devtools/view-manager` → `import { createViewManager, type ViewManager } from '@dimina-kit/devtools'`
+> - `@dimina-kit/devtools/ipc-app` → `import { registerAppIpc } from '@dimina-kit/devtools'`
+> - `@dimina-kit/devtools/projects` → 通过 `ctx.workspace.listProjects()` 等服务方法访问；`Project` 类型从 `@dimina-kit/devtools` 根入口导入
+> - `@dimina-kit/devtools/layout` → `import { setHeaderHeight } from '@dimina-kit/devtools'`（其余布局细节回归内部实现）
+> - `@dimina-kit/devtools/simulator-dir` → `import { simulatorDir } from '@dimina-kit/devtools/paths'`
+
 ---
 
 ## WorkbenchContext
@@ -382,7 +434,6 @@ launch({ preloadPath: '/absolute/path/to/my-preload.js' })
 
 ```typescript
 interface WorkbenchContext {
-  mainWindow: BrowserWindow
   adapter: CompilationAdapter
   preloadPath: string
   rendererDir: string
@@ -391,12 +442,21 @@ interface WorkbenchContext {
   appName: string
   toolbarActions?: () => Promise<ToolbarAction[]> | ToolbarAction[]
   brandingProvider?: () => Promise<{ appName: string }> | { appName: string }
-  workbenchSettingsWindow: BrowserWindow | null
 
   // ── Services（运行时状态封装在内部，通过方法访问）──
+  windows: WindowService // ctx.windows.mainWindow, ctx.windows.settingsWindow, ...
   views: ViewManager // ctx.views.repositionAll(), ctx.views.getSimulatorWebContentsId(), ...
   notify: RendererNotifier // ctx.notify.projectStatus(), ctx.notify.windowNavigateBack(), ...
   workspace: WorkspaceService // ctx.workspace.getProjectPath(), ctx.workspace.hasActiveSession(), ...
+
+  // ── Internal lifecycle / security (host 不直接消费) ──
+  registry: DisposableRegistry // 框架在创建时统一聚合 dispose
+  senderPolicy: SenderPolicy   // IpcRegistry 自动校验 sender 白名单
+
+  /** @deprecated 用 ctx.windows.mainWindow */
+  mainWindow: BrowserWindow
+  /** @deprecated 用 ctx.windows.settingsWindow / setSettingsWindow */
+  workbenchSettingsWindow: BrowserWindow | null
 }
 ```
 
@@ -409,6 +469,8 @@ interface WorkbenchContext {
 | `ctx.simulatorWebContentsId` | `ctx.views.getSimulatorWebContentsId()`                           |
 | `ctx.devToolsViewAdded`      | `ctx.views.isSimulatorAdded()`                                    |
 | `ctx.lastSimWidth`           | `ctx.views.getLastSimWidth()`                                     |
+| `ctx.mainWindow`             | `ctx.windows.mainWindow`                                          |
+| `ctx.workbenchSettingsWindow`| `ctx.windows.settingsWindow`                                      |
 
 ---
 
@@ -545,18 +607,18 @@ pnpm test               # 运行测试
 
 ## 安全说明
 
-- 本工具仅用于本地开发调试，不应部署到生产环境
-- 为方便开发调试，BrowserWindow 启用了 `nodeIntegration` 并禁用了 `contextIsolation`，这在生产环境中存在安全风险
-- 仅在受信任的本地开发环境中使用本工具
-- 不要在 devtools 窗口中加载不受信任的远程内容
-- 如需在非本地环境使用，请自行评估并加固安全配置
+本工具仅用于本地开发调试。当前的安全配置：
 
-### MCP Server 风险
+- **Workbench 窗口**（main / settings / popover overlay）均启用 `contextIsolation` 并禁用 `nodeIntegration`；renderer 通过 main preload 经 `contextBridge` 拿到 `window.devtools.ipc`，每个 IPC handler 经 sender whitelist 校验调用方
+- **Simulator 加载的小程序代码** 运行在独立 `<webview>` 中（`partition='persist:simulator'`、`nodeIntegration=false`），preload 由 `session.registerPreloadScript` 在 session 层固定，渲染进程无法替换
+- **renderer 入口** 启用了保守 CSP；`will-navigate` / `setWindowOpenHandler` 屏蔽外部跳转
+
+仍然不要在 devtools 窗口中加载不受信任的远程内容；本工具不打算在非本地环境部署。
 
-内置的 MCP server 默认关闭，由 `startMcpServer` 入口显式启动，或通过 workbench 设置中的 `mcp.enabled` 开启。开启后会在本机监听 SSE 端点，向任何可以连接到该端点的 MCP 客户端暴露一组工具，能力包括：在页面上下文执行任意 JS（`evaluate`）、读取 DOM 结构、截屏、拉取网络日志、触发导航等。
+### MCP Server 风险
 
-由于 workbench 主窗口出于调试需要启用了 `nodeIntegration` 并关闭了 `contextIsolation`，通过 MCP 客户端执行的 `evaluate` 实际拥有 Node API 访问权限。换言之，开启 MCP 等同于允许已连接的本机 MCP 客户端在 DevTools 进程中执行 Node 代码，读写本机文件和启动子进程均在其能力范围内。
+内置的 MCP server 默认关闭，由 `startMcpServer` 入口显式启动，或通过 workbench 设置中的 `mcp.enabled` 开启。开启后会在本机监听 SSE 端点，向任何可以连接到该端点的 MCP 客户端暴露一组工具，能力包括：读取 DOM 结构、截屏、拉取网络日志、触发导航等。
 
-因此仅在连接到可信的本机 MCP 客户端或被信任的 AI 工具时启用该功能；不要在公共 WiFi、共享机器或存在远程 SSH 端口转发的场景下开启，以免监听端口被非预期的客户端访问。
+`workbench_evaluate` 已从 MCP 工具集中移除，workbench 只暴露只读诊断工具（截屏、console 日志、DOM、网络日志等）。`simulator_evaluate` 仍然保留，但 simulator 使用 `<webview>`、`nodeIntegration=false`，其 `evaluate` 仅在页面 JS 上下文执行，不具备 Node API 访问能力。
 
-作为收窄 RCE 面的默认策略，`workbench_evaluate` 已从 MCP 工具集中移除，workbench 只暴露只读诊断工具（截屏、console 日志、DOM、网络日志等）。`simulator_evaluate` 仍然保留，因为 simulator 使用 `<webview>`，默认 `nodeIntegration=false`，其 `evaluate` 仅在页面 JS 上下文执行，不具备 Node API 访问能力。
+仅在连接到可信的本机 MCP 客户端或被信任的 AI 工具时启用该功能；不要在公共 WiFi、共享机器或存在远程 SSH 端口转发的场景下开启，以免监听端口被非预期的客户端访问。

package/dist/main/api.d.ts

@@ -7,6 +7,10 @@ export type { WorkbenchContext, CreateContextOptions } from './services/workbenc
 export { createMainWindow } from './windows/main-window/index.js';
 export { createViewManager } from './services/views/view-manager.js';
 export type { ViewManager } from './services/views/view-manager.js';
+export type { WorkspaceService } from './services/workspace/workspace-service.js';
+export type { Project, ProjectPages, ProjectSettings } from './services/projects/project-repository.js';
+export { registerSimulatorApi } from './simulator-apis.js';
+export type { SimulatorApiHandler } from './simulator-apis.js';
 export { registerAppIpc } from './ipc/app.js';
 export { registerSimulatorIpc } from './ipc/simulator.js';
 export { registerPanelsIpc } from './ipc/panels.js';
@@ -15,8 +19,8 @@ export { registerSettingsIpc } from './ipc/settings.js';
 export { registerProjectsIpc } from './ipc/projects.js';
 export { registerSessionIpc } from './ipc/session.js';
 export { registerToolbarIpc } from './ipc/toolbar.js';
-export { rendererDir, defaultPreloadPath, getRendererDir, getPreloadDir, getRendererHtml } from './utils/paths.js';
-export { simulatorDir } from './services/simulator/dir.js';
+export { rendererDir, defaultPreloadPath, simulatorDir, getRendererDir, getPreloadDir, getRendererHtml, } from './utils/paths.js';
+export { setHeaderHeight } from './services/layout/index.js';
 export { UpdateManager, createGitHubReleaseChecker } from './services/update/index.js';
 export type { UpdateManagerOptions, GitHubReleaseCheckerOptions, PickAssetContext, VersionScheme, } from './services/update/index.js';
 export type { WorkbenchConfig, WorkbenchAppConfig, CompilationAdapter, ProjectSession, ToolbarAction, BuiltinPanelId, BuiltinModuleId, UpdateChecker, UpdateInfo, } from '../shared/types.js';

package/dist/main/api.js

@@ -7,6 +7,8 @@ export { suppressEpipe, setupCdpPort } from './app/bootstrap.js';
 export { createWorkbenchContext, hasBuiltinPanel, getDefaultTab } from './services/workbench-context.js';
 export { createMainWindow } from './windows/main-window/index.js';
 export { createViewManager } from './services/views/view-manager.js';
+// ── Simulator extension surface ──────────────────────────────────────────
+export { registerSimulatorApi } from './simulator-apis.js';
 // ── IPC module registration ──────────────────────────────────────────────
 export { registerAppIpc } from './ipc/app.js';
 export { registerSimulatorIpc } from './ipc/simulator.js';
@@ -17,8 +19,9 @@ export { registerProjectsIpc } from './ipc/projects.js';
 export { registerSessionIpc } from './ipc/session.js';
 export { registerToolbarIpc } from './ipc/toolbar.js';
 // ── Paths ────────────────────────────────────────────────────────────────
-export { rendererDir, defaultPreloadPath, getRendererDir, getPreloadDir, getRendererHtml } from './utils/paths.js';
-export { simulatorDir } from './services/simulator/dir.js';
+export { rendererDir, defaultPreloadPath, simulatorDir, getRendererDir, getPreloadDir, getRendererHtml, } from './utils/paths.js';
+// ── Layout ───────────────────────────────────────────────────────────────
+export { setHeaderHeight } from './services/layout/index.js';
 // ── Update checker ───────────────────────────────────────────────────────
 export { UpdateManager, createGitHubReleaseChecker } from './services/update/index.js';
 //# sourceMappingURL=api.js.map

package/dist/main/app/app.d.ts

@@ -12,6 +12,6 @@ export interface WorkbenchAppInstance {
 }
 export declare function createWorkbenchApp(config?: WorkbenchAppConfig): {
     setup: () => Promise<WorkbenchAppInstance>;
-    start: () => void;
+    start: () => Promise<void>;
 };
 //# sourceMappingURL=app.d.ts.map

package/dist/main/app/app.js

@@ -8,11 +8,12 @@ import { createMainWindow, wireMainWindowEvents } from '../windows/main-window/i
 import { createWorkbenchContext } from '../services/workbench-context.js';
 import { loadWorkbenchSettings, applyTheme } from '../services/settings/index.js';
 import { installAppMenu } from '../menu/index.js';
-import { registerAppIpc, registerSimulatorIpc, registerPanelsIpc, registerPopoverIpc, registerProjectsIpc, registerSessionIpc, registerSettingsIpc, registerToolbarIpc, } from '../ipc/index.js';
+import { registerAppIpc, popoverModule, projectsModule, sessionModule, settingsModule, simulatorModule, } from '../ipc/index.js';
 import { startAutomationServer } from '../services/automation/index.js';
 import { startMcpServer } from '../services/mcp/index.js';
 import { setupSimulatorStorage } from '../services/simulator-storage/index.js';
 import { UpdateManager } from '../services/update/index.js';
+import { toDisposable } from '../utils/disposable.js';
 const DEFAULT_MODULES = {
     projects: true,
     session: true,
@@ -20,16 +21,12 @@ const DEFAULT_MODULES = {
     popover: true,
     settings: true,
 };
-const MODULE_REGISTRARS = {
-    projects: registerProjectsIpc,
-    session: registerSessionIpc,
-    simulator: (ctx) => {
-        registerSimulatorIpc(ctx);
-        registerPanelsIpc(ctx);
-        registerToolbarIpc(ctx);
-    },
-    popover: registerPopoverIpc,
-    settings: registerSettingsIpc,
+const BUILTIN_MODULES = {
+    projects: projectsModule,
+    session: sessionModule,
+    simulator: simulatorModule,
+    popover: popoverModule,
+    settings: settingsModule,
 };
 /** Parse --auto, --auto-port, --project from process.argv. */
 function parseAutoArgs() {
@@ -58,9 +55,11 @@ function resolveModules(config) {
         ...config.modules,
     };
 }
-async function disposeContext(ctx, updateManager) {
-    updateManager?.dispose();
+async function disposeContext(ctx) {
     await ctx.workspace.closeProject();
+    await ctx.registry.dispose().catch((err) => {
+        console.warn('[workbench] dispose registry encountered errors:', err);
+    });
 }
 function createConfiguredMainWindow(config, rendererDir) {
     const mainWindow = createMainWindow({
@@ -70,6 +69,11 @@ function createConfiguredMainWindow(config, rendererDir) {
         height: config.window?.height,
         minWidth: config.window?.minWidth,
         minHeight: config.window?.minHeight,
+        // P1: pass the same preload path the workbench context stores on
+        // ctx.preloadPath so hosts that ship a custom simulator preload are the
+        // ones registered on the persist:simulator session — otherwise the
+        // backstop wouldn't be the host's script.
+        simulatorPreloadPath: config.preloadPath ?? defaultPreloadPath,
     });
     // Set window/taskbar icon if provided (Linux/Windows; macOS uses app bundle icon)
     if (config.icon) {
@@ -96,7 +100,7 @@ function registerBuiltinModules(config, context) {
     const modules = resolveModules(config);
     Object.keys(modules).forEach((moduleId) => {
         if (modules[moduleId])
-            MODULE_REGISTRARS[moduleId](context);
+            context.registry.add(BUILTIN_MODULES[moduleId].setup(context));
     });
 }
 function installMenu(config, mainWindow, context) {
@@ -114,6 +118,7 @@ async function setupAutomation(instance) {
     if (autoArgs.auto) {
         const server = await startAutomationServer(instance.context, autoArgs.autoPort);
         instance.automationServer = server;
+        instance.context.registry.add(() => server.close());
         // Stable, parseable line for e2e harnesses that scrape stdout.
         console.log(`[automation] listening on ws://127.0.0.1:${server.port}`);
     }
@@ -121,42 +126,56 @@ async function setupAutomation(instance) {
 function setupMcp() {
     const settings = loadWorkbenchSettings();
     if (!settings.mcp.enabled)
-        return;
+        return null;
     const cdpPortSwitch = app.commandLine.getSwitchValue('remote-debugging-port');
     const cdpPort = cdpPortSwitch ? parseInt(cdpPortSwitch, 10) : settings.cdp.port;
-    startMcpServer(cdpPort, settings.mcp.port);
+    return startMcpServer(cdpPort, settings.mcp.port);
 }
 function wireAppWindowEvents(config, instance) {
     const { mainWindow, context } = instance;
-    wireMainWindowEvents(mainWindow, {
+    return wireMainWindowEvents(mainWindow, {
         context,
         onResize: () => context.views.repositionAll(),
         onClose: async (e) => {
             if (!context.workspace.hasActiveSession())
                 return;
+            // Close button while a project session is open: stay in the workbench
+            // and surface the project list. Tear down only the session — do NOT
+            // dispose `context.registry`, which owns every IPC handler (projects,
+            // dialog, settings…). Disposing it would leave the renderer alive but
+            // unable to invoke anything, so subsequent clicks on Import/etc. would
+            // raise `No handler registered for ...`.
             e.preventDefault();
             if (config.onBeforeClose) {
                 await config.onBeforeClose(instance);
             }
-            await disposeContext(context);
+            await context.workspace.closeProject();
             context.notify.windowNavigateBack();
         },
     });
 }
 function enableDevRendererAutoReload(rendererDir) {
     // Auto-reload renderer windows when dist files change during development
-    if (!app.isPackaged) {
-        let reloadTimer = null;
-        fs.watch(rendererDir, { recursive: true }, () => {
-            if (reloadTimer)
-                clearTimeout(reloadTimer);
-            reloadTimer = setTimeout(() => {
-                for (const win of BrowserWindow.getAllWindows()) {
-                    win.webContents.reload();
-                }
-            }, 300);
-        });
+    if (app.isPackaged) {
+        return toDisposable(() => { });
     }
+    let reloadTimer = null;
+    const watcher = fs.watch(rendererDir, { recursive: true }, () => {
+        if (reloadTimer)
+            clearTimeout(reloadTimer);
+        reloadTimer = setTimeout(() => {
+            for (const win of BrowserWindow.getAllWindows()) {
+                win.webContents.reload();
+            }
+        }, 300);
+    });
+    return toDisposable(() => {
+        if (reloadTimer) {
+            clearTimeout(reloadTimer);
+            reloadTimer = null;
+        }
+        watcher.close();
+    });
 }
 export function createWorkbenchApp(config = {}) {
     let setupPromise = null;
@@ -170,13 +189,13 @@ export function createWorkbenchApp(config = {}) {
             const rendererDir = config.rendererDir ?? defaultRendererDir;
             const mainWindow = createConfiguredMainWindow(config, rendererDir);
             const context = createContext(config, mainWindow, rendererDir);
-            registerAppIpc(context);
+            context.registry.add(registerAppIpc(context));
             registerBuiltinModules(config, context);
             installMenu(config, mainWindow, context);
             const instance = {
                 mainWindow,
                 context,
-                dispose: () => disposeContext(context, instance.updateManager),
+                dispose: () => disposeContext(context),
             };
             if (config.onSetup) {
                 await config.onSetup(instance);
@@ -189,22 +208,38 @@ export function createWorkbenchApp(config = {}) {
                     initialDelay: config.updateOptions?.initialDelay,
                     getCurrentVersion: config.updateOptions?.getCurrentVersion,
                 });
+                context.registry.add(() => instance.updateManager.dispose());
             }
             await setupAutomation(instance);
-            setupMcp();
-            setupSimulatorStorage(mainWindow.webContents);
-            wireAppWindowEvents(config, instance);
-            enableDevRendererAutoReload(rendererDir);
+            const mcp = setupMcp();
+            if (mcp)
+                context.registry.add(mcp);
+            context.registry.add(setupSimulatorStorage(mainWindow.webContents, {
+                senderPolicy: context.senderPolicy,
+                // Per-project filter for the simulator-storage panel: the simulator
+                // uses a fixed `persist:simulator` partition + a fixed simulator.html
+                // origin, so localStorage is shared across every project that has
+                // ever opened. The dimina runtime isolates writes with `${appId}_`
+                // prefixes; this callback lets the storage panel filter the CDP
+                // snapshot/event stream to the active appId.
+                getActiveAppId: () => {
+                    const session = context.workspace.getSession();
+                    const appInfo = session?.appInfo;
+                    return appInfo?.appId ?? null;
+                },
+            }));
+            context.registry.add(wireAppWindowEvents(config, instance));
+            context.registry.add(enableDevRendererAutoReload(rendererDir));
             return instance;
         });
         return setupPromise;
     }
     function start() {
-        void setup();
         if (!appEventsRegistered) {
             appEventsRegistered = true;
             registerAppLifecycle();
         }
+        return setup().then(() => undefined);
     }
     return {
         setup,

package/dist/main/app/launch.d.ts

@@ -4,7 +4,7 @@ import type { WorkbenchContext } from '../services/workbench-context.js';
  * Convenience launcher for the default full-featured app.
  * Use createWorkbenchApp() when you want to customize modules or window setup.
  */
-export declare function launch(config?: WorkbenchConfig): void;
+export declare function launch(config?: WorkbenchConfig): Promise<void>;
 export declare function buildDefaultMenu(ctx: WorkbenchContext): void;
-export declare function openSettingsWindow(ctx: Pick<WorkbenchContext, 'workbenchSettingsWindow' | 'mainWindow' | 'rendererDir' | 'notify'>): Promise<void>;
+export declare function openSettingsWindow(ctx: Pick<WorkbenchContext, 'workbenchSettingsWindow' | 'mainWindow' | 'rendererDir' | 'notify' | 'windows'>): Promise<void>;
 //# sourceMappingURL=launch.d.ts.map

package/dist/main/app/launch.js

@@ -7,16 +7,19 @@ import { loadWorkbenchSettings } from '../services/settings/index.js';
  * Use createWorkbenchApp() when you want to customize modules or window setup.
  */
 export function launch(config = {}) {
-    createWorkbenchApp(config).start();
+    return createWorkbenchApp(config).start();
 }
 export function buildDefaultMenu(ctx) {
     installAppMenu(ctx);
 }
 export async function openSettingsWindow(ctx) {
     if (!ctx.workbenchSettingsWindow || ctx.workbenchSettingsWindow.isDestroyed()) {
-        ctx.workbenchSettingsWindow = await createSettingsWindow(ctx.mainWindow, ctx.rendererDir);
-        wireSettingsWindowEvents(ctx.workbenchSettingsWindow, () => {
+        const win = await createSettingsWindow(ctx.mainWindow, ctx.rendererDir);
+        ctx.workbenchSettingsWindow = win;
+        ctx.windows.setSettingsWindow(win);
+        wireSettingsWindowEvents(win, () => {
             ctx.workbenchSettingsWindow = null;
+            ctx.windows.setSettingsWindow(null);
         });
     }
     ctx.workbenchSettingsWindow.show();