@vscode/component-explorer-cli 0.2.1-18 → 0.2.1-181

package/dist/mcp/McpServer.js

@@ -1,14 +1,16 @@
 import { z } from 'zod';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import '../external/vscode-observables/observables/dist/observableInternal/index.js';
-import { Disposable } from '../external/vscode-observables/observables/dist/disposables.js';
-import '../external/vscode-observables/observables/dist/observableInternal/debugLocation.js';
-import { autorun } from '../external/vscode-observables/observables/dist/observableInternal/reactions/autorun.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 { buildExplorerUrl } from '../utils.js';
+import '../vscode-observables/observables/dist/observableInternal/index.js';
+import { Disposable } from '../vscode-observables/observables/dist/disposables.js';
+import '../vscode-observables/observables/dist/observableInternal/debugLocation.js';
+import { autorun } from '../vscode-observables/observables/dist/observableInternal/reactions/createEffect.js';
+import '../vscode-observables/observables/dist/observableInternal/observables/derived.js';
+import '../vscode-observables/observables/dist/observableInternal/utils/utils.js';
+import '../vscode-observables/observables/dist/observableInternal/observables/observableFromEvent.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 { TaskManager } from './TaskManager.js';
 import { isPipeConnectionError } from '../daemon/pipeClient.js';
 
@@ -30,7 +32,7 @@ class ComponentExplorerMcpServer extends Disposable {
     _taskLastReportedIndex = new Map();
     _multiSessionTools = [];
     _sessions = [];
-    _eventStreamAbortController;
+    _stopEventListener;
     constructor(_daemon, options) {
         super();
         this._daemon = _daemon;
@@ -40,21 +42,26 @@ class ComponentExplorerMcpServer extends Disposable {
             version: '0.1.0',
         });
         this._registerTools();
+        this._store.add({ dispose: () => this._stopEventListener?.() });
         this._store.add(autorun(async (reader) => {
             const client = this._daemon.connection.read(reader);
             await this._onDaemonChanged(client);
         }));
     }
     async _onDaemonChanged(daemon) {
-        this._eventStreamAbortController?.abort();
-        this._eventStreamAbortController = undefined;
+        this._stopEventListener?.();
+        this._stopEventListener = undefined;
         if (!daemon) {
             this._sessions = [];
             this._log('info', { type: 'daemon-disconnected' });
             return;
         }
         try {
-            this._sessions = await daemon.methods.sessions();
+            const sessions = await daemon.methods.sessions({});
+            if (this._daemon.connection.get() !== daemon) {
+                return;
+            }
+            this._sessions = sessions;
             this._log('debug', { type: 'daemon-connected', sessions: this._sessions.length });
             this._updateMultiSessionToolVisibility();
             this._startEventListener(daemon);
@@ -100,30 +107,26 @@ class ComponentExplorerMcpServer extends Disposable {
         this._mcp.sendLoggingMessage({ level: mcpLevel, logger: 'daemon', data }).catch(() => { });
     }
     _startEventListener(daemon) {
-        const controller = new AbortController();
-        this._eventStreamAbortController = controller;
-        (async () => {
-            try {
-                const stream = await daemon.methods.events();
-                for await (const raw of stream) {
-                    if (controller.signal.aborted)
-                        break;
-                    const event = raw;
-                    if (event.type === 'source-change' && event.sessionName && event.sourceTreeId) {
-                        this._updateSessionSourceTreeId(event.sessionName, event.sourceTreeId);
-                    }
-                    if (event.type === 'ref-change' || event.type === 'session-change') {
-                        await this._refreshSessions(daemon);
-                    }
-                    this._log(event.type === 'log' && event.level === 'debug' ? 'debug' : 'info', event);
+        const call = daemon.methods.events({}, { onMessage: event => {
+                if (this._daemon.connection.get() !== daemon) {
+                    return;
                 }
-            }
-            catch (e) {
-                if (!controller.signal.aborted) {
-                    this._log('info', { type: 'event-stream-error', error: String(e) });
+                if (event.type === 'source-change') {
+                    this._updateSessionSourceTreeId(event.sessionName, event.sourceTreeId);
+                }
+                if (event.type === 'ref-change' || event.type === 'session-change') {
+                    void this._refreshSessions(daemon).catch(e => this._log('info', { type: 'session-refresh-error', error: String(e) }));
                 }
+                this._log(event.type === 'log' && event.level === 'debug' ? 'debug' : 'info', event);
+            } });
+        this._stopEventListener = () => {
+            void call.cancel('listener disposed').finally(() => call.dispose?.('listener disposed')).catch(() => { });
+        };
+        void call.catch(e => {
+            if (this._daemon.connection.get() === daemon) {
+                this._log('info', { type: 'event-stream-error', error: String(e) });
             }
-        })();
+        });
     }
     // -- Helpers --------------------------------------------------------------
     _defaultSessionName() {
@@ -149,7 +152,11 @@ class ComponentExplorerMcpServer extends Disposable {
     }
     async _refreshSessions(daemon) {
         const prevCount = this._sessions.length;
-        this._sessions = await daemon.methods.sessions();
+        const sessions = await daemon.methods.sessions({});
+        if (this._daemon.connection.get() !== daemon) {
+            return;
+        }
+        this._sessions = sessions;
         if (this._sessions.length !== prevCount) {
             this._updateMultiSessionToolVisibility();
         }
@@ -179,23 +186,23 @@ class ComponentExplorerMcpServer extends Disposable {
         }
     }
     // -- Tool registration ---------------------------------------------------
-    _filterFixtures(allFixtures, fixtureIdPattern, labelPattern) {
+    _filterFixtures(allFixtures, fixtureIdRegexStr, labelRegexStr) {
         let fixtureIdRegex;
-        if (fixtureIdPattern) {
+        if (fixtureIdRegexStr) {
             try {
-                fixtureIdRegex = new RegExp(fixtureIdPattern);
+                fixtureIdRegex = new RegExp(fixtureIdRegexStr);
             }
             catch {
-                return { error: `Error: Invalid fixtureIdPattern: ${fixtureIdPattern}` };
+                return { error: `Error: Invalid fixtureIdRegex: ${fixtureIdRegexStr}` };
             }
         }
         let labelRegex;
-        if (labelPattern) {
+        if (labelRegexStr) {
             try {
-                labelRegex = new RegExp(labelPattern);
+                labelRegex = new RegExp(labelRegexStr);
             }
             catch {
-                return { error: `Error: Invalid labelPattern: ${labelPattern}` };
+                return { error: `Error: Invalid labelRegex: ${labelRegexStr}` };
             }
         }
         return {
@@ -233,12 +240,12 @@ class ComponentExplorerMcpServer extends Disposable {
     _registerListFixtures() {
         this._mcp.registerTool('list_fixtures', {
             description: 'List all fixtures from a session',
-            inputSchema: {
-                fixtureIdPattern: z.string().optional().describe('RegExp to filter fixtures by fixture ID'),
-                labelPattern: z.string().optional().describe('RegExp to filter fixtures by label (matched against inherited labels)'),
+            inputSchema: z.strictObject({
+                fixtureIdRegex: z.string().optional().describe('RegExp to filter fixtures by fixture ID'),
+                labelRegex: z.string().optional().describe('RegExp to filter fixtures by label (matched against inherited labels)'),
                 sessionName: z.string().optional().describe('Session name (defaults to first session)'),
                 sourceTreeId: z.string().optional().describe('Source tree ID (defaults to latest known)'),
-            },
+            }),
             annotations: { readOnlyHint: true },
         }, async (args) => this._withDaemon(async (daemon) => {
             const sessionName = args.sessionName ?? this._defaultSessionName();
@@ -246,7 +253,7 @@ class ComponentExplorerMcpServer extends Disposable {
             return this._withSourceTreeRetry(daemon, async () => {
                 const sourceTreeId = args.sourceTreeId ?? this._sourceTreeId(sessionName);
                 const listResult = await daemon.methods.fixtures.list({ sessionName, sourceTreeId });
-                const filtered = this._filterFixtures(listResult.fixtures, args.fixtureIdPattern, args.labelPattern);
+                const filtered = this._filterFixtures(listResult.fixtures, args.fixtureIdRegex, args.labelRegex);
                 if ('error' in filtered) {
                     return { content: [{ type: 'text', text: filtered.error }], isError: true };
                 }
@@ -262,13 +269,22 @@ class ComponentExplorerMcpServer extends Disposable {
     _registerScreenshot() {
         this._mcp.registerTool('screenshot', {
             description: 'Take a screenshot of a single fixture. ' +
-                'When stabilityCheck is true, the fixture is unmounted and re-mounted, then three screenshots are taken. ',
-            inputSchema: {
+                'When stabilityCheck is true, the fixture is unmounted and re-mounted, then three screenshots are taken. ' +
+                'By default the fixture stays mounted after the screenshot (so a follow-up `evaluate_js` call can still operate on it); ' +
+                'pass `disposeAfter: true` to dispose immediately and surface any teardown errors as `currentDispose` in the result. ' +
+                'Errors / events captured while disposing the previously-mounted fixture (the implicit dispose at the start of every render) are reported as `previousDispose`.',
+            inputSchema: z.strictObject({
                 fixtureId: z.string().describe('The fixture ID'),
                 sessionName: z.string().optional().describe('Session name (defaults to first session)'),
                 sourceTreeId: z.string().optional().describe('Source tree ID (defaults to latest known)'),
                 stabilityCheck: z.boolean().optional().describe('If true, takes three screenshots (at render time, ~500ms, ~3000ms) to check visual stability. Expensive (~3s extra) — only use it when you need to verify rendering stability..'),
-            },
+                includeConsoleLog: z.boolean().optional().describe('If true, include console.log events in the returned events array. Defaults to false — console.log entries are filtered out to reduce noise.'),
+                input: z.unknown().optional().describe('Arbitrary JSON-serializable data passed to the fixture as `RenderContext.input`. ' +
+                    'The fixture decides how to interpret it (e.g. theme switch, scenario selection, mock data).'),
+                disposeAfter: z.boolean().optional().describe('If true, dispose the fixture after taking the screenshot. ' +
+                    'Default: false — the fixture stays mounted until the next render, so `evaluate_js` can still operate on it. ' +
+                    'Use this when validating fixture teardown: dispose errors / events appear in `currentDispose`.'),
+            }),
             annotations: { readOnlyHint: true },
         }, async (args) => this._withDaemon(async (daemon) => {
             const sessionName = args.sessionName ?? this._defaultSessionName();
@@ -282,6 +298,8 @@ class ComponentExplorerMcpServer extends Disposable {
                     sourceTreeId,
                     includeImage: true,
                     stabilityCheck: args.stabilityCheck,
+                    input: args.input,
+                    disposeAfter: args.disposeAfter,
                 });
                 const r = result;
                 this._updateSessionSourceTreeId(sessionName, r.sourceTreeId);
@@ -289,6 +307,7 @@ class ComponentExplorerMcpServer extends Disposable {
                 if (r.hash && r.image) {
                     this._imageLru.put(r.hash, r.image);
                 }
+                const filterEvents = (events) => args.includeConsoleLog ? events : events.filter(e => e.type !== 'console.log');
                 const info = {
                     hash: r.hash,
                     sourceTreeId: r.sourceTreeId,
@@ -300,14 +319,37 @@ class ComponentExplorerMcpServer extends Disposable {
                     info.error = r.error;
                 }
                 if (r.events && r.events.length > 0) {
-                    info.events = r.events;
+                    const filtered = filterEvents(r.events);
+                    if (filtered.length > 0) {
+                        info.events = filtered;
+                    }
                 }
-                if (r.resultData !== undefined) {
-                    info.resultData = r.resultData;
+                if (r.output !== undefined) {
+                    info.output = r.output;
                 }
                 if (r.isStable !== undefined) {
                     info.isStable = r.isStable;
                 }
+                if (r.previousDispose) {
+                    const filtered = filterEvents(r.previousDispose.events);
+                    if (r.previousDispose.hasError || r.previousDispose.errors.length > 0 || filtered.length > 0) {
+                        info.previousDispose = {
+                            hasError: r.previousDispose.hasError,
+                            errors: r.previousDispose.errors,
+                            events: filtered,
+                        };
+                    }
+                }
+                if (r.currentDispose) {
+                    const filtered = filterEvents(r.currentDispose.events);
+                    if (r.currentDispose.hasError || r.currentDispose.errors.length > 0 || filtered.length > 0) {
+                        info.currentDispose = {
+                            hasError: r.currentDispose.hasError,
+                            errors: r.currentDispose.errors,
+                            events: filtered,
+                        };
+                    }
+                }
                 // Visual review status
                 if (r.hash) {
                     try {
@@ -351,13 +393,13 @@ class ComponentExplorerMcpServer extends Disposable {
     _registerCompareScreenshot() {
         const tool = this._mcp.registerTool('compare_screenshot', {
             description: 'Compare a fixture\'s screenshot across two sessions (e.g. baseline vs current)',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 fixtureId: z.string().describe('The fixture ID'),
                 baselineSessionName: z.string().optional().describe('Baseline session name (defaults to worktree session)'),
                 currentSessionName: z.string().optional().describe('Current session name (defaults to current session)'),
                 baselineSourceTreeId: z.string().optional().describe('Baseline source tree ID (defaults to latest known)'),
                 currentSourceTreeId: z.string().optional().describe('Current source tree ID (defaults to latest known)'),
-            },
+            }),
             annotations: { readOnlyHint: true },
         }, async (args) => this._withDaemon(async (daemon) => {
             const baselineSessionName = args.baselineSessionName ?? this._defaultBaselineSessionName();
@@ -391,8 +433,8 @@ class ComponentExplorerMcpServer extends Disposable {
                 if (r.baselineEvents && r.baselineEvents.length > 0) {
                     info.baselineEvents = r.baselineEvents;
                 }
-                if (r.baselineResultData !== undefined) {
-                    info.baselineResultData = r.baselineResultData;
+                if (r.baselineOutput !== undefined) {
+                    info.baselineOutput = r.baselineOutput;
                 }
                 if (r.currentHasError) {
                     info.currentHasError = true;
@@ -403,8 +445,8 @@ class ComponentExplorerMcpServer extends Disposable {
                 if (r.currentEvents && r.currentEvents.length > 0) {
                     info.currentEvents = r.currentEvents;
                 }
-                if (r.currentResultData !== undefined) {
-                    info.currentResultData = r.currentResultData;
+                if (r.currentOutput !== undefined) {
+                    info.currentOutput = r.currentOutput;
                 }
                 if (r.approval) {
                     info.approval = r.approval;
@@ -427,12 +469,12 @@ class ComponentExplorerMcpServer extends Disposable {
     _registerApproveDiff() {
         const tool = this._mcp.registerTool('approve_diff', {
             description: 'Approve a visual diff so it won\'t require re-inspection next time',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 fixtureId: z.string(),
                 originalHash: z.string(),
                 modifiedHash: z.string(),
                 comment: z.string().describe('Reason for approving this diff'),
-            },
+            }),
         }, async (args) => this._withDaemon(async (daemon) => {
             await daemon.methods.approvals.approve(args);
             return {
@@ -450,14 +492,14 @@ class ComponentExplorerMcpServer extends Disposable {
             description: 'Approve or reject a fixture\'s screenshot based on its expectedVisualDescriptions. ' +
                 'You must take a screenshot first and pass the resulting hash. ' +
                 'On approve, caches (expectedVisualDescriptions, screenshotHash) so future runs auto-approve.',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 fixtureId: z.string().describe('The fixture ID'),
                 screenshotHash: z.string().describe('The screenshot hash (from a prior screenshot tool call)'),
                 verdict: z.enum(['approve', 'reject']).describe('Whether the visual matches expectations'),
                 comment: z.string().describe('Reason for the verdict'),
                 sessionName: z.string().optional().describe('Session name (defaults to first session)'),
                 sourceTreeId: z.string().optional().describe('Source tree ID (defaults to latest known)'),
-            },
+            }),
         }, async (args) => this._withDaemon(async (daemon) => {
             const sessionName = args.sessionName ?? this._defaultSessionName();
             this._log('debug', { type: 'tool-call', tool: 'review_visual', fixtureId: args.fixtureId, verdict: args.verdict });
@@ -485,13 +527,15 @@ class ComponentExplorerMcpServer extends Disposable {
                 }
                 else {
                     return {
-                        content: [{ type: 'text', text: JSON.stringify({
+                        content: [{
+                                type: 'text', text: JSON.stringify({
                                     fixtureId: args.fixtureId,
                                     verdict: 'rejected',
                                     comment: args.comment,
                                     screenshotHash: args.screenshotHash,
                                     expectedVisualDescriptions: fixture.expectedVisualDescriptions,
-                                }, null, 2) }],
+                                }, null, 2)
+                            }],
                     };
                 }
             });
@@ -501,12 +545,12 @@ class ComponentExplorerMcpServer extends Disposable {
         this._mcp.registerTool('check_visuals', {
             description: 'Batch check visual review status for fixtures that have expectedVisualDescription. ' +
                 'Returns lists of approved, needs-review, and no-expectation fixtures.',
-            inputSchema: {
-                fixtureIdPattern: z.string().optional().describe('RegExp to filter fixtures by fixture ID'),
-                labelPattern: z.string().optional().describe('RegExp to filter fixtures by label'),
+            inputSchema: z.strictObject({
+                fixtureIdRegex: z.string().optional().describe('RegExp to filter fixtures by fixture ID'),
+                labelRegex: z.string().optional().describe('RegExp to filter fixtures by label'),
                 sessionName: z.string().optional().describe('Session name (defaults to first session)'),
                 sourceTreeId: z.string().optional().describe('Source tree ID (defaults to latest known)'),
-            },
+            }),
             annotations: { readOnlyHint: true },
         }, async (args) => this._withDaemon(async (daemon) => {
             const sessionName = args.sessionName ?? this._defaultSessionName();
@@ -517,7 +561,7 @@ class ComponentExplorerMcpServer extends Disposable {
                 if (listResult.loadError) {
                     return { content: [{ type: 'text', text: `Error: Fixture loading failed: ${listResult.loadError}\nThe fixture list may be incomplete.` }], isError: true };
                 }
-                const filtered = this._filterFixtures(listResult.fixtures, args.fixtureIdPattern, args.labelPattern);
+                const filtered = this._filterFixtures(listResult.fixtures, args.fixtureIdRegex, args.labelRegex);
                 if ('error' in filtered) {
                     return { content: [{ type: 'text', text: filtered.error }], isError: true };
                 }
@@ -575,12 +619,12 @@ class ComponentExplorerMcpServer extends Disposable {
                 'Returns the expression result as JSON. The expression can return a Promise (it will be awaited). ' +
                 'Use this to inspect DOM state, computed styles, element dimensions, or component output. ' +
                 'Do NOT use this to modify the DOM — this tool is for read-only inspection and debugging only.',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 expression: z.string().describe('JavaScript expression to evaluate. Can return a Promise. The result must be JSON-serializable.'),
                 fixtureId: z.string().optional().describe('If provided, renders this fixture before evaluating the expression'),
                 sessionName: z.string().optional().describe('Session name (defaults to first session)'),
                 sourceTreeId: z.string().optional().describe('Source tree ID (defaults to latest known)'),
-            },
+            }),
         }, async (args) => this._withDaemon(async (daemon) => {
             const sessionName = args.sessionName ?? this._defaultSessionName();
             this._log('debug', { type: 'tool-call', tool: 'evaluate_js', sessionName, hasFixtureId: !!args.fixtureId });
@@ -612,9 +656,9 @@ class ComponentExplorerMcpServer extends Disposable {
             description: 'Force-reload the browser page used for rendering fixtures. ' +
                 'Only use this as a last resort if screenshots or evaluate_js return stale/broken results ' +
                 'that persist after source changes. Normal HMR updates should handle most cases automatically.',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 sessionName: z.string().optional().describe('Session name (defaults to first session)'),
-            },
+            }),
             annotations: { destructiveHint: true },
         }, async (args) => this._withDaemon(async (daemon) => {
             const sessionName = args.sessionName ?? this._defaultSessionName();
@@ -632,9 +676,9 @@ class ComponentExplorerMcpServer extends Disposable {
     _registerWatchAdd() {
         this._mcp.registerTool('watch_add', {
             description: 'Add fixtures to the watch list. Watched fixtures are automatically re-screenshotted when source changes.',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 fixtureIds: z.array(z.string()).describe('Fixture IDs to add'),
-            },
+            }),
         }, async (args) => {
             this._watchList.add(args.fixtureIds);
             return {
@@ -648,9 +692,9 @@ class ComponentExplorerMcpServer extends Disposable {
     _registerWatchRemove() {
         this._mcp.registerTool('watch_remove', {
             description: 'Remove fixtures from the watch list',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 fixtureIds: z.array(z.string()).describe('Fixture IDs to remove'),
-            },
+            }),
         }, async (args) => {
             this._watchList.remove(args.fixtureIds);
             return {
@@ -664,9 +708,9 @@ class ComponentExplorerMcpServer extends Disposable {
     _registerWatchSet() {
         this._mcp.registerTool('watch_set', {
             description: 'Replace the watch list entirely',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 fixtureIds: z.array(z.string()).describe('Fixture IDs to watch'),
-            },
+            }),
         }, async (args) => {
             this._watchList.set(args.fixtureIds);
             return {
@@ -680,12 +724,12 @@ class ComponentExplorerMcpServer extends Disposable {
     _registerWatchCompare() {
         const tool = this._mcp.registerTool('watch_compare', {
             description: 'Compare all watched fixtures across two sessions. Takes fresh screenshots from both sessions and reports which fixtures differ.',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 baselineSessionName: z.string().optional().describe('Baseline session name (defaults to worktree session)'),
                 currentSessionName: z.string().optional().describe('Current session name (defaults to current session)'),
                 baselineSourceTreeId: z.string().optional().describe('Baseline source tree ID (defaults to latest known)'),
                 currentSourceTreeId: z.string().optional().describe('Current source tree ID (defaults to latest known)'),
-            },
+            }),
             annotations: { readOnlyHint: true },
         }, async (args) => this._withDaemon(async (daemon) => {
             const ids = [...this._watchList.fixtureIds];
@@ -750,10 +794,10 @@ class ComponentExplorerMcpServer extends Disposable {
                 'Pass the sourceTreeId you already observed — resolves immediately if it already differs, ' +
                 'otherwise waits for a source-change or ref-change event. ' +
                 'If fixtures are on the watch list, automatically re-screenshots them and reports which changed.',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 sourceTreeId: z.string().describe('The sourceTreeId the client currently knows about. The call resolves once the source tree differs from this value.'),
                 sessionName: z.string().optional().describe('Session name (defaults to first session)'),
-            },
+            }),
             annotations: { readOnlyHint: true },
         }, async (args) => this._withDaemon(async (daemon) => {
             const sessionName = args.sessionName ?? this._defaultSessionName();
@@ -763,43 +807,49 @@ class ComponentExplorerMcpServer extends Disposable {
                 return this._waitForUpdateResult(daemon, sessionName, currentSourceTreeId);
             }
             // Wait for an event that changes the source tree (max 5s)
-            const events = await daemon.methods.events();
-            const iterator = events[Symbol.asyncIterator]();
+            let onEvent = () => { };
+            const call = daemon.methods.events({}, { onMessage: event => onEvent(event) });
+            let timer;
             try {
-                const deadline = Date.now() + 5000;
-                while (true) {
-                    const remaining = deadline - Date.now();
-                    if (remaining <= 0) {
-                        return { content: [{ type: 'text', text: JSON.stringify({ timeout: true, sessionName, sourceTreeId: knownSourceTreeId }, null, 2) }] };
-                    }
-                    const timeout = new Promise(resolve => setTimeout(() => resolve('timeout'), remaining));
-                    const next = iterator.next();
-                    const result = await Promise.race([next, timeout]);
-                    if (result === 'timeout') {
-                        return { content: [{ type: 'text', text: JSON.stringify({ timeout: true, sessionName, sourceTreeId: knownSourceTreeId }, null, 2) }] };
-                    }
-                    const { value: event, done } = result;
-                    if (done || !event) {
-                        return { content: [{ type: 'text', text: 'Event stream ended.' }] };
-                    }
-                    const ev = event;
-                    if (ev.type === 'source-change' && ev.sourceTreeId) {
-                        this._updateSessionSourceTreeId(ev.sessionName, ev.sourceTreeId);
-                    }
-                    if (ev.type === 'ref-change') {
-                        const refreshResult = await Promise.race([this._refreshSessions(daemon), timeout]);
-                        if (refreshResult === 'timeout') {
-                            return { content: [{ type: 'text', text: JSON.stringify({ timeout: true, sessionName, sourceTreeId: knownSourceTreeId }, null, 2) }] };
+                const changed = new Promise((resolve, reject) => {
+                    let refreshing = false;
+                    onEvent = event => {
+                        if (event.type === 'source-change') {
+                            this._updateSessionSourceTreeId(event.sessionName, event.sourceTreeId);
                         }
-                    }
-                    const newSourceTreeId = this._sourceTreeId(sessionName);
-                    if (newSourceTreeId && newSourceTreeId !== knownSourceTreeId) {
-                        return this._waitForUpdateResult(daemon, sessionName, newSourceTreeId);
-                    }
+                        if (event.type === 'ref-change' && !refreshing) {
+                            refreshing = true;
+                            void this._refreshSessions(daemon).then(() => {
+                                refreshing = false;
+                                const newId = this._sourceTreeId(sessionName);
+                                if (newId && newId !== knownSourceTreeId) {
+                                    resolve(newId);
+                                }
+                            }, reject);
+                        }
+                        const newId = this._sourceTreeId(sessionName);
+                        if (newId && newId !== knownSourceTreeId) {
+                            resolve(newId);
+                        }
+                    };
+                    timer = setTimeout(() => resolve('timeout'), 5000);
+                    void call.then(() => resolve('ended'), reject);
+                });
+                const result = await changed;
+                if (result === 'timeout') {
+                    return { content: [{ type: 'text', text: JSON.stringify({ timeout: true, sessionName, sourceTreeId: knownSourceTreeId }, null, 2) }] };
                 }
+                if (result === 'ended') {
+                    return { content: [{ type: 'text', text: 'Event stream ended.' }] };
+                }
+                return this._waitForUpdateResult(daemon, sessionName, result);
             }
             finally {
-                await iterator.return?.();
+                if (timer) {
+                    clearTimeout(timer);
+                }
+                void call.cancel('wait completed').finally(() => call.dispose?.('wait completed')).catch(() => { });
+                void call.catch(() => { });
             }
         }));
     }
@@ -855,9 +905,9 @@ class ComponentExplorerMcpServer extends Disposable {
         this._mcp.registerTool('restart_session', {
             description: 'Restart a session by disposing its browser page and dev server, then recreating them. ' +
                 'Use this when a session appears stuck (e.g. after a timeout).',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 sessionName: z.string().optional().describe('Session name to restart (defaults to first session)'),
-            },
+            }),
             annotations: { destructiveHint: true },
         }, async (args) => this._withDaemon(async (daemon) => {
             const sessionName = args.sessionName ?? this._defaultSessionName();
@@ -875,10 +925,10 @@ class ComponentExplorerMcpServer extends Disposable {
                 'The ref can be a branch name, tag, commit SHA, or the special value "INDEX" to snapshot staged changes. ' +
                 'The daemon allocates a reusable worktree slot from a fixed pool (max configured in component-explorer.json). ' +
                 'Returns the updated session list on success.',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 name: z.string().describe('Unique session name (e.g. "baseline", "bisect")'),
                 ref: z.string().describe('Git ref: branch, tag, commit SHA, or "INDEX" for staged changes'),
-            },
+            }),
         }, async (args) => this._withDaemon(async (daemon) => {
             this._log('info', { type: 'tool-call', tool: 'open_session', name: args.name, ref: args.ref });
             const result = await daemon.methods.openSession({ name: args.name, ref: args.ref });
@@ -896,9 +946,9 @@ class ComponentExplorerMcpServer extends Disposable {
         this._mcp.registerTool('close_session', {
             description: 'Close a dynamic worktree session and release its worktree slot back to the pool. ' +
                 'Cannot close static sessions configured in component-explorer.json.',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 name: z.string().describe('Session name to close'),
-            },
+            }),
             annotations: { destructiveHint: true },
         }, async (args) => this._withDaemon(async (daemon) => {
             this._log('info', { type: 'tool-call', tool: 'close_session', name: args.name });
@@ -919,10 +969,10 @@ class ComponentExplorerMcpServer extends Disposable {
                 'The worktree is checked out to the new ref and Vite\'s HMR handles the incremental update (no server restart). ' +
                 'Fails if the worktree has uncommitted changes — the error will list the dirty files. ' +
                 'The ref can be a branch, tag, commit SHA, or "INDEX" for staged changes.',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 name: z.string().describe('Session name to update'),
                 ref: z.string().describe('New git ref: branch, tag, commit SHA, or "INDEX"'),
-            },
+            }),
         }, async (args) => this._withDaemon(async (daemon) => {
             this._log('info', { type: 'tool-call', tool: 'update_session_ref', name: args.name, ref: args.ref });
             const result = await daemon.methods.updateSessionRef({ name: args.name, ref: args.ref });
@@ -939,11 +989,11 @@ class ComponentExplorerMcpServer extends Disposable {
         this._mcp.registerTool('get_url', {
             description: 'Get URL for viewing fixtures. Returns the full Component Explorer UI by default. ' +
                 'Use `embedded: true` for a minimal single-fixture view (requires fixtureId).',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 sessionName: z.string().optional().describe('Session name (defaults to first session)'),
                 fixtureId: z.string().optional().describe('Specific fixture ID to view. In explorer mode, pre-selects this fixture. In embedded mode (required), shows only this fixture.'),
                 embedded: z.boolean().optional().describe('If true, returns an embedded single-fixture URL (minimal UI, requires fixtureId). Default: false (full explorer UI).'),
-            },
+            }),
             annotations: { readOnlyHint: true },
         }, async (args) => this._withDaemon(async (daemon) => {
             const sessionName = args.sessionName ?? this._defaultSessionName();
@@ -984,6 +1034,7 @@ class ComponentExplorerMcpServer extends Disposable {
             const mode = args.embedded ? 'embedded' : undefined;
             const url = buildExplorerUrl({
                 baseUrl,
+                pathname: EXPLORER_ROUTE,
                 mode,
                 fixtureId: args.fixtureId,
             });
@@ -1002,32 +1053,45 @@ class ComponentExplorerMcpServer extends Disposable {
     }
     _registerCheckFixtureErrors() {
         this._mcp.registerTool('check_fixture_errors', {
-            description: 'Render fixtures and check for errors. Returns each fixture\'s error status. ' +
+            description: 'Render fixtures and check for errors. Each fixture is rendered and then disposed; ' +
+                'render exceptions appear as `error`, dispose exceptions as `disposeError`, and console / window ' +
+                'events from both phases are collected in `events` (each tagged with `phase: "render" | "dispose"`). ' +
+                'A fixture is considered errored if either the render or the dispose phase reports `hasError` ' +
+                '(i.e. an exception was thrown or an event of type `console.error` / `window.error` / `window.unhandledrejection` was captured). ' +
+                'Only errored fixtures are listed; successful fixtures are summarised via the `summary` counts. ' +
                 'Returns results directly if finished within ~10s, otherwise returns a taskId for polling via check_task.',
-            inputSchema: {
-                fixtureIdPattern: z.string().optional().describe('RegExp to filter fixtures by fixture ID'),
-                labelPattern: z.string().optional().describe('RegExp to filter fixtures by label (matched against inherited labels)'),
+            inputSchema: z.strictObject({
+                fixtureIdRegex: z.string().optional().describe('RegExp to filter fixtures by fixture ID'),
+                labelRegex: z.string().optional().describe('RegExp to filter fixtures by label (matched against inherited labels)'),
                 sessionName: z.string().optional().describe('Session name (defaults to first session)'),
                 sourceTreeId: z.string().optional().describe('Source tree ID (defaults to latest known)'),
-            },
+                reloadBetweenFixtures: z.boolean().optional().describe('If true, reload the browser page between fixtures. Provides cleaner isolation but is slower. ' +
+                    'Default: false (the page is only reloaded after a fixture errors).'),
+                input: z.unknown().optional().describe('Arbitrary JSON object passed to every fixture as `RenderContext.input`. ' +
+                    'See `screenshot` for details.'),
+            }),
             annotations: { readOnlyHint: true },
         }, async (args) => this._withDaemon(async (daemon) => {
             const sessionName = args.sessionName ?? this._defaultSessionName();
-            this._log('debug', { type: 'tool-call', tool: 'check_fixture_errors', sessionName, fixtureIdPattern: args.fixtureIdPattern, labelPattern: args.labelPattern });
+            this._log('debug', { type: 'tool-call', tool: 'check_fixture_errors', sessionName, fixtureIdRegex: args.fixtureIdRegex, labelRegex: args.labelRegex });
             return this._withSourceTreeRetry(daemon, async () => {
                 const sourceTreeId = args.sourceTreeId ?? this._sourceTreeId(sessionName);
                 const listResult = await daemon.methods.fixtures.list({ sessionName, sourceTreeId });
                 if (listResult.loadError) {
                     return { content: [{ type: 'text', text: `Error: Fixture loading failed: ${listResult.loadError}\nThe fixture list may be incomplete.` }], isError: true };
                 }
-                const filtered = this._filterFixtures(listResult.fixtures, args.fixtureIdPattern, args.labelPattern);
+                const filtered = this._filterFixtures(listResult.fixtures, args.fixtureIdRegex, args.labelRegex);
                 if ('error' in filtered) {
                     return { content: [{ type: 'text', text: filtered.error }], isError: true };
                 }
                 const fixtures = filtered.fixtures;
                 const task = this._taskManager.startTask(async (report, signal) => {
-                    const results = [];
-                    report({ completed: 0, total: fixtures.length, partialResult: results });
+                    // Only errored fixtures are stored/reported; successful fixtures would just bloat the response.
+                    // The summary below still surfaces the total/ok/errored counts.
+                    const erroredResults = [];
+                    let okCount = 0;
+                    let processed = 0;
+                    report({ completed: 0, total: fixtures.length, partialResult: erroredResults });
                     for (let i = 0; i < fixtures.length; i++) {
                         if (signal.aborted) {
                             break;
@@ -1039,30 +1103,52 @@ class ComponentExplorerMcpServer extends Disposable {
                                 sessionName,
                                 sourceTreeId,
                                 includeImage: false,
+                                // Skip the reload before the very first fixture — the page is already fresh.
+                                reloadBeforeRender: args.reloadBetweenFixtures && i > 0,
+                                input: args.input,
+                                // Always dispose after rendering so teardown errors / events are observable for every fixture
+                                // (including the last one). Because we explicitly dispose here, the implicit
+                                // `previousDispose` at the start of the next render is a no-op and need not be inspected.
+                                disposeAfter: true,
                             });
                             const r = result;
-                            const entry = { fixtureId: fixture.fixtureId, hasError: r.hasError };
-                            if (r.error) {
-                                entry.error = r.error;
+                            const renderEvents = (r.events ?? []).map(e => ({ phase: 'render', ...e }));
+                            const disposeEvents = (r.currentDispose?.events ?? []).map(e => ({ phase: 'dispose', ...e }));
+                            const events = [...renderEvents, ...disposeEvents];
+                            const disposeError = r.currentDispose?.errors[0];
+                            // Trust the upstream `hasError` flags so this stays in sync with the render-report rules
+                            // (exception OR an event of type console.error / window.error / window.unhandledrejection).
+                            const hasError = r.hasError || !!r.currentDispose?.hasError;
+                            if (hasError) {
+                                const entry = { fixtureId: fixture.fixtureId, hasError: true };
+                                if (r.error) {
+                                    entry.error = r.error;
+                                }
+                                if (disposeError) {
+                                    entry.disposeError = disposeError;
+                                }
+                                if (events.length > 0) {
+                                    entry.events = events;
+                                }
+                                erroredResults.push(entry);
                             }
-                            if (r.events && r.events.length > 0) {
-                                entry.events = r.events;
+                            else {
+                                okCount++;
                             }
-                            results.push(entry);
                         }
                         catch (e) {
-                            results.push({
+                            erroredResults.push({
                                 fixtureId: fixture.fixtureId,
                                 hasError: true,
                                 error: { message: e instanceof Error ? e.message : String(e) },
                             });
                         }
-                        report({ completed: i + 1, total: fixtures.length, partialResult: results });
+                        processed++;
+                        report({ completed: i + 1, total: fixtures.length, partialResult: erroredResults });
                     }
-                    const withErrors = results.filter(r => r.hasError);
                     return {
-                        fixtures: results,
-                        summary: { total: results.length, ok: results.length - withErrors.length, errored: withErrors.length },
+                        fixtures: erroredResults,
+                        summary: { total: processed, ok: okCount, errored: erroredResults.length },
                     };
                 });
                 const waited = await this._taskManager.waitForTask(task.id, 10_000);
@@ -1096,23 +1182,27 @@ class ComponentExplorerMcpServer extends Disposable {
             description: 'Check rendering stability of fixtures. Each fixture is unmounted, re-mounted, and screenshotted 3 times (~3s per fixture). ' +
                 'Returns results directly if finished within ~10s, otherwise returns a taskId for polling via check_task. ' +
                 'When returning a taskId, includes partial results collected so far.',
-            inputSchema: {
-                fixtureIdPattern: z.string().optional().describe('RegExp to filter fixtures by fixture ID'),
-                labelPattern: z.string().optional().describe('RegExp to filter fixtures by label (matched against inherited labels)'),
+            inputSchema: z.strictObject({
+                fixtureIdRegex: z.string().optional().describe('RegExp to filter fixtures by fixture ID'),
+                labelRegex: z.string().optional().describe('RegExp to filter fixtures by label (matched against inherited labels)'),
                 sessionName: z.string().optional().describe('Session name (defaults to first session)'),
                 sourceTreeId: z.string().optional().describe('Source tree ID (defaults to latest known)'),
-            },
+                reloadBetweenFixtures: z.boolean().optional().describe('If true, reload the browser page between fixtures. Provides cleaner isolation but is slower. ' +
+                    'Default: false (the page is only reloaded after a fixture errors).'),
+                input: z.unknown().optional().describe('Arbitrary JSON object passed to every fixture as `RenderContext.input`. ' +
+                    'See `screenshot` for details.'),
+            }),
             annotations: { readOnlyHint: true },
         }, async (args) => this._withDaemon(async (daemon) => {
             const sessionName = args.sessionName ?? this._defaultSessionName();
-            this._log('debug', { type: 'tool-call', tool: 'check_stability', sessionName, fixtureIdPattern: args.fixtureIdPattern, labelPattern: args.labelPattern });
+            this._log('debug', { type: 'tool-call', tool: 'check_stability', sessionName, fixtureIdRegex: args.fixtureIdRegex, labelRegex: args.labelRegex });
             return this._withSourceTreeRetry(daemon, async () => {
                 const sourceTreeId = args.sourceTreeId ?? this._sourceTreeId(sessionName);
                 const listResult = await daemon.methods.fixtures.list({ sessionName, sourceTreeId });
                 if (listResult.loadError) {
                     return { content: [{ type: 'text', text: `Error: Fixture loading failed: ${listResult.loadError}\nThe fixture list may be incomplete.` }], isError: true };
                 }
-                const filtered = this._filterFixtures(listResult.fixtures, args.fixtureIdPattern, args.labelPattern);
+                const filtered = this._filterFixtures(listResult.fixtures, args.fixtureIdRegex, args.labelRegex);
                 if ('error' in filtered) {
                     return { content: [{ type: 'text', text: filtered.error }], isError: true };
                 }
@@ -1133,6 +1223,9 @@ class ComponentExplorerMcpServer extends Disposable {
                             sourceTreeId,
                             includeImage: false,
                             stabilityCheck: true,
+                            // Skip the reload before the very first fixture — the page is already fresh.
+                            reloadBeforeRender: args.reloadBetweenFixtures && i > 0,
+                            input: args.input,
                         });
                         const r = result;
                         results.push({
@@ -1177,9 +1270,9 @@ class ComponentExplorerMcpServer extends Disposable {
     _registerCheckTask() {
         this._mcp.registerTool('check_task', {
             description: 'Check on a running task. Waits up to ~2s for completion; if still running, returns progress and new results since last check.',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 taskId: z.string().describe('The task ID returned by a previous tool call'),
-            },
+            }),
             annotations: { readOnlyHint: true },
         }, async (args) => {
             const waited = await this._taskManager.waitForTask(args.taskId, 2_000);
@@ -1227,9 +1320,9 @@ class ComponentExplorerMcpServer extends Disposable {
     _registerCancelTask() {
         this._mcp.registerTool('cancel_task', {
             description: 'Cancel a running task',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 taskId: z.string().describe('The task ID to cancel'),
-            },
+            }),
         }, async (args) => {
             const task = this._taskManager.getTask(args.taskId);
             if (!task) {
@@ -1249,9 +1342,9 @@ class ComponentExplorerMcpServer extends Disposable {
             description: 'Retrieve a recently-taken screenshot image by its hash. ' +
                 'Keeps the last ~10 images in an LRU cache. ' +
                 'Useful for debugging when screenshot hashes behave unexpectedly.',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 hash: z.string().describe('The screenshot hash to look up'),
-            },
+            }),
             annotations: { readOnlyHint: true },
         }, async (args) => {
             const image = this._imageLru.get(args.hash);
@@ -1275,9 +1368,9 @@ class ComponentExplorerMcpServer extends Disposable {
                 'Only use this tool when the user explicitly asks to show or hide the browser. ' +
                 'Do not call this tool automatically or as part of other workflows. ' +
                 'Note: changing visibility closes the current browser instance, so the next screenshot or evaluate_js call will relaunch it.',
-            inputSchema: {
+            inputSchema: z.strictObject({
                 visible: z.boolean().describe('true to show the browser window (headed mode), false to hide it (headless mode)'),
-            },
+            }),
             annotations: { destructiveHint: true },
         }, async (args) => this._withDaemon(async (daemon) => {
             await daemon.methods.setBrowserVisibility({ visible: args.visible });