@dimina-kit/devtools 0.4.0-dev.20260703051110 → 0.4.0-dev.20260703101348

package/dist/main/index.bundle.js

@@ -393,6 +393,9 @@ var ProjectChannel = {
   CaptureThumbnail: "project:captureThumbnail",
   GetThumbnail: "project:getThumbnail"
 };
+var SessionChannel = {
+  RuntimeStatus: "session:runtimeStatus"
+};
 var ProjectFsChannel = {
   GetRoot: "project:fs:getRoot",
   ReadFile: "project:fs:readFile",
@@ -1105,6 +1108,9 @@ function createRendererNotifier(ctx) {
     projectStatus(payload) {
       sendToMain(ProjectChannel.Status, payload);
     },
+    sessionRuntimeStatus(payload) {
+      sendToMain(SessionChannel.RuntimeStatus, payload);
+    },
     compileLog(payload) {
       sendToMain(ProjectChannel.CompileLog, payload);
     },
@@ -3927,7 +3933,8 @@ function getProjectPages(dirPath) {
       pages: appJson.pages || [],
       entryPagePath: appJson.entryPagePath || appJson.pages?.[0] || ""
     };
-  } catch {
+  } catch (err2) {
+    log2.warn(`Failed to read project pages from ${appJsonPath}`, err2);
     return { pages: [], entryPagePath: "" };
   }
 }
@@ -4029,8 +4036,8 @@ function createWorkspaceService(ctx) {
   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 });
+  function sendStatus(status2, message, hotReload, pages, watcherDead) {
+    ctx.notify.projectStatus({ status: status2, message, ...hotReload ? { hotReload: true } : {}, ...pages ? { pages } : {}, ...watcherDead ? { watcher: "dead" } : {} });
   }
   function bestEffort(label, fn) {
     try {
@@ -4091,8 +4098,13 @@ function createWorkspaceService(ctx) {
         sourcemap: true,
         fileTypes: ctx.fileTypes,
         watch: compile.watch,
-        onRebuild: () => sendStatus("ready", "\u7F16\u8BD1\u5B8C\u6210\uFF0C\u5DF2\u91CD\u542F", true),
+        onRebuild: () => {
+          const { pages } = getProjectPages(projectPath);
+          sendStatus("ready", "\u7F16\u8BD1\u5B8C\u6210\uFF0C\u5DF2\u91CD\u542F", true, pages.length ? pages : void 0);
+        },
         onBuildError: (err2) => sendStatus("error", String(err2)),
+        // Watcher died mid-session (EMFILE, permission loss, …): non-fatal, so 'ready' stays but `watcher: 'dead'` flags that saves no longer auto-rebuild.
+        onWatcherError: () => sendStatus("ready", "\u6587\u4EF6\u76D1\u542C\u5DF2\u505C\u6B62\uFF0C\u4FDD\u5B58\u4E0D\u518D\u89E6\u53D1\u81EA\u52A8\u7F16\u8BD1", false, void 0, true),
         onLog: (entry) => {
           if (sessionGeneration !== logGeneration) return;
           ctx.notify.compileLog({ stream: entry.stream, text: entry.text, at: Date.now() });
@@ -4957,11 +4969,30 @@ import { app as app12, ipcMain as ipcMain3, protocol as protocol2, session as el
 import path17 from "node:path";
 import { pathToFileURL as pathToFileURL3 } from "node:url";
 
+// src/shared/request-core.ts
+var DEFAULT_REQUEST_TIMEOUT_MS = 6e4;
+var MAX_TIMEOUT_MS = 2147483647;
+function resolveTimeoutBudgetMs(timeout) {
+  const t = Number(timeout);
+  return Number.isFinite(t) && t > 0 && t <= MAX_TIMEOUT_MS ? t : DEFAULT_REQUEST_TIMEOUT_MS;
+}
+
 // src/shared/simulator-api-metadata.ts
 var PERSISTENT_SIMULATOR_APIS = /* @__PURE__ */ new Set(["audioListen"]);
 function isPersistentSimulatorApi(name) {
   return PERSISTENT_SIMULATOR_APIS.has(name);
 }
+var NETWORK_BUDGET_SIMULATOR_APIS = /* @__PURE__ */ new Set([
+  "request",
+  "downloadFile",
+  "uploadFile"
+]);
+var API_CALL_WATCHDOG_MS = 5e3;
+function apiCallWatchdogMs(name, params) {
+  if (!NETWORK_BUDGET_SIMULATOR_APIS.has(name)) return API_CALL_WATCHDOG_MS;
+  const budget = resolveTimeoutBudgetMs(params?.timeout);
+  return Math.min(budget + API_CALL_WATCHDOG_MS, MAX_TIMEOUT_MS);
+}
 
 // src/main/ipc/session-listener-bag.ts
 function createSessionListenerBag() {
@@ -5128,10 +5159,13 @@ function buildServiceHostSpawnUrl(opts) {
   }
   return url.toString();
 }
-function navigateServiceHost(win, url) {
+function navigateServiceHost(win, url, opts) {
   const loaded = Promise.resolve(win.loadURL(url)).then(
     () => void 0,
-    () => void 0
+    (err2) => {
+      opts?.onLoadFailed?.(err2);
+      return void 0;
+    }
   );
   if (!app10.isPackaged && process.env.NODE_ENV !== "test") {
     const w = win;
@@ -5170,7 +5204,7 @@ function serviceHostSpec(appId, projectPath) {
 }
 function createServiceHostWindow(opts) {
   const win = constructServiceHostWindow({ appId: opts.appId, partition: miniappPartition(opts.appId, opts.projectPath) });
-  void navigateServiceHost(win, buildServiceHostSpawnUrl(opts));
+  void navigateServiceHost(win, buildServiceHostSpawnUrl(opts), { onLoadFailed: opts.onLoadFailed });
   return win;
 }
 
@@ -5487,9 +5521,49 @@ function buildForwardScript(level, args) {
   return `(()=>{try{const a=JSON.parse(${JSON.stringify(argsJson)});console[${JSON.stringify(method)}]('[\u89C6\u56FE]',...a)}catch(_){}})()
 //# sourceURL=${RENDER_FORWARD_SOURCE_URL}`;
 }
-function createConsoleForwarder(bridge) {
+var DIAGNOSTIC_CONSOLE_CALL = {
+  error: "console.error",
+  warn: "console.warn",
+  info: "console.info"
+};
+function buildDiagnosticScript(severity, message) {
+  const call = DIAGNOSTIC_CONSOLE_CALL[severity];
+  const argsJson = JSON.stringify([`[dimina-kit] ${message}`]);
+  return `(()=>{try{const a=JSON.parse(${JSON.stringify(argsJson)});${call}(...a)}catch(_){}})()
+//# sourceURL=${RENDER_FORWARD_SOURCE_URL}`;
+}
+function createConsoleForwarder(bridge, diagnostics) {
   const sinks = /* @__PURE__ */ new Set();
   const registry = new DisposableRegistry4();
+  const pendingBySession = /* @__PURE__ */ new Map();
+  const pendingGlobal = [];
+  const readySessions = /* @__PURE__ */ new Set();
+  function injectDiagnostic(wc, d) {
+    wc.executeJavaScript(buildDiagnosticScript(d.severity, d.message), true).catch(() => {
+    });
+  }
+  function handleDiagnostic(d) {
+    if (d.appSessionId) {
+      const wc2 = readySessions.has(d.appSessionId) && bridge.getServiceWcForBridge ? bridge.getServiceWcForBridge(d.appSessionId) : null;
+      if (wc2 && !wc2.isDestroyed()) {
+        injectDiagnostic(wc2, d);
+        return;
+      }
+      const bucket = pendingBySession.get(d.appSessionId);
+      if (bucket) bucket.push(d);
+      else pendingBySession.set(d.appSessionId, [d]);
+      return;
+    }
+    const wc = bridge.getServiceWc();
+    if (wc && !wc.isDestroyed()) {
+      injectDiagnostic(wc, d);
+      return;
+    }
+    pendingGlobal.push(d);
+  }
+  if (diagnostics) {
+    registry.add(diagnostics.subscribe(handleDiagnostic, { replay: true }));
+  }
   function forwardRenderToServiceHost(entry) {
     let wc = null;
     if (entry.bridgeId && bridge.getServiceWcForBridge) {
@@ -5526,13 +5600,84 @@ function createConsoleForwarder(bridge) {
         sinks.delete(sink);
       }));
     },
+    notifyServiceHostReady(appSessionId) {
+      readySessions.add(appSessionId);
+      const wc = bridge.getServiceWcForBridge ? bridge.getServiceWcForBridge(appSessionId) : null;
+      if (!wc) return;
+      const sessionEntries = pendingBySession.get(appSessionId);
+      if (sessionEntries) {
+        for (const d of sessionEntries) injectDiagnostic(wc, d);
+        pendingBySession.delete(appSessionId);
+      }
+      if (pendingGlobal.length) {
+        for (const d of pendingGlobal) injectDiagnostic(wc, d);
+        pendingGlobal.length = 0;
+      }
+    },
     dispose() {
       sinks.clear();
+      pendingBySession.clear();
+      pendingGlobal.length = 0;
+      readySessions.clear();
       return registry.disposeAll();
     }
   };
 }
 
+// src/main/services/diagnostics/index.ts
+var DEFAULT_BUFFER_CAP = 200;
+var CONSOLE_METHOD = {
+  error: "error",
+  warn: "warn",
+  info: "info"
+};
+function createDiagnosticsBus(opts) {
+  const bufferCap = opts?.bufferCap && opts.bufferCap > 0 ? opts.bufferCap : DEFAULT_BUFFER_CAP;
+  const buffer = [];
+  const sinks = /* @__PURE__ */ new Set();
+  let disposed = false;
+  return {
+    report(d) {
+      if (disposed) return;
+      const entry = { ...d, ts: Date.now() };
+      buffer.push(entry);
+      if (buffer.length > bufferCap) buffer.shift();
+      console[CONSOLE_METHOD[entry.severity]](`[dimina-kit:${entry.code}] ${entry.message}`);
+      for (const sink of sinks) {
+        try {
+          sink(entry);
+        } catch {
+        }
+      }
+    },
+    subscribe(sink, subOpts) {
+      const replay = subOpts?.replay ?? true;
+      if (replay) {
+        for (const entry of buffer) {
+          try {
+            sink(entry);
+          } catch {
+          }
+        }
+      }
+      sinks.add(sink);
+      let released = false;
+      return {
+        dispose() {
+          if (released) return;
+          released = true;
+          sinks.delete(sink);
+        }
+      };
+    },
+    dispose() {
+      disposed = true;
+      sinks.clear();
+      buffer.length = 0;
+    }
+  };
+}
+
 // src/main/services/simulator-storage/index.ts
 import { app as app11, webContents as wcStatic } from "electron";
 import { DisposableRegistry as DisposableRegistry5 } from "@dimina-kit/electron-deck/main";
@@ -6103,6 +6248,7 @@ function rewriteSourceMappingUrl(source, scriptUrl) {
 //# sourceMappingURL=${absolute}`;
 }
 var STACK_ID = "stack_0";
+var LAUNCH_TIMEOUT_MS = 2e4;
 var PREWARM_MAX_POOL_SIZE = 4;
 function resolvePrewarmPoolSize() {
   if (process.env.DIMINA_PREWARM_DISABLE === "1") return 0;
@@ -6124,7 +6270,6 @@ function summarizeBridgeMsg(payload) {
   const parts = [type, bridgeId ? `bridge=${bridgeId}` : void 0].filter(Boolean);
   return parts.length > 0 ? parts.join(" ") : void 0;
 }
-var API_CALL_TIMEOUT_MS = 5e3;
 function findAppSessionByAppId(state, appId) {
   let match;
   for (const ap of state.appSessions.values()) if (ap.appId === appId) match = ap;
@@ -6294,13 +6439,20 @@ function installBridgeRouter(ctx) {
     ;
     globalThis.__diminaResourceCensus = () => bridgeHandle.census?.();
   }
-  const consoleForwarder = createConsoleForwarder(bridgeHandle);
+  const ownsDiagnosticsBus = ctx.diagnostics === void 0;
+  const diagnosticsBus = ctx.diagnostics ?? createDiagnosticsBus();
+  ctx.diagnostics = diagnosticsBus;
+  const consoleForwarder = createConsoleForwarder(bridgeHandle, diagnosticsBus);
   ctx.consoleForwarder = consoleForwarder;
   ctx.guestConsole = consoleForwarder;
   ctx.registry.add(() => {
     void consoleForwarder.dispose();
     ctx.consoleForwarder = void 0;
     ctx.guestConsole = void 0;
+    if (ownsDiagnosticsBus) {
+      diagnosticsBus.dispose();
+      ctx.diagnostics = void 0;
+    }
   });
   const onActivePage = (event, payload) => {
     const ap = state.appSessions.get(payload.appSessionId);
@@ -6460,6 +6612,39 @@ function installBridgeRouter(ctx) {
     );
   });
 }
+function clearLaunchTimer(ap) {
+  if (ap.launchTimer === null) return;
+  clearTimeout(ap.launchTimer);
+  ap.launchTimer = null;
+}
+function startLaunchTimer(state, ctx, ap) {
+  ap.launchTimer = setTimeout(() => {
+    ap.launchTimer = null;
+    if (ap.running) return;
+    if (state.appSessions.get(ap.appSessionId) !== ap) return;
+    const reason = `Service host did not report readiness within ${LAUNCH_TIMEOUT_MS}ms`;
+    ctx.diagnostics?.report({
+      severity: "error",
+      code: "launch-timeout",
+      message: reason,
+      appSessionId: ap.appSessionId
+    });
+    pushRuntimeStatus(ctx, ap, { phase: "launch-failed", code: "timeout", reason });
+  }, LAUNCH_TIMEOUT_MS);
+}
+function markSessionRunning(ctx, ap, page) {
+  if (!page.isRoot || ap.running) return;
+  ap.running = true;
+  clearLaunchTimer(ap);
+  pushRuntimeStatus(ctx, ap, { phase: "running" });
+}
+function pushRuntimeStatus(ctx, session5, status2) {
+  ctx.notify?.sessionRuntimeStatus?.({
+    appId: session5.appId,
+    ...status2,
+    ...session5.pageFallback ? { pageFallback: session5.pageFallback } : {}
+  });
+}
 async function handleSpawn(state, ctx, event, opts) {
   const appId = opts.appId;
   if (!appId) throw new Error("[bridge-router] spawn requires appId");
@@ -6485,20 +6670,48 @@ async function handleSpawn(state, ctx, event, opts) {
     ...selectedDevice ? deviceInfoToHostEnv(selectedDevice) : {}
   });
   const appConfig = await loadAppConfig(
-    resourceServer ? resourceServer.baseUrl : `${resourceBaseUrl}${appId}/${root}/`
+    resourceServer ? resourceServer.baseUrl : `${resourceBaseUrl}${appId}/${root}/`,
+    ({ url, error }) => {
+      ctx.diagnostics?.report({
+        severity: "error",
+        code: "app-config-unreachable",
+        message: `app-config.json unreachable at ${url}: ${String(error)}`,
+        appSessionId
+      });
+    }
   );
   const manifest = buildAppManifest(appConfig, pagePath);
-  const rootWindowConfig = resolvePageWindowConfig(appConfig, pagePath);
-  const isTab = isTabPage(appConfig, pagePath);
+  const { resolvedPagePath, pageFallbackApplied } = resolveRootPagePath(manifest, pagePath);
+  if (pageFallbackApplied) {
+    reportPageNotFound(ctx, appSessionId, pagePath, resolvedPagePath);
+  }
+  const rootWindowConfig = resolvePageWindowConfig(appConfig, resolvedPagePath);
+  const isTab = isTabPage(appConfig, resolvedPagePath);
   const usedPool = state.pool !== null;
   let poolEntryId = null;
   let serviceWindow;
+  const reportServiceHostNavigationFailed = (spawnUrl, err2) => {
+    const message = `Failed to navigate service host to ${spawnUrl}: ${String(err2)}`;
+    ctx.diagnostics?.report({
+      severity: "error",
+      code: "service-host-navigation-failed",
+      message,
+      appSessionId
+    });
+    const ap = state.appSessions.get(appSessionId);
+    if (ap) clearLaunchTimer(ap);
+    pushRuntimeStatus(
+      ctx,
+      ap ?? { appId, pageFallback: pageFallbackApplied ? { requested: pagePath, resolved: resolvedPagePath } : null },
+      { phase: "launch-failed", code: "service-host-navigation-failed", reason: message }
+    );
+  };
   if (state.pool) {
     const acquired = await state.pool.acquire(serviceHostSpec());
     serviceWindow = acquired.win;
     poolEntryId = acquired.entryId;
   } else {
-    serviceWindow = createServiceHostWindow({
+    const freshWindowOptions = {
       bridgeId,
       appId,
       // Same (appId, projectPath) pair the simulator WCV uses, so this project's
@@ -6508,12 +6721,16 @@ async function handleSpawn(state, ctx, event, opts) {
       // 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,
+      pagePath: resolvedPagePath,
       pkgRoot,
       root,
       resourceBaseUrl,
       hostEnvSnapshot: hostEnv,
       apiNamespaces
+    };
+    serviceWindow = createServiceHostWindow({
+      ...freshWindowOptions,
+      onLoadFailed: (err2) => reportServiceHostNavigationFailed(buildServiceHostSpawnUrl(freshWindowOptions), err2)
     });
   }
   const appSession = {
@@ -6537,12 +6754,15 @@ async function handleSpawn(state, ctx, event, opts) {
     poolEntryId,
     onServiceBoot: null,
     listenerBag: createSessionListenerBag(),
-    registryHandle: null
+    registryHandle: null,
+    running: false,
+    launchTimer: null,
+    pageFallback: pageFallbackApplied ? { requested: pagePath, resolved: resolvedPagePath } : null
   };
   const rootPage = {
     bridgeId,
     appSessionId,
-    pagePath,
+    pagePath: resolvedPagePath,
     query: opts.query ?? {},
     isRoot: true,
     isTab,
@@ -6587,28 +6807,43 @@ async function handleSpawn(state, ctx, event, opts) {
     };
     appSession.onServiceBoot = bootOnServiceLoad;
     serviceWindow.webContents.on("did-finish-load", bootOnServiceLoad);
-    void navigateServiceHost(
-      serviceWindow,
-      buildServiceHostSpawnUrl({
-        bridgeId,
-        appId,
-        pagePath,
-        pkgRoot,
-        root,
-        resourceBaseUrl,
-        hostEnvSnapshot: hostEnv,
-        apiNamespaces
-      })
-    );
+    const spawnUrl = buildServiceHostSpawnUrl({
+      bridgeId,
+      appId,
+      pagePath: resolvedPagePath,
+      pkgRoot,
+      root,
+      resourceBaseUrl,
+      hostEnvSnapshot: hostEnv,
+      apiNamespaces
+    });
+    void navigateServiceHost(serviceWindow, spawnUrl, {
+      onLoadFailed: (err2) => reportServiceHostNavigationFailed(spawnUrl, err2)
+    });
   } else {
     serviceWindow.webContents.once("did-finish-load", () => {
       void bootServiceHost(state, appSession, ctx);
     });
   }
+  const onServiceCrashed = () => {
+    clearLaunchTimer(appSession);
+    ctx.diagnostics?.report({
+      severity: "error",
+      code: "service-host-crashed",
+      message: `Service host renderer process gone for appSessionId=${appSessionId}`,
+      appSessionId
+    });
+    pushRuntimeStatus(ctx, appSession, { phase: "crashed", code: "service-host-crashed" });
+  };
+  appSession.listenerBag.on(serviceWindow.webContents, "render-process-gone", onServiceCrashed);
+  pushRuntimeStatus(ctx, appSession, { phase: "launching" });
+  startLaunchTimer(state, ctx, appSession);
   return {
     appSessionId,
     bridgeId,
     pagePath,
+    resolvedPagePath,
+    pageFallbackApplied,
     serviceWcId: serviceWindow.webContents.id,
     resourceBaseUrl,
     manifest,
@@ -6622,6 +6857,9 @@ async function handlePageOpen(state, event, opts) {
     throw new Error("[bridge-router] PAGE_OPEN rejected: caller not bound to app session");
   }
   const pagePath = normalizePagePath(opts.pagePath);
+  if (ap.manifest.source === "app-config" && !ap.manifest.pages.includes(pagePath)) {
+    throw new Error(`[bridge-router] PAGE_OPEN rejected: page-not-found "${pagePath}" is not in the compiled manifest`);
+  }
   const bridgeId = opts.bridgeId || newBridgeId();
   const windowConfig = resolvePageWindowConfig(ap.appConfig, pagePath);
   const isTab = isTabPage(ap.appConfig, pagePath);
@@ -6681,15 +6919,18 @@ function handleNavCallback(state, sender, payload) {
 }
 async function bootServiceHost(state, ap, ctx) {
   if (state.appSessions.get(ap.appSessionId) !== ap) return;
+  ctx.consoleForwarder?.notifyServiceHostReady?.(ap.appSessionId);
   ap.logicInjected = await injectLogicBundle(ap);
   if (!ap.logicInjected) {
-    reportLogicLoadFailure(ap, ctx);
+    const reason = reportLogicLoadFailure(ap, ctx);
+    clearLaunchTimer(ap);
+    pushRuntimeStatus(ctx, ap, { phase: "launch-failed", code: "logic-bundle-unreachable", reason });
     return;
   }
   const rootPage = ap.pages.get(ap.appSessionId);
   const rootMissing = !!rootPage && !pageInManifest(ap, rootPage.pagePath);
   if (rootMissing) {
-    reportPageNotFound(ap, ctx, rootPage.pagePath);
+    reportPageNotFound(ctx, ap.appSessionId, rootPage.pagePath);
   } else if (rootPage) {
     forwardToService(ap, makeLoadResource(ap, rootPage, "service"));
   }
@@ -6723,16 +6964,30 @@ async function injectLogicBundle(ap) {
 }
 function reportLogicLoadFailure(ap, ctx) {
   const hint = ap.appId === "unknown" ? ' appId could not be resolved (it fell back to "unknown") \u2014 the mini-program likely failed to compile or its project manifest/app config is missing.' : "";
-  const message = `[dimina-kit] Failed to load the mini-program logic bundle from ${logicBundleUrl(ap)}. The service runtime has no registered modules, so no page can mount.` + hint + ` Verify the project compiled successfully and that the resource server serves "${ap.appId}/${ap.root}/".`;
-  console.error(message);
+  const shortReason = `[dimina-kit] Failed to load the mini-program logic bundle from ${logicBundleUrl(ap)}.`;
+  const message = `${shortReason} The service runtime has no registered modules, so no page can mount.` + hint + ` Verify the project compiled successfully and that the resource server serves "${ap.appId}/${ap.root}/".`;
+  ctx.diagnostics?.report({
+    severity: "error",
+    code: "logic-bundle-unreachable",
+    message,
+    appSessionId: ap.appSessionId
+  });
   ctx.guestConsole?.emit({ source: "service", level: "error", args: [message] });
+  return shortReason;
 }
 function pageInManifest(ap, pagePath) {
+  if (ap.manifest.source !== "app-config") return true;
   return ap.manifest.pages.includes(normalizePagePath(pagePath));
 }
-function reportPageNotFound(ap, ctx, pagePath) {
-  const message = `Page[${pagePath}] not found. May be caused by: 1. Forgetting to add page route in app.json. 2. Invoking Page() in async task.`;
-  console.error(`[bridge-router] ${message}`);
+function reportPageNotFound(ctx, appSessionId, pagePath, fallbackTo) {
+  const base = `Page[${pagePath}] not found. May be caused by: 1. Forgetting to add page route in app.json. 2. Invoking Page() in async task.`;
+  const message = fallbackTo ? `${base} Falling back to "${fallbackTo}".` : base;
+  ctx.diagnostics?.report({
+    severity: "error",
+    code: "page-not-found",
+    message,
+    appSessionId
+  });
   ctx.guestConsole?.emit({ source: "service", level: "error", args: [message] });
 }
 function maybeSendResourceLoaded(ap, page) {
@@ -6789,6 +7044,11 @@ function routeFromRender(state, ap, page, msg, ctx) {
     handleContainerMsg(ap, page, msg, ctx, state);
   }
 }
+function reportServiceUncaughtError(ctx, ap, body) {
+  const severity = body.level === "error" ? "error" : body.level === "warn" ? "warn" : "info";
+  const message = Array.isArray(body.args) ? body.args.map((a) => String(a)).join(" ") : String(body.args ?? "");
+  ctx.diagnostics?.report({ severity, code: "service-uncaught-error", message, appSessionId: ap.appSessionId });
+}
 function handleContainerMsg(ap, page, msg, ctx, state) {
   switch (msg.type) {
     case "serviceResourceLoaded":
@@ -6807,22 +7067,31 @@ function handleContainerMsg(ap, page, msg, ctx, state) {
         ap.simulatorWc.send(SIMULATOR_EVENTS.DOM_READY, { bridgeId: page.bridgeId });
       }
       state.emitRenderEvent({ kind: "domReady", appId: ap.appId, bridgeId: page.bridgeId });
+      markSessionRunning(ctx, ap, page);
       break;
     case "invokeAPI":
       void handleSimulatorApi(state, ap, page, msg.body, ctx);
       break;
     case "serviceHostError": {
-      console.warn("[bridge-router] service host error:", msg.body);
       const errBody = msg.body;
       const errArg = errBody?.message ?? msg.body;
+      ctx.diagnostics?.report({
+        severity: "error",
+        code: "service-host-error",
+        message: String(errArg),
+        appSessionId: ap.appSessionId
+      });
       for (const id of state.appLifecycle.listeners(ap.appSessionId, "onError")) {
         sendCallback(ap, id, errArg);
       }
       break;
     }
-    case "consoleLog":
+    case "consoleLog": {
       ctx.guestConsole?.emit(msg.body);
+      const body = msg.body;
+      if (body?.source === "service") reportServiceUncaughtError(ctx, ap, body);
       break;
+    }
     case "storageChanged":
       ctx.onServiceStorageChanged?.(ap.appId, msg.body);
       break;
@@ -6903,16 +7172,44 @@ function handleNavBarApi(ap, page, name, params) {
   sendCallback(ap, params.success, successResult);
   sendCallback(ap, params.complete, successResult);
 }
+function failActionCallback(ap, params, errMsg) {
+  const fail = { errMsg };
+  sendCallback(ap, params.fail, fail);
+  sendCallback(ap, params.complete, fail);
+}
 function sendActionOrFail(ap, eventName, payload, name, params) {
   if (!ap.simulatorWc.isDestroyed()) {
     ap.simulatorWc.send(eventName, payload);
     return;
   }
-  const fail = { errMsg: `${name}:fail simulator window destroyed` };
-  sendCallback(ap, params.fail, fail);
-  sendCallback(ap, params.complete, fail);
+  failActionCallback(ap, params, `${name}:fail simulator window destroyed`);
+}
+function extractNavTargetPagePath(params) {
+  const raw = params.url;
+  if (typeof raw !== "string" || !raw) return void 0;
+  return normalizePagePath(raw.split("?")[0] ?? raw);
 }
-function handleNavActionApi(ap, page, name, params) {
+function checkNavTarget(ap, name, targetPagePath) {
+  if (ap.manifest.source !== "app-config") return { ok: true };
+  if (!ap.manifest.pages.includes(targetPagePath)) {
+    return { ok: false, errMsg: `${name}:fail page "${targetPagePath}" is not found`, reportNotFound: true };
+  }
+  if (name === "switchTab") {
+    const inTabBar = ap.manifest.tabBar?.list.some((item) => normalizePagePath(item.pagePath) === targetPagePath) ?? false;
+    if (!inTabBar) return { ok: false, errMsg: "switchTab:fail can not switch to no-tabBar page" };
+  }
+  return { ok: true };
+}
+function handleNavActionApi(ap, ctx, page, name, params) {
+  const targetPagePath = extractNavTargetPagePath(params);
+  if (targetPagePath !== void 0) {
+    const verdict = checkNavTarget(ap, name, targetPagePath);
+    if (!verdict.ok) {
+      if (verdict.reportNotFound) reportPageNotFound(ctx, ap.appSessionId, targetPagePath);
+      failActionCallback(ap, params, verdict.errMsg);
+      return;
+    }
+  }
   const payload = {
     appSessionId: ap.appSessionId,
     bridgeId: page.bridgeId,
@@ -6974,7 +7271,7 @@ async function handleSimulatorApi(state, ap, page, body, ctx) {
     return;
   }
   if (NAV_ACTION_NAMES.has(name)) {
-    handleNavActionApi(ap, page, name, params);
+    handleNavActionApi(ap, ctx, page, name, params);
     return;
   }
   if (TAB_ACTION_NAMES.has(name)) {
@@ -7016,7 +7313,7 @@ function forwardApiCallToSimulator(state, ap, page, name, params) {
     const fail = { errMsg: `${pending.name}:fail no handler (timeout)` };
     sendCallback(target, pending.callbacks.fail, fail);
     sendCallback(target, pending.callbacks.complete, fail);
-  }, API_CALL_TIMEOUT_MS);
+  }, apiCallWatchdogMs(name, params));
   state.pendingApiCalls.set(requestId, {
     appSessionId: ap.appSessionId,
     callbacks,
@@ -7065,7 +7362,12 @@ function handleApiResponse(state, sender, payload) {
     sendCallback(ap, pending.callbacks.success, payload.result);
     sendCallback(ap, pending.callbacks.complete, payload.result ?? { errMsg: `${pending.name}:ok` });
   } else {
-    const fail = { errMsg: payload.errMsg ?? `${pending.name}:fail` };
+    const result = payload.result && typeof payload.result === "object" && !Array.isArray(payload.result) ? payload.result : void 0;
+    const resultErrMsg = typeof result?.errMsg === "string" ? result.errMsg : void 0;
+    const fail = {
+      ...result,
+      errMsg: payload.errMsg || resultErrMsg || `${pending.name}:fail`
+    };
     sendCallback(ap, pending.callbacks.fail, fail);
     sendCallback(ap, pending.callbacks.complete, fail);
   }
@@ -7259,6 +7561,7 @@ async function disposeAppSession(state, appSessionId, opts = {}) {
   const ap = state.appSessions.get(appSessionId);
   if (!ap) return;
   state.appSessions.delete(appSessionId);
+  clearLaunchTimer(ap);
   const registryHandle = ap.registryHandle;
   ap.registryHandle = null;
   void registryHandle?.dispose();
@@ -7276,25 +7579,45 @@ async function disposeAppSession(state, appSessionId, opts = {}) {
     });
   }
 }
-async function loadAppConfig(resourceBase) {
+async function loadAppConfig(resourceBase, onUnreachable) {
   const cfgUrl = new URL("app-config.json", resourceBase.endsWith("/") ? resourceBase : `${resourceBase}/`).toString();
   try {
     const res = await fetch(cfgUrl);
     if (!res.ok) {
+      const error = new Error(`app-config.json fetch ${res.status} at ${cfgUrl}`);
       console.warn(`[bridge-router] no app-config.json at ${cfgUrl} (${res.status})`);
+      onUnreachable?.({ url: cfgUrl, error });
       return {};
     }
     return await res.json();
   } catch (error) {
     console.warn("[bridge-router] failed to fetch/parse app-config.json:", error);
+    onUnreachable?.({ url: cfgUrl, error });
     return {};
   }
 }
 function buildAppManifest(appConfig, fallbackEntry) {
   const entry = appConfig.app?.entryPagePath || fallbackEntry;
-  const pages = appConfig.app?.pages?.length ? appConfig.app.pages : [entry];
+  const hasCompiledPages = !!appConfig.app?.pages?.length;
+  const pages = hasCompiledPages ? appConfig.app.pages : [entry];
   const tabBar = appConfig.app?.tabBar && Array.isArray(appConfig.app.tabBar.list) && appConfig.app.tabBar.list.length > 0 ? appConfig.app.tabBar : void 0;
-  return { entryPagePath: normalizePagePath(entry), pages: pages.map(normalizePagePath), tabBar };
+  return {
+    entryPagePath: normalizePagePath(entry),
+    pages: pages.map(normalizePagePath),
+    tabBar,
+    // 'app-config' means `pages` above is the real compiled list mount gates
+    // can trust; 'fallback' means app-config.json was unreachable and `pages`
+    // is just the single requested page — nothing to validate membership
+    // against, so every gate keyed on this source lets it through unchanged.
+    source: hasCompiledPages ? "app-config" : "fallback"
+  };
+}
+function resolveRootPagePath(manifest, requestedPagePath) {
+  if (manifest.source !== "app-config" || manifest.pages.includes(requestedPagePath)) {
+    return { resolvedPagePath: requestedPagePath, pageFallbackApplied: false };
+  }
+  const resolvedPagePath = manifest.pages.includes(manifest.entryPagePath) ? manifest.entryPagePath : manifest.pages[0];
+  return { resolvedPagePath, pageFallbackApplied: true };
 }
 function resolvePageWindowConfig(appConfig, pagePath) {
   const normalized = normalizePagePath(pagePath);
@@ -8971,6 +9294,7 @@ function createNetworkForwarder(bridge) {
   let sink = "idle";
   let probeConsoleBuffer = [];
   let readyTimeoutTimer = null;
+  let probeDeadline = null;
   let dispatchQueue = [];
   let flushScheduled = false;
   let readyRetryTimer = null;
@@ -8981,6 +9305,7 @@ function createNetworkForwarder(bridge) {
   function beginProbing() {
     if (sink === "probing") return;
     sink = "probing";
+    probeDeadline = Date.now() + DEVTOOLS_READY_TIMEOUT_MS;
     if (readyTimeoutTimer) clearTimeout(readyTimeoutTimer);
     readyTimeoutTimer = setTimeout(() => {
       readyTimeoutTimer = null;
@@ -8989,6 +9314,7 @@ function createNetworkForwarder(bridge) {
   }
   function markReady() {
     sink = "ready";
+    probeDeadline = null;
     if (readyTimeoutTimer) {
       clearTimeout(readyTimeoutTimer);
       readyTimeoutTimer = null;
@@ -9001,6 +9327,7 @@ function createNetworkForwarder(bridge) {
   }
   function degradeToConsole() {
     sink = "degraded";
+    probeDeadline = null;
     dispatchQueue = [];
     if (readyTimeoutTimer) {
       clearTimeout(readyTimeoutTimer);
@@ -9105,9 +9432,17 @@ function createNetworkForwarder(bridge) {
   }
   function scheduleReadyRetry() {
     if (readyRetryTimer || sink === "ready" || sink === "degraded") return;
+    if (probeDeadline !== null && Date.now() >= probeDeadline) {
+      degradeToConsole();
+      return;
+    }
     readyRetryTimer = setTimeout(() => {
       readyRetryTimer = null;
       if (sink === "degraded") return;
+      if (probeDeadline !== null && Date.now() >= probeDeadline) {
+        degradeToConsole();
+        return;
+      }
       if (dispatchQueue.length > 0) scheduleFlush();
     }, READY_RETRY_MS);
   }
@@ -9146,6 +9481,7 @@ function createNetworkForwarder(bridge) {
     dispatchQueue = [];
     probeConsoleBuffer = [];
     sink = "idle";
+    probeDeadline = null;
     if (readyRetryTimer) {
       clearTimeout(readyRetryTimer);
       readyRetryTimer = null;
@@ -9296,6 +9632,7 @@ function createNetworkForwarder(bridge) {
       clearTimeout(readyRetryTimer);
       readyRetryTimer = null;
     }
+    probeDeadline = null;
     probeConsoleBuffer = [];
     if (!devtoolsWc) {
       sink = "idle";
@@ -9319,6 +9656,7 @@ function createNetworkForwarder(bridge) {
         }
       });
     }
+    sink = "idle";
     beginProbing();
     if (dispatchQueue.length > 0) scheduleFlush();
   }
@@ -10388,6 +10726,11 @@ function setupSimulatorTempFiles(simSession) {
 // src/main/services/views/simulator-session-policy.ts
 import { session as session3 } from "electron";
 import { toDisposable as toDisposable7 } from "@dimina-kit/electron-deck/main";
+var CORS_OVERRIDE_HEADERS = /* @__PURE__ */ new Set([
+  "access-control-allow-origin",
+  "access-control-allow-headers",
+  "access-control-allow-methods"
+]);
 function applySimulatorWebRequestPolicy(simulatorSession) {
   simulatorSession.webRequest.onBeforeSendHeaders((details, callback) => {
     const forcedReferer = getSimulatorServicewechatReferer();
@@ -10398,6 +10741,9 @@ function applySimulatorWebRequestPolicy(simulatorSession) {
   });
   simulatorSession.webRequest.onHeadersReceived((details, callback) => {
     const headers = details.responseHeaders ?? {};
+    for (const key of Object.keys(headers)) {
+      if (CORS_OVERRIDE_HEADERS.has(key.toLowerCase())) delete headers[key];
+    }
     headers["access-control-allow-origin"] = ["*"];
     headers["access-control-allow-headers"] = ["*"];
     headers["access-control-allow-methods"] = ["*"];