@dimina-kit/devtools 0.4.0-dev.20260616085026 → 0.4.0-dev.20260618090552

package/dist/main/services/views/view-manager.js

@@ -8,6 +8,7 @@ import { OPEN_IN_EDITOR_SCHEME, decodeOpenInEditorUrl, resourceUrlToProjectRelat
 import { createSafeAreaController } from '../safe-area/index.js';
 import { buildCustomizeTabsScript } from './devtools-tabs.js';
 import { installElementsForward } from '../elements-forward/index.js';
+import { installServiceConsoleForward } from '../service-console/index.js';
 import * as layout from '../layout/index.js';
 import { handleCustomApiBridgeRequest, } from '../simulator/custom-apis.js';
 import { configureMiniappSession, miniappPartition } from './miniapp-partition.js';
@@ -72,6 +73,10 @@ export function createViewManager(ctx) {
     // CDP traffic at the active render guest). Installed in
     // `attachNativeSimulatorDevtoolsHost`, stopped on detach / host destroyed.
     let stopElementsForward = null;
+    // Disposer for the service-layer console capture (CDP `consoleAPICalled` on the
+    // service host wc → console fan-out). Installed when the DevTools is pointed at
+    // a service host, stopped when that source is closed / swapped.
+    let stopServiceConsole = null;
     let nativeDevtoolsRetryTimer = null;
     let nativeDevtoolsRetryToken = 0;
     // Renderer-driven overlay bounds for the simulator DevTools view — the SOLE
@@ -152,6 +157,9 @@ export function createViewManager(ctx) {
         if (!simulatorViewAdded) {
             ctx.windows.mainWindow.contentView.addChildView(simulatorView);
             simulatorViewAdded = true;
+            // Re-attaching this base overlay moved it to the top of the z-stack; keep
+            // any open settings/popover above it.
+            raiseTopOverlays();
         }
         simulatorView.setBounds(bounds);
     }
@@ -264,6 +272,10 @@ export function createViewManager(ctx) {
     function notifyHostToolbarHeight(height) {
         hostToolbarLastHeight = height;
         ctx.notify.hostToolbarHeightChanged(height);
+        if (settingsViewAdded)
+            applySettingsBounds();
+        if (popoverView)
+            applyPopoverBounds();
     }
     function setHostToolbarHeight(extent) {
         // While the host pins a fixed height, drop advertiser reports entirely —
@@ -357,17 +369,20 @@ export function createViewManager(ctx) {
             return hostToolbarPort.send(channel, payload);
         },
     };
+    function overlayHeaderHeight() {
+        return HEADER_H + hostToolbarLastHeight;
+    }
     function applySettingsBounds() {
         if (!settingsView || ctx.windows.mainWindow.isDestroyed())
             return;
         const [w = 0, h = 0] = ctx.windows.mainWindow.getContentSize();
-        settingsView.setBounds(layout.computeSettingsBounds(w, h, HEADER_H));
+        settingsView.setBounds(layout.computeSettingsBounds(w, h, overlayHeaderHeight()));
     }
     function applyPopoverBounds() {
         if (!popoverView || ctx.windows.mainWindow.isDestroyed())
             return;
         const [w = 0, h = 0] = ctx.windows.mainWindow.getContentSize();
-        popoverView.setBounds(layout.computePopoverBounds(w, h, HEADER_H));
+        popoverView.setBounds(layout.computePopoverBounds(w, h, overlayHeaderHeight()));
     }
     function clearNativeDevtoolsRetry() {
         nativeDevtoolsRetryToken++;
@@ -379,6 +394,11 @@ export function createViewManager(ctx) {
     function closeNativeDevtoolsSource() {
         const source = nativeDevtoolsSourceWc;
         nativeDevtoolsSourceWc = null;
+        try {
+            stopServiceConsole?.();
+        }
+        catch { /* already stopped */ }
+        stopServiceConsole = null;
         if (!source || source.isDestroyed())
             return;
         try {
@@ -550,6 +570,19 @@ export function createViewManager(ctx) {
             // Re-applied on every re-point so a service-host pool swap (fresh
             // openDevTools) re-asserts the custom tab bar.
             customizeDevtoolsTabs(simulatorView.webContents);
+            // Capture service-layer console via CDP (NOT a preload monkeypatch, which
+            // would clobber native source attribution) and feed it to the console
+            // fan-out (automation `App.logAdded`). Bound to THIS service wc; replaced
+            // on the next re-point via closeNativeDevtoolsSource.
+            try {
+                stopServiceConsole?.();
+            }
+            catch { /* already stopped */ }
+            stopServiceConsole = installServiceConsoleForward({
+                serviceWc: next,
+                connections: ctx.connections,
+                emit: (entry) => ctx.consoleForwarder?.emit(entry),
+            }).stop;
             return true;
         }
         catch {
@@ -1031,6 +1064,11 @@ export function createViewManager(ctx) {
             // Overlay loads mainPreloadPath, so the same navigation rules as the
             // main window apply — see navigation-hardening.ts.
             applyNavigationHardening(settingsView.webContents, ctx.rendererDir);
+            // Transparent backing: the settings view now spans the whole content area
+            // (computeSettingsBounds) and its renderer paints a transparent backdrop +
+            // an opaque right-side panel, so the underlying editor/simulator show
+            // through and a backdrop click closes the overlay (mirrors the popover).
+            settingsView.setBackgroundColor('#00000000');
             await settingsView.webContents.loadFile(path.join(ctx.rendererDir, 'entries/settings/index.html'));
         }
         if (!settingsViewAdded) {
@@ -1048,6 +1086,25 @@ export function createViewManager(ctx) {
             settingsViewAdded = false;
         }
     }
+    // Keep the TOP-tier overlays (settings, popover) above the BASE-tier native
+    // overlays (the native simulator WCV + the console/DevTools WCV). Native
+    // overlays are z-ordered by `addChildView` insertion order — the last-added
+    // sits on top — so RE-attaching a base overlay while a top overlay is open
+    // (e.g. the simulator re-shows on a tab switch, or the console bounds
+    // republish re-adds it) would move the base ABOVE the open settings/popover
+    // and occlude it. Whenever a base overlay is (re)added, re-append the open top
+    // overlays so they stay on top. Settings is re-appended before popover so a
+    // simultaneously-open popover ends up topmost. A no-op when neither is open
+    // (pinned by the z-order guard test).
+    function raiseTopOverlays() {
+        if (ctx.windows.mainWindow.isDestroyed())
+            return;
+        const cv = ctx.windows.mainWindow.contentView;
+        if (settingsView && settingsViewAdded)
+            cv.addChildView(settingsView);
+        if (popoverView)
+            cv.addChildView(popoverView);
+    }
     function showPopover(data) {
         hidePopover();
         const popover = new WebContentsView({
@@ -1134,6 +1191,9 @@ export function createViewManager(ctx) {
         if (!nativeSimulatorViewAdded) {
             ctx.windows.mainWindow.contentView.addChildView(nativeSimulatorView);
             nativeSimulatorViewAdded = true;
+            // Re-attaching this base overlay moved it to the top of the z-stack; keep
+            // any open settings/popover above it.
+            raiseTopOverlays();
         }
         nativeSimulatorView.setBounds(p.bounds);
         const simWc = nativeSimulatorView.webContents;

package/dist/main/services/workbench-context.d.ts

@@ -137,12 +137,13 @@ export interface WorkbenchContext {
      */
     storageApi?: StorageApi;
     /**
-     * Native-host console sink. The render-host / service-host guest preloads
-     * monkeypatch `console.*` and post each entry to main as a `consoleLog`
-     * container message; bridge-router routes those here. Owned by the
-     * `ConsoleForwarder` (set in `installBridgeRouter`), whose `emit` fans every
-     * entry out to subscribers (automation WS) AND mirrors render-layer entries
-     * into the service host's own console for the embedded DevTools.
+     * Native-host console sink. Render-layer entries arrive from
+     * render-host/preload.cjs (`console.*` monkeypatch → `consoleLog` message);
+     * service-layer entries arrive from CDP `Runtime.consoleAPICalled`
+     * (services/service-console) so native source attribution is preserved.
+     * Owned by the `ConsoleForwarder` (set in `installBridgeRouter`), whose `emit`
+     * fans every entry out to subscribers (automation WS) AND mirrors render-layer
+     * entries into the service host's own console for the embedded DevTools.
      */
     guestConsole?: {
         emit(entry: unknown): void;

package/dist/native-host/render/render.js

@@ -364,7 +364,7 @@ var T = new class e {
 	}
 }();
 //#endregion
-//#region ../../node_modules/.pnpm/@vue+shared@3.5.37/node_modules/@vue/shared/dist/shared.esm-bundler.js
+//#region ../../node_modules/.pnpm/@vue+shared@3.5.38/node_modules/@vue/shared/dist/shared.esm-bundler.js
 // @__NO_SIDE_EFFECTS__
 function le(e) {
 	let t = /* @__PURE__ */ Object.create(null);
@@ -459,7 +459,7 @@ function ut(e) {
 	return e == null ? "initial" : typeof e == "string" ? e === "" ? " " : e : ((typeof e != "number" || !Number.isFinite(e)) && process.env.NODE_ENV !== "production" && console.warn("[Vue warn] Invalid value used for CSS binding. Expected a string or a finite number but received:", e), String(e));
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@vue+reactivity@3.5.37/node_modules/@vue/reactivity/dist/reactivity.esm-bundler.js
+//#region ../../node_modules/.pnpm/@vue+reactivity@3.5.38/node_modules/@vue/reactivity/dist/reactivity.esm-bundler.js
 function dt(e, ...t) {
 	console.warn(`[Vue warn] ${e}`, ...t);
 }
@@ -1289,7 +1289,7 @@ function Zn(e, t = Infinity, n) {
 	return e;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@vue+runtime-core@3.5.37/node_modules/@vue/runtime-core/dist/runtime-core.esm-bundler.js
+//#region ../../node_modules/.pnpm/@vue+runtime-core@3.5.38/node_modules/@vue/runtime-core/dist/runtime-core.esm-bundler.js
 var Qn = [];
 function $n(e) {
 	Qn.push(e);
@@ -3959,10 +3959,10 @@ function bc() {
 	}
 	window.devtoolsFormatters ? window.devtoolsFormatters.push(i) : window.devtoolsFormatters = [i];
 }
-var xc = "3.5.37", Sc = process.env.NODE_ENV === "production" ? de : z;
+var xc = "3.5.38", Sc = process.env.NODE_ENV === "production" ? de : z;
 process.env.NODE_ENV, process.env.NODE_ENV;
 //#endregion
-//#region ../../node_modules/.pnpm/@vue+runtime-dom@3.5.37/node_modules/@vue/runtime-dom/dist/runtime-dom.esm-bundler.js
+//#region ../../node_modules/.pnpm/@vue+runtime-dom@3.5.38/node_modules/@vue/runtime-dom/dist/runtime-dom.esm-bundler.js
 var Cc = void 0, wc = typeof window < "u" && window.trustedTypes;
 if (wc) try {
 	Cc = /* @__PURE__ */ wc.createPolicy("vue", { createHTML: (e) => e });
@@ -4313,7 +4313,7 @@ function wl(e) {
 	return process.env.NODE_ENV !== "production" && window.ShadowRoot && e instanceof window.ShadowRoot && e.mode === "closed" && Sc("mounting on a ShadowRoot with `{mode: \"closed\"}` may lead to unpredictable bugs"), e;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/vue@3.5.37_typescript@6.0.3/node_modules/vue/dist/vue.runtime.esm-bundler.js
+//#region ../../node_modules/.pnpm/vue@3.5.38_typescript@6.0.3/node_modules/vue/dist/vue.runtime.esm-bundler.js
 function Tl() {
 	bc();
 }