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

package/dist/main/ipc/bridge-router.js

@@ -453,7 +453,10 @@ async function handleSpawn(state, ctx, event, opts) {
     const appSessionId = bridgeId;
     const simulatorWc = resolveSimulatorWebContents(ctx, opts.simulatorWcId, event.sender);
     const pagePath = normalizePagePath(opts.pagePath || 'pages/index/index');
-    const pkgRoot = path.resolve(opts.pkgRoot || process.cwd());
+    const workspaceProjectPath = typeof ctx.workspace.getProjectPath === 'function'
+        ? ctx.workspace.getProjectPath()
+        : '';
+    const pkgRoot = path.resolve(opts.pkgRoot || workspaceProjectPath || process.cwd());
     const root = opts.root || 'main';
     // Resource base resolution. Preferred: the simulator-supplied dev-server
     // origin, which statically serves the compiled `<appId>/<root>/…` tree (same
@@ -505,6 +508,7 @@ async function handleSpawn(state, ctx, event, opts) {
             appId,
             pagePath,
             pkgRoot,
+            root,
             resourceBaseUrl,
             hostEnvSnapshot: hostEnv,
         });
@@ -608,6 +612,7 @@ async function handleSpawn(state, ctx, event, opts) {
             appId,
             pagePath,
             pkgRoot,
+            root,
             resourceBaseUrl,
             hostEnvSnapshot: hostEnv,
         }));
@@ -1099,13 +1104,13 @@ function makeLoadResource(ap, page, target) {
             // dimina's service runtime reads hostEnv as `{ systemInfo, menuRect }`
             // (core/host-env.js init → getSystemInfo/getMenuRect; invokeAPI resolves
             // getSystemInfoSync/getWindowInfo/getDeviceInfo from hostEnv.systemInfo).
-            // We previously sent the FLAT HostEnvSnapshot, so `systemInfo` was null →
-            // `wx.getSystemInfoSync()` returned null and pages reading
-            // `.screenWidth` threw. Nest it under `systemInfo`. (render does NOT read
-            // hostEnv, so this is service-only; the devtools sync-api-patch reads the
-            // separate __diminaSpawnContext.hostEnvSnapshot and is unaffected.)
-            // menuRect stays null as before — getMenuButtonBoundingClientRect is
-            // served by the sync-api-patch / DeviceShell capsule, not this path.
+            // The snapshot must be nested under `systemInfo`: a FLAT HostEnvSnapshot
+            // leaves `systemInfo` null → `wx.getSystemInfoSync()` returns null and
+            // pages reading `.screenWidth` throw. (render does NOT read hostEnv, so
+            // this is service-only; the devtools sync-api-patch reads the separate
+            // __diminaSpawnContext.hostEnvSnapshot and is unaffected.)
+            // menuRect stays null — getMenuButtonBoundingClientRect is served by the
+            // sync-api-patch / DeviceShell capsule, not this path.
             hostEnv: { systemInfo: ap.hostEnv, menuRect: null },
         },
     };

package/dist/main/ipc/projects.js

@@ -49,7 +49,7 @@ export function registerProjectsIpc(ctx) {
         const [dirPath] = validate(ProjectsChannel.Remove, ProjectsRemoveSchema, args);
         return ctx.workspace.removeProject(dirPath);
     })
-        // ── Phase 3: template catalog + create flow ──
+        // ── template catalog + create flow ──
         .handle(ProjectsChannel.ListTemplates, () => {
         // Sanitize at the IPC boundary: `generate` is a function and the
         // structured-clone algorithm Electron uses for invoke would otherwise

package/dist/main/ipc/simulator.js

@@ -7,7 +7,7 @@ export function registerSimulatorIpc(ctx) {
     return new IpcRegistry(ctx.senderPolicy)
         .handle(SimulatorChannel.AttachNative, (_, ...args) => {
         const [simulatorUrl, simWidth] = validate(SimulatorChannel.AttachNative, SimulatorAttachNativeSchema, args);
-        ctx.views.attachNativeSimulator(simulatorUrl, simWidth);
+        return ctx.views.attachNativeSimulator(simulatorUrl, simWidth);
     })
         .handle(SimulatorChannel.Detach, () => {
         ctx.views.detachSimulator();

package/dist/main/runtime/miniapp-runtime.d.ts

@@ -83,9 +83,9 @@ declare global {
     }
 }
 /**
- * Host-facing control surface for the toolbar WebContentsView — the exact
- * post-R2 message-channel surface (`send`/`onMessage`), with no `webContents`
- * escape hatch (that would put Electron types on the contract).
+ * Host-facing control surface for the toolbar WebContentsView — a
+ * message-channel surface (`send`/`onMessage`), with no `webContents` escape
+ * hatch (that would put Electron types on the contract).
  */
 export interface MiniappHostToolbar {
     /**

package/dist/main/services/elements-forward/index.js

@@ -36,7 +36,7 @@
  * no longer active is dropped (its in-flight command id is settled with an error
  * so the front-end never leaks a pending request, and stale nodes never bleed into
  * the new tree); and switching away and BACK to a previously-wired guest RESUMES
- * its forwarding (a snapshot would strand it — that was bug B2).
+ * its forwarding (a snapshot would strand it).
  *
  * ── Degradation ──────────────────────────────────────────────────────────────
  * Hook unavailable / `DevToolsAPI` missing / no active guest → routing is simply
@@ -46,7 +46,7 @@
  *
  * This is a production feature (no env gate, default on for the native simulator).
  * It deliberately re-implements the small pure helpers it needs (routing table,
- * hook + dispatch scripts) rather than importing the throwaway spike file.
+ * hook + dispatch scripts) as self-contained code.
  */
 import { webContents as electronWebContents } from 'electron';
 /**
@@ -198,8 +198,8 @@ export function installElementsForward(deps) {
     // bridge per check — NOT a generation snapshot. An event/response is honoured
     // only while its originating guest is still the active one, so switching away
     // and BACK to a previously-wired guest RESUMES its forwarding (a snapshot would
-    // strand it forever — that was bug B2). It also means destroying some OTHER
-    // (non-active) guest never stales the active guest's in-flight commands.
+    // strand it forever). It also means destroying some OTHER (non-active) guest
+    // never stales the active guest's in-flight commands.
     const isActiveWcId = (id) => {
         const a = activeRenderWc();
         return a != null && a.id === id;
@@ -395,7 +395,7 @@ export function installElementsForward(deps) {
             }
             // A destroyed guest is no longer the active one, so its in-flight commands
             // fail `isActiveWcId` and settle as errors on their own — no global bump
-            // (which would wrongly stale OTHER, still-active guests' commands: bug MINOR-3).
+            // (which would wrongly stale OTHER, still-active guests' commands).
             // If we own this wc's session there is nothing left to detach; drop it.
             selfAttached.delete(wc.id);
         };

package/dist/main/services/network-forward/index.d.ts

@@ -14,8 +14,8 @@
  * `direct-request.ts`/`simulator-api-network.ts`, which call `fetch()` /
  * `XMLHttpRequest`). Those requests therefore go through the simulator WCV's
  * network stack — a DIFFERENT webContents than the one the DevTools front-end
- * inspects — so they were invisible in the Network panel after the native-host
- * refactor. THAT is the regression this service closes.
+ * inspects — so they are otherwise invisible in the Network panel. This service
+ * surfaces them.
  *
  * ── How it surfaces them (primary sink: native Network tab) ─────────────────
  * We attach the CDP `webContents.debugger` to the simulator WCV, `Network.enable`,
@@ -32,9 +32,8 @@
  * into a namespaced virtual id (`dimina:sim:<epoch>:<rawId>`) before dispatch,
  * keeping a raw→virtual map so redirects / extra-info / completion events on the
  * same request stay correlated. We inject on the MAIN session (no `sessionId`),
- * i.e. the events appear as activity on the currently-inspected target. This is
- * the one-shot approach the Codex review settled on; child-target routing
- * (`Target.attachedToTarget` + hooking outbound CDP) is explicitly deferred.
+ * i.e. the events appear as activity on the currently-inspected target. Child-
+ * target routing (`Target.attachedToTarget` + hooking outbound CDP) is deferred.
  *
  * ── Fallback sink (console line) ────────────────────────────────────────────
  * If the DevTools host wc is unavailable, or `window.DevToolsAPI.dispatchMessage`
@@ -127,7 +126,7 @@ export interface NetworkForwarder extends Disposable {
  * Anything carrying a requestId must be namespaced consistently — even methods
  * we don't (yet) forward — so the raw→virtual map stays coherent if forwarding
  * is widened later. `requestServedFromCache` and `resourceChangedPriority` are
- * included for that reason (MINOR: rewrite-only today, not forwarded).
+ * included for that reason (rewrite-only today, not forwarded).
  */
 export declare const REWRITE_REQUEST_ID_METHODS: ReadonlySet<string>;
 /** The Network.* methods this one-shot pass forwards to the front-end. */

package/dist/main/services/network-forward/index.js

@@ -5,7 +5,7 @@ import { DisposableRegistry, toDisposable } from '@dimina-kit/electron-deck/main
  * Anything carrying a requestId must be namespaced consistently — even methods
  * we don't (yet) forward — so the raw→virtual map stays coherent if forwarding
  * is widened later. `requestServedFromCache` and `resourceChangedPriority` are
- * included for that reason (MINOR: rewrite-only today, not forwarded).
+ * included for that reason (rewrite-only today, not forwarded).
  */
 export const REWRITE_REQUEST_ID_METHODS = new Set([
     'Network.requestWillBeSent',
@@ -243,10 +243,9 @@ export function createNetworkForwarder(bridge) {
     let attachDisposables = null;
     // The DevTools front-end host wc (primary sink), set by the ViewManager.
     let devtoolsWc = null;
-    // Teardown for the wc 'destroyed' watcher on the current host (clears the host
-    // here, in this file — view-manager is owned by another change and untouched).
+    // Teardown for the wc 'destroyed' watcher on the current host (clears the host).
     let devtoolsHostDisposable = null;
-    // ── Native-sink state machine (MAJOR 1) ───────────────────────────────────
+    // ── Native-sink state machine ─────────────────────────────────────────────
     let sink = 'idle';
     // Buffered completed-request records while 'probing' — flushed to console if we
     // degrade, dropped if we go ready (so a request shows in exactly one sink).
@@ -321,7 +320,7 @@ export function createNetworkForwarder(bridge) {
     /** Trim the native queue to its cap, preferring to keep request-opening events.
      * Active requests' first events (requestWillBeSent / ...ExtraInfo) are retained
      * so later responseReceived/loadingFinished never become orphans in the panel;
-     * we drop the oldest NON-opening (low-value / completion) events first. (MAJOR 2) */
+     * we drop the oldest NON-opening (low-value / completion) events first. */
     function trimQueue() {
         if (dispatchQueue.length <= MAX_DISPATCH_QUEUE)
             return;
@@ -355,15 +354,15 @@ export function createNetworkForwarder(bridge) {
         }
         const wc = resolveDevtoolsWc();
         if (!wc) {
-            // Host went away mid-flight. Keep the queue bounded (MAJOR 2: cap applies on
+            // Host went away mid-flight. Keep the queue bounded (the cap applies on
             // EVERY path, not just no-host) and wait — setDevtoolsHost re-arms probing.
             trimQueue();
             return;
         }
         if (sink === 'idle')
             beginProbing();
-        // Pack greedily up to MAX_BATCH_CHARS so one executeJavaScript stays sized
-        // (MAJOR 5); oversized single messages go via the chunked transport.
+        // Pack greedily up to MAX_BATCH_CHARS so one executeJavaScript stays sized;
+        // oversized single messages go via the chunked transport.
         const batch = [];
         let batchChars = 0;
         let i = 0;
@@ -421,7 +420,7 @@ export function createNetworkForwarder(bridge) {
         }).catch(() => {
             // wc navigated / torn down mid-call, OR the script overflowed IPC. Re-queue
             // (bounded) and let the next flush re-resolve the host. Best-effort; the
-            // ready-timeout still governs giving up. (MAJOR 5: backoff via retry timer.)
+            // ready-timeout still governs giving up. Backoff is via the retry timer.
             if (sink === 'degraded')
                 return;
             dispatchQueue = batch.concat(dispatchQueue);
@@ -654,7 +653,7 @@ export function createNetworkForwarder(bridge) {
     }
     /**
      * Route a completed request to EXACTLY ONE sink, per the native-sink state
-     * machine (MAJOR 1 — no double-display):
+     * machine (no double-display):
      *  - 'ready'    : native path already rendered it → suppress console.
      *  - 'degraded' : native abandoned → console.
      *  - 'idle'     : no host configured → console (the native queue never flushes).

package/dist/main/services/notifications/renderer-notifier.d.ts

@@ -39,10 +39,9 @@ export interface WorkbenchSettingsInitPayload {
 }
 /**
  * Unified entry point for every main → renderer event sent by the devtools
- * main process. Every site that previously called
- * `someWebContents.send(channel, payload)` now goes through a typed method
- * here so that channel names, payload shapes and `isDestroyed()` guards live
- * in exactly one place.
+ * main process. Instead of calling `someWebContents.send(channel, payload)`
+ * directly, every site goes through a typed method here so that channel names,
+ * payload shapes and `isDestroyed()` guards live in exactly one place.
  *
  * Methods resolve their target `WebContents` lazily from references provided
  * at call time (or read from the owning context) and silently no-op when the

package/dist/main/services/projects/index.js

@@ -3,7 +3,7 @@
 // higher-level coordination (session + renderer notifications) lives in
 // ../workspace/workspace-service.ts.
 //
-// Phase 1 adds the extensibility surface: `types.ts` (ProjectsProvider,
+// The extensibility surface lives in `types.ts` (ProjectsProvider,
 // ProjectTemplate, CreateProjectInput) and `local-provider.ts` (the default
 // implementation injected when the host omits `projectsProvider`).
 export * from './project-repository.js';

package/dist/main/services/service-console/console-api.d.ts

@@ -1,12 +1,11 @@
 /**
  * Pure helpers for the native-host service-console forwarder.
  *
- * Under native-host the service-host's console used to be captured by a
- * `console.*` monkeypatch in `service-host/preload.cjs`. That wrapper added a
- * stack frame, so Chrome DevTools (attached natively to the service host)
- * attributed EVERY service-layer log to the wrapper line (`preload.cjs:237`)
- * instead of the developer's source. We now capture via CDP
- * `Runtime.consoleAPICalled` instead, which preserves native source attribution.
+ * The service-host's console is captured via CDP `Runtime.consoleAPICalled`,
+ * which preserves native source attribution. A `console.*` monkeypatch in
+ * `service-host/preload.cjs` would add a stack frame, so Chrome DevTools (attached
+ * natively to the service host) would attribute EVERY service-layer log to the
+ * wrapper line instead of the developer's source.
  *
  * These functions turn the CDP event shape into the `GuestConsoleEntry` shape
  * the existing console fan-out (automation `App.logAdded`) expects, WITHOUT any

package/dist/main/services/service-console/console-api.js

@@ -1,12 +1,11 @@
 /**
  * Pure helpers for the native-host service-console forwarder.
  *
- * Under native-host the service-host's console used to be captured by a
- * `console.*` monkeypatch in `service-host/preload.cjs`. That wrapper added a
- * stack frame, so Chrome DevTools (attached natively to the service host)
- * attributed EVERY service-layer log to the wrapper line (`preload.cjs:237`)
- * instead of the developer's source. We now capture via CDP
- * `Runtime.consoleAPICalled` instead, which preserves native source attribution.
+ * The service-host's console is captured via CDP `Runtime.consoleAPICalled`,
+ * which preserves native source attribution. A `console.*` monkeypatch in
+ * `service-host/preload.cjs` would add a stack frame, so Chrome DevTools (attached
+ * natively to the service host) would attribute EVERY service-layer log to the
+ * wrapper line instead of the developer's source.
  *
  * These functions turn the CDP event shape into the `GuestConsoleEntry` shape
  * the existing console fan-out (automation `App.logAdded`) expects, WITHOUT any

package/dist/main/services/service-host-pool/pool.d.ts

@@ -7,9 +7,8 @@ import { BrowserWindow } from 'electron';
  * (release / releaseDestroyed), opt-in behind `DIMINA_PREWARM_POOL_SIZE`
  * (default OFF). Only the SERVICE-HOST window is pooled; the simulator content
  * WebContentsView (`view-manager.attachNativeSimulator`) is created fresh per
- * attach. (The historical `<webview>`-tag default arch was never poolable —
- * Electron can't reparent a pre-warmed WebContents into a `<webview>`; doc §5
- * Phase 4 — and that route has since been deleted outright.)
+ * attach. (A `<webview>`-tag arch is not poolable — Electron can't reparent a
+ * pre-warmed WebContents into a `<webview>`.)
  *
  * Lifecycle of a pool entry:
  *   warming   — BrowserWindow constructed, page loading

package/dist/main/services/simulator-storage/index.d.ts

@@ -2,11 +2,9 @@
  * SimulatorStorageWatcher
  *
  * Attaches the Chrome DevTools Protocol debugger to the simulator <webview>
- * and forwards `DOMStorage.*` events to the renderer host. Replaces the
- * preload-side localStorage.setItem hook that used to push storage changes
- * via SimulatorChannel.Storage / StorageAll.
+ * and forwards `DOMStorage.*` events to the renderer host.
  *
- * Trade-offs vs the preload approach:
+ * Trade-offs vs a preload-side localStorage.setItem hook:
  *   + Uses standard browser protocol; no preload injection
  *   + Captures every change including ones bypassing wx (api-compat fallback,
  *     direct localStorage.setItem from devtools, etc.)

package/dist/main/services/simulator-storage/index.js

@@ -2,11 +2,9 @@
  * SimulatorStorageWatcher
  *
  * Attaches the Chrome DevTools Protocol debugger to the simulator <webview>
- * and forwards `DOMStorage.*` events to the renderer host. Replaces the
- * preload-side localStorage.setItem hook that used to push storage changes
- * via SimulatorChannel.Storage / StorageAll.
+ * and forwards `DOMStorage.*` events to the renderer host.
  *
- * Trade-offs vs the preload approach:
+ * Trade-offs vs a preload-side localStorage.setItem hook:
  *   + Uses standard browser protocol; no preload injection
  *   + Captures every change including ones bypassing wx (api-compat fallback,
  *     direct localStorage.setItem from devtools, etc.)

package/dist/main/services/simulator-temp-files/index.js

@@ -155,8 +155,8 @@ export function setupSimulatorTempFiles(simSession) {
     installOnSession(simSession);
     // Apply to every per-project miniapp partition session (current + future).
     const unregisterConfigurator = registerMiniappSessionConfigurator((sess) => installOnSession(sess));
-    // Phase 1 (P1-7): renderer FSM → main fs operations bridge. The same
-    // simulator-only sender policy applies — registry instance is shared.
+    // Renderer FSM → main fs operations bridge. The same simulator-only sender
+    // policy applies — registry instance is shared.
     registry.handle('simulator:fs:read', (_event, payload) => handleFsRead(payload));
     registry.handle('simulator:fs:write', (_event, payload) => handleFsWrite(payload));
     registry.handle('simulator:fs:stat', (_event, payload) => handleFsStat(payload));

package/dist/main/services/views/host-toolbar-session-runtime.d.ts

@@ -2,15 +2,15 @@
  * Ref-counted registration of the host-toolbar framework runtime on
  * `session.defaultSession`.
  *
- * The toolbar's height advertiser no longer rides the toolbar WCV's
- * `webPreferences.preload` (a host's `setPreloadPath` used to replace it and
- * the strip height collapsed to 0). Instead the runtime bundle
+ * The toolbar's height advertiser does not ride the toolbar WCV's
+ * `webPreferences.preload`: a host's `setPreloadPath` would replace it and the
+ * strip height would collapse to 0. Instead the runtime bundle
  * (`hostToolbarRuntimePreloadPath`) is registered once per process as a
  * session frame preload; its own guard (`--dimina-host-toolbar` marker +
  * `isMainFrame`) keeps it a zero-footprint no-op in every other defaultSession
  * renderer.
  *
- * Ref-counting (codex condition 3): multiple ViewManagers can coexist in one
+ * Ref-counting: multiple ViewManagers can coexist in one
  * process and share the ONE defaultSession. Each manager acquires at most one
  * reference (on first toolbar need) and releases it in `disposeAll`. Only the
  * first acquire registers; only the last release unregisters (with the id

package/dist/main/services/views/host-toolbar-session-runtime.js

@@ -2,15 +2,15 @@
  * Ref-counted registration of the host-toolbar framework runtime on
  * `session.defaultSession`.
  *
- * The toolbar's height advertiser no longer rides the toolbar WCV's
- * `webPreferences.preload` (a host's `setPreloadPath` used to replace it and
- * the strip height collapsed to 0). Instead the runtime bundle
+ * The toolbar's height advertiser does not ride the toolbar WCV's
+ * `webPreferences.preload`: a host's `setPreloadPath` would replace it and the
+ * strip height would collapse to 0. Instead the runtime bundle
  * (`hostToolbarRuntimePreloadPath`) is registered once per process as a
  * session frame preload; its own guard (`--dimina-host-toolbar` marker +
  * `isMainFrame`) keeps it a zero-footprint no-op in every other defaultSession
  * renderer.
  *
- * Ref-counting (codex condition 3): multiple ViewManagers can coexist in one
+ * Ref-counting: multiple ViewManagers can coexist in one
  * process and share the ONE defaultSession. Each manager acquires at most one
  * reference (on first toolbar need) and releases it in `disposeAll`. Only the
  * first acquire registers; only the last release unregisters (with the id

package/dist/main/services/views/view-manager.d.ts

@@ -1,5 +1,6 @@
 import type { WebContents } from 'electron';
 import type { NativeDeviceInfo } from '../../../shared/ipc-channels.js';
+import { type OpenInEditorRequest } from '../../../shared/open-in-editor.js';
 import { type WorkbenchContext } from '../workbench-context.js';
 import { type HostToolbarMessageSubscription } from './host-toolbar-port-channel.js';
 /**
@@ -17,6 +18,8 @@ export interface ViewManagerContext {
      * `createWorkbenchContext` always supplies it.
      */
     connections: WorkbenchContext['connections'];
+    /** Active project root used to validate/open console source locations. */
+    workspace?: WorkbenchContext['workspace'];
     /**
      * Absolute path to the simulator preload bundle. Only consumed by the
      * native-host simulator WebContentsView (`attachNativeSimulator`); the
@@ -82,7 +85,7 @@ export interface ViewManager {
      * `simWidth` rides the wire for schema compatibility but is unused: all
      * geometry is anchor-published.
      */
-    attachNativeSimulator(simulatorUrl: string, simWidth: number): void;
+    attachNativeSimulator(simulatorUrl: string, simWidth: number): Promise<void>;
     /**
      * Destroy and null out the simulator view (e.g. on simulator detach).
      * Also destroys the cached settings view and hides the popover —
@@ -106,6 +109,8 @@ export interface ViewManager {
     getSimulatorWebContentsId(): number | null;
     /** Return the live webContents of the currently attached simulator, or null. */
     getSimulatorWebContents(): WebContents | null;
+    /** Return the active project path bound to the current native simulator. */
+    getSimulatorProjectPath(): string | null;
     /** Return the settings overlay's WebContents (for renderer-notifier). */
     getSettingsWebContents(): WebContents | null;
     /** Return the webContents ID of the settings overlay if alive, else null. */
@@ -277,6 +282,17 @@ export interface HostToolbarControl {
      */
     setHeightMode(mode: HostToolbarHeightMode): void;
 }
+export interface ProjectEditorTarget {
+    path: string;
+    line?: number;
+    column?: number;
+}
+/**
+ * Resolve a DevTools source request against the service-host URL that created
+ * the inspected app. Its pkgRoot is authoritative; the workspace is only a
+ * stale-session consistency guard.
+ */
+export declare function resolveProjectEditorTarget(serviceHostUrl: string, activeProjectRoot: string | undefined, req: OpenInEditorRequest, isFile?: (absolutePath: string) => boolean): ProjectEditorTarget | null;
 /**
  * Build a ViewManager bound to the given context. The returned object is the
  * only component allowed to instantiate or add/remove overlay WebContentsViews.