@vscode/component-explorer-cli 0.2.1-25 → 0.2.1-27

package/dist/mcp/McpServer.js

@@ -235,12 +235,12 @@ class ComponentExplorerMcpServer extends Disposable {
     _registerListFixtures() {
         this._mcp.registerTool('list_fixtures', {
             description: 'List all fixtures from a session',
-            inputSchema: {
+            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();
@@ -264,14 +264,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();
@@ -285,6 +293,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);
@@ -292,6 +302,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,
@@ -303,19 +314,37 @@ class ComponentExplorerMcpServer extends Disposable {
                     info.error = r.error;
                 }
                 if (r.events && r.events.length > 0) {
-                    const filtered = args.includeConsoleLog
-                        ? r.events
-                        : r.events.filter(e => e.type !== 'console.log');
+                    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 {
@@ -359,13 +388,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();
@@ -399,8 +428,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;
@@ -411,8 +440,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;
@@ -435,12 +464,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 {
@@ -458,14 +487,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 });
@@ -511,12 +540,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: {
+            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();
@@ -585,12 +614,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 });
@@ -622,9 +651,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();
@@ -642,9 +671,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 {
@@ -658,9 +687,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 {
@@ -674,9 +703,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 {
@@ -690,12 +719,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];
@@ -760,10 +789,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();
@@ -865,9 +894,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();
@@ -885,10 +914,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 });
@@ -906,9 +935,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 });
@@ -929,10 +958,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 });
@@ -949,11 +978,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();
@@ -1013,14 +1042,23 @@ 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: {
+            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();
@@ -1037,8 +1075,12 @@ class ComponentExplorerMcpServer extends Disposable {
                 }
                 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;
@@ -1050,30 +1092,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);
@@ -1107,12 +1171,16 @@ 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: {
+            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();
@@ -1144,6 +1212,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({
@@ -1188,9 +1259,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);
@@ -1238,9 +1309,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) {
@@ -1260,9 +1331,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);
@@ -1286,9 +1357,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 });