@vscode/component-explorer-cli 0.2.1-1 → 0.2.1-100

package/dist/componentExplorer.d.ts

@@ -1,8 +1,50 @@
-import type { BrowserPageFactory } from './browserPage.js';
-import type { ComponentExplorerHttpServer } from './httpServer.js';
+import type { BrowserPage, BrowserPageFactory } from './browserPage.js';
+import type { ComponentExplorerHttpServer } from './server/types.js';
 import type { IObservable } from '@vscode/observables';
+import type { IJsonSchema } from '@vscode/component-explorer-common';
 import { type ILogger } from './logger.js';
 import { SourceTreeId } from './sourceTreeId.js';
+export interface ScreenshotOptions {
+    /**
+     * If true, reload the browser page if the fixture had an error during rendering. This can help avoid contamination of subsequent renders when the page is in a bad state, at the cost of longer execution time.
+    */
+    readonly reloadOnError?: boolean;
+    /**
+     * If true, reload the browser page before rendering this fixture.
+     * Useful for bulk rendering to ensure each fixture starts from a clean page state.
+     */
+    readonly reloadBeforeRender?: boolean;
+    /**
+     * Arbitrary JSON-serializable data passed to the fixture's `RenderContext.input`.
+     * The fixture decides how to interpret it (e.g. theme switch, scenario selection).
+     * Must be JSON-serializable since it crosses the CLI → browser boundary.
+     */
+    readonly input?: unknown;
+    /**
+     * If true, dispose the fixture after taking the screenshot and capture any
+     * errors / events that surface during dispose.
+     * Default: false — the fixture stays mounted until the next render, so
+     * `evaluate_js` can still operate on it. Use `disposeAfter` when you want to
+     * validate the teardown of a specific fixture.
+     */
+    readonly disposeAfter?: boolean;
+}
+export interface ComponentExplorer {
+    readonly sourceTreeId: IObservable<SourceTreeId>;
+    listFixtures(): Promise<ListFixturesResult>;
+    screenshotFixture(fixtureId: string, options?: ScreenshotOptions): Promise<ScreenshotResult>;
+    screenshotFixtureStabilityCheck(fixtureId: string, options?: ScreenshotOptions): Promise<StabilityCheckResult>;
+    evaluateJs(expression: string, fixtureId?: string): Promise<unknown>;
+    codeCoverage(id: FixtureId | FixtureGroupId): Promise<CoverageData>;
+    waitForUpdate(timeoutMs?: number): Promise<void>;
+    /**
+     * Open the underlying browser page (if not already open) and return it.
+     * Used by coverage tooling to call `startJSCoverage` / `stopJSCoverage` on the
+     * exact same page used for fixture rendering.
+     */
+    getOrOpenPage(): Promise<BrowserPage>;
+    dispose(): Promise<void>;
+}
 export interface FixtureInfo {
     readonly fixtureId: string;
     readonly fixtureName: string;
@@ -10,6 +52,8 @@ export interface FixtureInfo {
     readonly background: 'light' | 'dark';
     readonly labels: readonly string[];
     readonly expectedVisualDescriptions: readonly string[];
+    /** JSON Schema describing the fixture's expected `input` object, if declared. */
+    readonly inputSchema?: IJsonSchema;
 }
 export interface ListFixturesResult {
     readonly fixtures: FixtureInfo[];
@@ -37,37 +81,90 @@ export type RenderEventType = 'console.error' | 'console.warn' | 'console.log' |
 export interface RenderEvent {
     readonly type: RenderEventType;
     readonly message: string;
+    readonly stack?: string;
+}
+/**
+ * Errors / events captured while disposing a fixture.
+ * `previousDispose` is populated when a screenshot's implicit dispose of the
+ * previous fixture surfaced something; `currentDispose` is populated when
+ * `disposeAfter: true` was requested.
+ *
+ * `hasError` is a derived getter: `true` when any exception was captured
+ * or a significant event (console.error / window.error / unhandledrejection) occurred.
+ */
+export declare class DisposeReport {
+    readonly errors: readonly ExceptionError[];
+    readonly events: readonly RenderEvent[];
+    constructor(data: {
+        readonly errors: readonly ExceptionError[];
+        readonly events: readonly RenderEvent[];
+    });
+    get hasError(): boolean;
+    static from(raw: {
+        errors: readonly ExceptionError[];
+        events: readonly RenderEvent[];
+    }): DisposeReport;
+    static fromIfSignificant(raw: {
+        errors: readonly ExceptionError[];
+        events: readonly RenderEvent[];
+    }): DisposeReport | undefined;
 }
 /**
  * Result of taking a screenshot, including any errors captured during rendering.
+ *
+ * `hasError` is a derived getter that is `true` when any phase (render,
+ * previousDispose, or currentDispose) reported an error so that consumers
+ * never need to combine the flags manually.
  */
-export interface ScreenshotResult {
+export declare class ScreenshotResult {
     readonly image: Uint8Array | undefined;
-    readonly hasError: boolean;
+    readonly renderHasError: boolean;
     readonly error?: ExceptionError;
     readonly events: RenderEvent[];
-    readonly resultData?: unknown;
+    readonly output?: unknown;
+    readonly renderTimeMs: {
+        readonly sync: number;
+        readonly total: number;
+    };
+    readonly previousDispose?: DisposeReport;
+    readonly currentDispose?: DisposeReport;
+    constructor(data: {
+        readonly image: Uint8Array | undefined;
+        readonly renderHasError: boolean;
+        readonly error?: ExceptionError;
+        readonly events: RenderEvent[];
+        readonly output?: unknown;
+        readonly renderTimeMs: {
+            readonly sync: number;
+            readonly total: number;
+        };
+        readonly previousDispose?: DisposeReport;
+        readonly currentDispose?: DisposeReport;
+    });
+    get hasError(): boolean;
 }
 export interface StabilityScreenshot {
     readonly image: Uint8Array;
     readonly delayMs: number;
 }
-export interface StabilityCheckResult {
+export declare class StabilityCheckResult {
     readonly screenshots: readonly StabilityScreenshot[];
-    readonly hasError: boolean;
+    readonly renderHasError: boolean;
     readonly error?: ExceptionError;
     readonly events: RenderEvent[];
-    readonly resultData?: unknown;
-}
-export interface ComponentExplorer {
-    readonly sourceTreeId: IObservable<SourceTreeId>;
-    listFixtures(): Promise<ListFixturesResult>;
-    screenshotFixture(fixtureId: string): Promise<ScreenshotResult>;
-    screenshotFixtureStabilityCheck(fixtureId: string): Promise<StabilityCheckResult>;
-    evaluateJs(expression: string, fixtureId?: string): Promise<unknown>;
-    codeCoverage(id: FixtureId | FixtureGroupId): Promise<CoverageData>;
-    waitForUpdate(timeoutMs?: number): Promise<void>;
-    dispose(): Promise<void>;
+    readonly output?: unknown;
+    readonly previousDispose?: DisposeReport;
+    readonly currentDispose?: DisposeReport;
+    constructor(data: {
+        readonly screenshots: readonly StabilityScreenshot[];
+        readonly renderHasError: boolean;
+        readonly error?: ExceptionError;
+        readonly events: RenderEvent[];
+        readonly output?: unknown;
+        readonly previousDispose?: DisposeReport;
+        readonly currentDispose?: DisposeReport;
+    });
+    get hasError(): boolean;
 }
 export declare class BrowserComponentExplorer implements ComponentExplorer {
     private readonly _browserPageFactory;
@@ -76,16 +173,21 @@ export declare class BrowserComponentExplorer implements ComponentExplorer {
     private _page;
     private _lastState;
     private _screenshotMutex;
+    private _pollingActive;
     readonly sourceTreeId: import("@vscode/observables").ISettableObservable<SourceTreeId, void>;
     constructor(_browserPageFactory: BrowserPageFactory, _server: ComponentExplorerHttpServer, _logger?: ILogger);
     private _bumpSourceTreeId;
+    getOrOpenPage(): Promise<BrowserPage>;
     private _ensureReady;
+    private _reloadPage;
+    private _startPolling;
+    private _pollLoop;
     private _waitForCliApi;
     private _assertRuntimeVersionCompatibility;
     private _getState;
     listFixtures(): Promise<ListFixturesResult>;
-    screenshotFixture(fixtureId: string): Promise<ScreenshotResult>;
-    screenshotFixtureStabilityCheck(fixtureId: string): Promise<StabilityCheckResult>;
+    screenshotFixture(fixtureId: string, options?: ScreenshotOptions): Promise<ScreenshotResult>;
+    screenshotFixtureStabilityCheck(fixtureId: string, options?: ScreenshotOptions): Promise<StabilityCheckResult>;
     evaluateJs(expression: string, fixtureId?: string): Promise<unknown>;
     codeCoverage(_id: FixtureId | FixtureGroupId): Promise<CoverageData>;
     waitForUpdate(timeoutMs?: number): Promise<void>;

package/dist/componentExplorer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"componentExplorer.d.ts","sourceRoot":"","sources":["../src/componentExplorer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"componentExplorer.d.ts","sourceRoot":"","sources":["../src/componentExplorer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAe,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAGlF,OAAO,EAAE,KAAK,OAAO,EAAc,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AASjD,MAAM,WAAW,iBAAiB;IACjC;;MAEE;IACF,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IACtC;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB;;;;;;OAMG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;IACjD,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC5C,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC7F,+BAA+B,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC/G,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACrE,YAAY,CAAC,EAAE,EAAE,SAAS,GAAG,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACpE,aAAa,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD;;;;OAIG;IACH,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;IACtC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,0BAA0B,EAAE,SAAS,MAAM,EAAE,CAAC;IACvD,iFAAiF;IACjF,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;CACnC;AAED,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC;IACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AACvD,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1D,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,KAAK,EAAE,SAAS,iBAAiB,EAAE,CAAC;CAC7C;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;CAC3C;AAED,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,eAAe,GAAG,eAAe,GAAG,cAAc,GAAG,aAAa,GAAG,cAAc,GAAG,2BAA2B,CAAC;AAE9H,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;GAQG;AACH,qBAAa,aAAa;IACzB,QAAQ,CAAC,MAAM,EAAE,SAAS,cAAc,EAAE,CAAC;IAC3C,QAAQ,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;gBAE5B,IAAI,EAAE;QACjB,QAAQ,CAAC,MAAM,EAAE,SAAS,cAAc,EAAE,CAAC;QAC3C,QAAQ,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;KACxC;IAKD,IAAI,QAAQ,IAAI,OAAO,CAGtB;IAED,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;QAAE,MAAM,EAAE,SAAS,cAAc,EAAE,CAAC;QAAC,MAAM,EAAE,SAAS,WAAW,EAAE,CAAA;KAAE,GAAG,aAAa;IAItG,MAAM,CAAC,iBAAiB,CAAC,GAAG,EAAE;QAAE,MAAM,EAAE,SAAS,cAAc,EAAE,CAAC;QAAC,MAAM,EAAE,SAAS,WAAW,EAAE,CAAA;KAAE,GAAG,aAAa,GAAG,SAAS;CAI/H;AAED;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAC5B,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;IAC/B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACzE,QAAQ,CAAC,eAAe,CAAC,EAAE,aAAa,CAAC;IACzC,QAAQ,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC;gBAE5B,IAAI,EAAE;QACjB,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,CAAC;QACvC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;QACjC,QAAQ,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC;QAChC,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;QAC/B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,YAAY,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;QACzE,QAAQ,CAAC,eAAe,CAAC,EAAE,aAAa,CAAC;QACzC,QAAQ,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC;KACxC;IAWD,IAAI,QAAQ,IAAI,OAAO,CAItB;CACD;AAED,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,oBAAoB;IAChC,QAAQ,CAAC,WAAW,EAAE,SAAS,mBAAmB,EAAE,CAAC;IACrD,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;IAC/B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,eAAe,CAAC,EAAE,aAAa,CAAC;IACzC,QAAQ,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC;gBAE5B,IAAI,EAAE;QACjB,QAAQ,CAAC,WAAW,EAAE,SAAS,mBAAmB,EAAE,CAAC;QACrD,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;QACjC,QAAQ,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC;QAChC,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;QAC/B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,eAAe,CAAC,EAAE,aAAa,CAAC;QACzC,QAAQ,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC;KACxC;IAUD,IAAI,QAAQ,IAAI,OAAO,CAItB;CACD;AAED,qBAAa,wBAAyB,YAAW,iBAAiB;IAQhE,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IATzB,OAAO,CAAC,KAAK,CAA0B;IACvC,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,gBAAgB,CAAoC;IAC5D,OAAO,CAAC,cAAc,CAAS;IAC/B,QAAQ,CAAC,YAAY,wEAAC;gBAGJ,mBAAmB,EAAE,kBAAkB,EACvC,OAAO,EAAE,2BAA2B,EACpC,OAAO,GAAE,OAAoB;IAU/C,OAAO,CAAC,iBAAiB;IAIzB,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC;YAIvB,YAAY;YAWZ,WAAW;IAKzB,OAAO,CAAC,aAAa;YAMP,SAAS;YA+CT,cAAc;IAW5B,OAAO,CAAC,kCAAkC;YAU5B,SAAS;IAQjB,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAW3C,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2D5F,+BAA+B,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAyF9G,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAoBpE,YAAY,CAAC,GAAG,EAAE,SAAS,GAAG,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC;IAIpE,aAAa,CAAC,SAAS,SAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBjD,SAAS,IAAI,IAAI;IAKX,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAK9B"}

package/dist/componentExplorer.js

@@ -1,20 +1,100 @@
-import './external/vscode-observables/observables/dist/observableInternal/index.js';
-import { observableValue } from './external/vscode-observables/observables/dist/observableInternal/observables/observableValue.js';
-import './external/vscode-observables/observables/dist/observableInternal/debugLocation.js';
-import './external/vscode-observables/observables/dist/observableInternal/observables/derived.js';
-import './external/vscode-observables/observables/dist/observableInternal/utils/utils.js';
-import './external/vscode-observables/observables/dist/observableInternal/observables/observableFromEvent.js';
+import { evaluateFn, explorerApiGetter, explorerApi, explorerApiOrUndefined } from './evaluateFn.js';
+import './vscode-observables/observables/dist/observableInternal/index.js';
+import { observableValue } from './vscode-observables/observables/dist/observableInternal/observables/observableValue.js';
+import './vscode-observables/observables/dist/observableInternal/debugLocation.js';
+import './vscode-observables/observables/dist/observableInternal/observables/derived.js';
+import { waitForState } from './vscode-observables/observables/dist/observableInternal/utils/utilsCancellation.js';
+import './vscode-observables/observables/dist/observableInternal/utils/utils.js';
+import './vscode-observables/observables/dist/observableInternal/observables/observableFromEvent.js';
 import { nullLogger } from './logger.js';
 import { SourceTreeId } from './sourceTreeId.js';
-import { buildExplorerUrl } from './utils.js';
+import './js-component-explorer/packages/common/dist/renderManifest.js';
+import { buildExplorerUrl } from './js-component-explorer/packages/common/dist/explorerUrl.js';
+import { EXPLORER_ROUTE } from './utils.js';
 import { parseVersion, isCompatibleVersion, runtimeVersionNeededByCliText } from './daemon/version.js';
 
-async function unwrapScreenshot(page, domExpr) {
-    const result = await page.screenshot(domExpr);
-    if (!result.ok) {
-        throw new Error(`Fixture DOM node not found`);
+/**
+ * Errors / events captured while disposing a fixture.
+ * `previousDispose` is populated when a screenshot's implicit dispose of the
+ * previous fixture surfaced something; `currentDispose` is populated when
+ * `disposeAfter: true` was requested.
+ *
+ * `hasError` is a derived getter: `true` when any exception was captured
+ * or a significant event (console.error / window.error / unhandledrejection) occurred.
+ */
+class DisposeReport {
+    errors;
+    events;
+    constructor(data) {
+        this.errors = data.errors;
+        this.events = data.events;
+    }
+    get hasError() {
+        return this.errors.length > 0
+            || this.events.some(e => e.type === 'console.error' || e.type === 'window.error' || e.type === 'window.unhandledrejection');
+    }
+    static from(raw) {
+        return new DisposeReport({ errors: raw.errors, events: raw.events });
+    }
+    static fromIfSignificant(raw) {
+        const report = DisposeReport.from(raw);
+        return (report.hasError || report.events.length > 0) ? report : undefined;
+    }
+}
+/**
+ * Result of taking a screenshot, including any errors captured during rendering.
+ *
+ * `hasError` is a derived getter that is `true` when any phase (render,
+ * previousDispose, or currentDispose) reported an error so that consumers
+ * never need to combine the flags manually.
+ */
+class ScreenshotResult {
+    image;
+    renderHasError;
+    error;
+    events;
+    output;
+    renderTimeMs;
+    previousDispose;
+    currentDispose;
+    constructor(data) {
+        this.image = data.image;
+        this.renderHasError = data.renderHasError;
+        this.error = data.error;
+        this.events = data.events;
+        this.output = data.output;
+        this.renderTimeMs = data.renderTimeMs;
+        this.previousDispose = data.previousDispose;
+        this.currentDispose = data.currentDispose;
+    }
+    get hasError() {
+        return this.renderHasError
+            || !!this.previousDispose?.hasError
+            || !!this.currentDispose?.hasError;
+    }
+}
+class StabilityCheckResult {
+    screenshots;
+    renderHasError;
+    error;
+    events;
+    output;
+    previousDispose;
+    currentDispose;
+    constructor(data) {
+        this.screenshots = data.screenshots;
+        this.renderHasError = data.renderHasError;
+        this.error = data.error;
+        this.events = data.events;
+        this.output = data.output;
+        this.previousDispose = data.previousDispose;
+        this.currentDispose = data.currentDispose;
+    }
+    get hasError() {
+        return this.renderHasError
+            || !!this.previousDispose?.hasError
+            || !!this.currentDispose?.hasError;
     }
-    return result.screenshot;
 }
 class BrowserComponentExplorer {
     _browserPageFactory;
@@ -23,6 +103,7 @@ class BrowserComponentExplorer {
     _page;
     _lastState;
     _screenshotMutex = Promise.resolve();
+    _pollingActive = false;
     sourceTreeId;
     constructor(_browserPageFactory, _server, _logger = nullLogger) {
         this._browserPageFactory = _browserPageFactory;
@@ -38,29 +119,85 @@ class BrowserComponentExplorer {
     _bumpSourceTreeId() {
         this.sourceTreeId.set(new SourceTreeId(Date.now().toString()), undefined);
     }
+    getOrOpenPage() {
+        return this._ensureReady();
+    }
     async _ensureReady() {
         if (!this._page) {
-            const cliUrl = buildExplorerUrl({ baseUrl: this._server.url, rawRender: true });
+            const cliUrl = buildExplorerUrl({ baseUrl: this._server.url, pathname: EXPLORER_ROUTE, mode: 'headless' });
             this._logger.debug(`Opening browser page: ${cliUrl}`);
             this._page = await this._browserPageFactory.openPage(cliUrl);
             await this._waitForCliApi(this._page);
+            this._startPolling();
         }
         return this._page;
     }
+    async _reloadPage(page) {
+        await page.reload();
+        await this._waitForCliApi(page);
+    }
+    _startPolling() {
+        if (this._pollingActive) {
+            return;
+        }
+        this._pollingActive = true;
+        this._pollLoop();
+    }
+    async _pollLoop() {
+        while (this._pollingActive && this._page) {
+            try {
+                const page = this._page;
+                const prev = this._lastState;
+                const newState = await evaluateFn(page, (getApi, prev) => new Promise((resolve) => {
+                    function check() {
+                        const api = getApi();
+                        // This allows faked time
+                        const setTimeoutFn = typeof globalThis.setTimeout.originalFn === 'function' ?
+                            globalThis.setTimeout.originalFn : globalThis.setTimeout;
+                        if (!api) {
+                            setTimeoutFn(check, 50);
+                            return;
+                        }
+                        if (api.pageInstanceId !== prev.pageInstanceId || api.updateVersion > prev.updateVersion) {
+                            resolve({ pageInstanceId: api.pageInstanceId, updateVersion: api.updateVersion, runtimeVersion: api.runtimeVersion });
+                        }
+                        else {
+                            setTimeoutFn(check, 50);
+                        }
+                    }
+                    check();
+                }), explorerApiGetter, prev);
+                if (!this._pollingActive) {
+                    break;
+                }
+                const reloaded = newState.pageInstanceId !== prev.pageInstanceId;
+                if (reloaded) {
+                    this._logger.debug(`Page reloaded: pageInstanceId ${prev.pageInstanceId} → ${newState.pageInstanceId}`);
+                }
+                else {
+                    this._logger.debug(`HMR update: version ${prev.updateVersion} → ${newState.updateVersion}`);
+                }
+                this._lastState = newState;
+                this._bumpSourceTreeId();
+            }
+            catch (err) {
+                if (!this._pollingActive) {
+                    break;
+                }
+                this._logger.debug(`Polling error: ${err}`);
+                await new Promise(r => setTimeout(r, 500));
+            }
+        }
+    }
     async _waitForCliApi(page) {
-        this._logger.trace('Polling for __componentExplorer__ to initialize...');
-        await page.evaluateJs(`
-			new Promise(resolve => {
-				function check() {
-					if (window.__componentExplorer__) resolve();
-					else setTimeout(check, 50);
-				}
-				check();
-			})
-		`);
+        this._logger.trace('Checking for __componentExplorer__ global...');
+        const hasGlobal = await evaluateFn(page, (api) => !!api, explorerApiOrUndefined);
+        if (!hasGlobal) {
+            throw new Error('Component Explorer runtime not found. Ensure the explorer is properly configured and the page serves the explorer bundle.');
+        }
         this._lastState = await this._getState(page);
         this._assertRuntimeVersionCompatibility(this._lastState.runtimeVersion);
-        this._logger.debug(`CLI API ready, sessionId=${this._lastState.sessionId}, version=${this._lastState.updateVersion}`);
+        this._logger.debug(`CLI API ready, pageInstanceId=${this._lastState.pageInstanceId}, version=${this._lastState.updateVersion}`);
     }
     _assertRuntimeVersionCompatibility(runtimeVersion) {
         const expected = parseVersion(runtimeVersionNeededByCliText);
@@ -70,16 +207,16 @@ class BrowserComponentExplorer {
         }
     }
     async _getState(page) {
-        return page.evaluateJs(`({
-			sessionId: window.__componentExplorer__.sessionId,
-			updateVersion: window.__componentExplorer__.updateVersion,
-			runtimeVersion: window.__componentExplorer__.runtimeVersion,
-		})`);
+        return evaluateFn(page, (api) => ({
+            pageInstanceId: api.pageInstanceId,
+            updateVersion: api.updateVersion,
+            runtimeVersion: api.runtimeVersion,
+        }), explorerApi);
     }
     async listFixtures() {
         const page = await this._ensureReady();
         try {
-            const fixtures = await page.evaluateJs('window.__componentExplorer__.listFixtures()');
+            const fixtures = await evaluateFn(page, (api) => api.listFixtures(), explorerApi);
             return { fixtures };
         }
         catch (e) {
@@ -87,7 +224,7 @@ class BrowserComponentExplorer {
             return { fixtures: [], loadError };
         }
     }
-    async screenshotFixture(fixtureId) {
+    async screenshotFixture(fixtureId, options) {
         // Serialize screenshot calls — the single browser page can only render one fixture at a time
         const prev = this._screenshotMutex;
         let resolve;
@@ -98,21 +235,44 @@ class BrowserComponentExplorer {
         const startTime = Date.now();
         try {
             const page = await this._ensureReady();
-            const escapedId = JSON.stringify(fixtureId);
-            const debugUrl = buildExplorerUrl({ baseUrl: this._server.url, rawRender: true, fixtureId });
+            const debugUrl = buildExplorerUrl({ baseUrl: this._server.url, pathname: EXPLORER_ROUTE, mode: 'headless', fixtureId });
             this._logger.debug(`Rendering fixture: ${debugUrl}`);
-            const renderResult = await page.evaluateJs(`window.__componentExplorer__.renderFixture(${escapedId})`);
+            if (options?.reloadBeforeRender) {
+                this._logger.debug(`Reloading page before render: ${fixtureId}`);
+                await this._reloadPage(page);
+            }
+            const input = options?.input;
+            const renderResult = await evaluateFn(page, (api, args) => api.renderFixture(args.id, args.input), explorerApi, { id: fixtureId, input });
             this._logger.debug(`Render completed: ${fixtureId} (hasError=${renderResult.hasError}, ${Date.now() - startTime}ms)`);
             const image = await page.screenshot(`document.getElementById('root').lastElementChild`);
             this._logger.debug(`Screenshot done: ${fixtureId} (ok=${image.ok}, ${Date.now() - startTime}ms)`);
-            return { image: image.ok ? image.screenshot : undefined, ...renderResult };
+            let currentDispose;
+            if (options?.disposeAfter) {
+                this._logger.debug(`Disposing fixture after screenshot: ${fixtureId}`);
+                const rawDispose = await evaluateFn(page, (api) => api.disposeCurrentFixture(), explorerApi);
+                currentDispose = DisposeReport.fromIfSignificant(rawDispose);
+            }
+            if (renderResult.hasError && options?.reloadOnError) {
+                this._logger.debug(`Fixture had error, reloading page to avoid contamination: ${fixtureId}`);
+                await this._reloadPage(page);
+            }
+            return new ScreenshotResult({
+                image: image.ok ? image.screenshot : undefined,
+                renderHasError: renderResult.hasError,
+                error: renderResult.error,
+                events: renderResult.events,
+                output: renderResult.output,
+                renderTimeMs: renderResult.renderTimeMs,
+                previousDispose: renderResult.previousDispose ? DisposeReport.from(renderResult.previousDispose) : undefined,
+                currentDispose,
+            });
         }
         finally {
             this._logger.trace(`Screenshot mutex: released for ${fixtureId}`);
             resolve();
         }
     }
-    async screenshotFixtureStabilityCheck(fixtureId) {
+    async screenshotFixtureStabilityCheck(fixtureId, options) {
         const prev = this._screenshotMutex;
         let resolve;
         this._screenshotMutex = new Promise(r => { resolve = r; });
@@ -121,12 +281,16 @@ class BrowserComponentExplorer {
         this._logger.trace(`Screenshot mutex: acquired for stability check ${fixtureId}`);
         try {
             const page = await this._ensureReady();
-            const escapedId = JSON.stringify(fixtureId);
-            const debugUrl = buildExplorerUrl({ baseUrl: this._server.url, rawRender: true, fixtureId });
+            const debugUrl = buildExplorerUrl({ baseUrl: this._server.url, pathname: EXPLORER_ROUTE, mode: 'headless', fixtureId });
             this._logger.debug(`Stability check: ${debugUrl}`);
-            await page.evaluateJs(`window.__componentExplorer__.disposeCurrentFixture?.()`);
+            if (options?.reloadBeforeRender) {
+                this._logger.debug(`Reloading page before stability check: ${fixtureId}`);
+                await this._reloadPage(page);
+            }
+            const priorDispose = DisposeReport.fromIfSignificant(await evaluateFn(page, (api) => api.disposeCurrentFixture(), explorerApi));
             const startTime = Date.now();
-            const renderResult = await page.evaluateJs(`window.__componentExplorer__.renderFixture(${escapedId})`);
+            const input = options?.input;
+            const renderResult = await evaluateFn(page, (api, args) => api.renderFixture(args.id, args.input), explorerApi, { id: fixtureId, input });
             const domExpr = `document.getElementById('root').lastElementChild`;
             const image0 = await unwrapScreenshot(page, domExpr);
             const delay0 = Date.now() - startTime;
@@ -145,14 +309,33 @@ class BrowserComponentExplorer {
             const image2 = await unwrapScreenshot(page, domExpr);
             const delay2 = Date.now() - startTime;
             this._logger.debug(`Stability check done: ${fixtureId} (${delay2}ms total)`);
-            return {
+            let currentDispose;
+            if (options?.disposeAfter) {
+                this._logger.debug(`Disposing fixture after stability check: ${fixtureId}`);
+                const rawDispose = await evaluateFn(page, (api) => api.disposeCurrentFixture(), explorerApi);
+                currentDispose = DisposeReport.fromIfSignificant(rawDispose);
+            }
+            const previousDispose = renderResult.previousDispose
+                ? DisposeReport.from(renderResult.previousDispose)
+                : priorDispose;
+            const result = new StabilityCheckResult({
                 screenshots: [
                     { image: image0, delayMs: delay0 },
                     { image: image1, delayMs: delay1 },
                     { image: image2, delayMs: delay2 },
                 ],
-                ...renderResult,
-            };
+                renderHasError: renderResult.hasError,
+                error: renderResult.error,
+                events: renderResult.events,
+                output: renderResult.output,
+                previousDispose,
+                currentDispose,
+            });
+            if (renderResult.hasError && options?.reloadOnError) {
+                this._logger.debug(`Stability check fixture had error, reloading page to avoid contamination: ${fixtureId}`);
+                await this._reloadPage(page);
+            }
+            return result;
         }
         finally {
             this._logger.trace(`Screenshot mutex: released for stability check ${fixtureId}`);
@@ -168,8 +351,7 @@ class BrowserComponentExplorer {
             this._logger.trace(`evaluateJs: expression length=${expression.length}${fixtureId ? `, fixtureId=${fixtureId}` : ''}`);
             const page = await this._ensureReady();
             if (fixtureId !== undefined) {
-                const escapedId = JSON.stringify(fixtureId);
-                await page.evaluateJs(`window.__componentExplorer__.renderFixture(${escapedId})`);
+                await evaluateFn(page, (api, id) => api.renderFixture(id), explorerApi, fixtureId);
             }
             const result = await page.evaluateJs(expression);
             this._logger.trace(`evaluateJs: result length=${JSON.stringify(result)?.length ?? 0}`);
@@ -183,50 +365,40 @@ class BrowserComponentExplorer {
         throw new Error('Code coverage not yet implemented');
     }
     async waitForUpdate(timeoutMs = 0) {
-        const page = await this._ensureReady();
-        const prev = await this._getState(page);
-        this._logger.debug(`Waiting for update (sessionId=${prev.sessionId}, version=${prev.updateVersion})...`);
-        const newState = await page.evaluateJs(`
-			new Promise((resolve, reject) => {
-				${timeoutMs > 0 ? `const timeout = setTimeout(() => reject(new Error('Timeout waiting for HMR update')), ${timeoutMs});` : ''}
-				function check() {
-					if (!window.__componentExplorer__) {
-						// Page reloaded — CLI not yet re-initialized, keep waiting
-						setTimeout(check, 50);
-						return;
-					}
-					const s = window.__componentExplorer__.sessionId;
-					const v = window.__componentExplorer__.updateVersion;
-					const r = window.__componentExplorer__.runtimeVersion;
-					if (s !== '${prev.sessionId}' || v > ${prev.updateVersion}) {
-						${timeoutMs > 0 ? 'clearTimeout(timeout);' : ''}
-						resolve({ sessionId: s, updateVersion: v, runtimeVersion: r });
-					} else {
-						setTimeout(check, 50);
-					}
-				}
-				check();
-			})
-		`);
-        this._assertRuntimeVersionCompatibility(newState.runtimeVersion);
-        const reloaded = newState.sessionId !== prev.sessionId;
-        if (reloaded) {
-            this._logger.debug(`Page reloaded: sessionId ${prev.sessionId} → ${newState.sessionId}`);
+        await this._ensureReady();
+        const currentId = this.sourceTreeId.get();
+        this._logger.debug(`Waiting for sourceTreeId to change from ${currentId.value}...`);
+        if (timeoutMs > 0) {
+            const result = await Promise.race([
+                waitForState(this.sourceTreeId, id => id !== currentId),
+                new Promise(r => setTimeout(() => r('timeout'), timeoutMs)),
+            ]);
+            if (result === 'timeout') {
+                throw new Error('Timeout waiting for HMR update');
+            }
         }
         else {
-            this._logger.debug(`HMR update: version ${prev.updateVersion} → ${newState.updateVersion}`);
+            await waitForState(this.sourceTreeId, id => id !== currentId);
         }
-        this._lastState = newState;
-        this._bumpSourceTreeId();
+        this._logger.debug(`sourceTreeId changed to ${this.sourceTreeId.get().value}`);
     }
     closePage() {
+        this._pollingActive = false;
         this._page = undefined;
     }
     async dispose() {
+        this._pollingActive = false;
         await this._page?.dispose();
         this._page = undefined;
     }
 }
+async function unwrapScreenshot(page, domExpr) {
+    const result = await page.screenshot(domExpr);
+    if (!result.ok) {
+        throw new Error(`Fixture DOM node not found`);
+    }
+    return result.screenshot;
+}
 
-export { BrowserComponentExplorer };
+export { BrowserComponentExplorer, DisposeReport, ScreenshotResult, StabilityCheckResult };
 //# sourceMappingURL=componentExplorer.js.map