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

package/dist/coverage.js

@@ -0,0 +1,212 @@
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import libCoverage from 'istanbul-lib-coverage';
+import v8ToIstanbul from 'v8-to-istanbul';
+
+const { createCoverageMap } = libCoverage;
+/**
+ * Reads `window.__coverage__` produced by vite-plugin-istanbul and validates
+ * it has the Istanbul shape. Returns an empty map if the global is not present.
+ */
+function validateIstanbulMap(raw, logger) {
+    if (!raw || typeof raw !== 'object') {
+        logger.debug('No __coverage__ global found on the page (or not an object)');
+        return {};
+    }
+    const map = raw;
+    const out = {};
+    for (const [, value] of Object.entries(map)) {
+        if (!value || typeof value !== 'object') {
+            continue;
+        }
+        const v = value;
+        if (typeof v.path !== 'string' || !v.statementMap || !v.s) {
+            continue;
+        }
+        // Normalize the path to OS-native absolute (e.g. `D:/foo` → `D:\foo` on Windows).
+        const absPath = path.resolve(v.path);
+        out[absPath] = { ...v, path: absPath };
+    }
+    return out;
+}
+/**
+ * Convert raw V8 JS coverage entries (from Playwright) into an Istanbul-shaped
+ * coverage map. Entries without source content or with non-resolvable URLs
+ * are skipped.
+ */
+async function v8EntriesToIstanbul(entries, options) {
+    const { viteServerUrl, projectRoot, logger } = options;
+    const map = createCoverageMap({});
+    const baseUrl = viteServerUrl.endsWith('/') ? viteServerUrl.slice(0, -1) : viteServerUrl;
+    for (const entry of entries) {
+        if (!entry.source) {
+            logger.trace(`v8: skipping ${entry.url} (no source)`);
+            continue;
+        }
+        const filePath = _v8UrlToFsPath(entry.url, baseUrl, projectRoot.value);
+        if (!filePath) {
+            logger.trace(`v8: skipping ${entry.url} (cannot resolve to fs path)`);
+            continue;
+        }
+        if (options.exclude?.some(re => re.test(filePath))) {
+            logger.trace(`v8: excluded ${filePath}`);
+            continue;
+        }
+        if (options.include && !options.include.some(re => re.test(filePath))) {
+            logger.trace(`v8: not included ${filePath}`);
+            continue;
+        }
+        try {
+            const converter = v8ToIstanbul(filePath, 0, { source: entry.source });
+            await converter.load();
+            converter.applyCoverage(entry.functions);
+            const istanbul = converter.toIstanbul();
+            for (const fileCoverage of Object.values(istanbul)) {
+                map.merge({ [fileCoverage.path]: fileCoverage });
+            }
+            converter.destroy();
+        }
+        catch (err) {
+            logger.debug(`v8: failed to convert ${filePath}: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    return JSON.parse(JSON.stringify(map.toJSON()));
+}
+/** Merge multiple Istanbul coverage maps into one (file/statement/branch hit counts summed). */
+function mergeIstanbul(maps) {
+    const merged = createCoverageMap({});
+    for (const m of maps) {
+        merged.merge(m);
+    }
+    return JSON.parse(JSON.stringify(merged.toJSON()));
+}
+/**
+ * Convert raw Playwright CSS coverage entries into an Istanbul-shaped coverage
+ * map by treating each non-blank line as a statement. A line is considered
+ * "hit" if any covered byte-range overlaps with the line's character range.
+ *
+ * This lets CSS files appear in the same `coverage-final.json` as JS sources,
+ * so any tool that consumes Istanbul coverage (nyc, the coverage viewer, etc.)
+ * renders CSS as if it were source code.
+ */
+function cssEntriesToIstanbul(entries, options) {
+    const { viteServerUrl, projectRoot, logger } = options;
+    const baseUrl = viteServerUrl.endsWith('/') ? viteServerUrl.slice(0, -1) : viteServerUrl;
+    const out = {};
+    for (const entry of entries) {
+        if (!entry.text) {
+            logger.trace(`css: skipping ${entry.url} (no text)`);
+            continue;
+        }
+        const filePath = _v8UrlToFsPath(entry.url, baseUrl, projectRoot.value);
+        if (!filePath) {
+            logger.trace(`css: skipping ${entry.url} (cannot resolve to fs path)`);
+            continue;
+        }
+        if (options.exclude?.some(re => re.test(filePath))) {
+            logger.trace(`css: excluded ${filePath}`);
+            continue;
+        }
+        if (options.include && !options.include.some(re => re.test(filePath))) {
+            logger.trace(`css: not included ${filePath}`);
+            continue;
+        }
+        const lines = entry.text.split('\n');
+        const statementMap = {};
+        const s = {};
+        let offset = 0;
+        let nextId = 0;
+        for (let lineIdx = 0; lineIdx < lines.length; lineIdx++) {
+            const line = lines[lineIdx];
+            const lineStart = offset;
+            const lineEnd = offset + line.length;
+            offset = lineEnd + 1; // account for the '\n' that split() consumed
+            if (line.trim() === '') {
+                continue;
+            }
+            const id = String(nextId++);
+            statementMap[id] = {
+                start: { line: lineIdx + 1, column: 0 },
+                end: { line: lineIdx + 1, column: line.length },
+            };
+            const hit = entry.ranges.some(r => r.start < lineEnd && r.end > lineStart);
+            s[id] = hit ? 1 : 0;
+        }
+        // If we've already seen this file (e.g. multiple stylesheet records for
+        // the same URL — happens when a reload re-loads the same .css), merge
+        // hit counts: a line is covered if it was hit in any record. We assume
+        // the text is identical across records of the same URL; if it differs
+        // (post-reload edit), the first record's text wins.
+        const existing = out[filePath];
+        if (existing) {
+            for (const id of Object.keys(existing.s)) {
+                if (s[id] && s[id] > 0) {
+                    existing.s[id] = (existing.s[id] ?? 0) + s[id];
+                }
+            }
+            continue;
+        }
+        out[filePath] = {
+            path: filePath,
+            statementMap,
+            fnMap: {},
+            branchMap: {},
+            s,
+            f: {},
+            b: {},
+        };
+    }
+    return out;
+}
+/** Write a bare Istanbul coverage map (`coverage-final.json` format) to disk. */
+async function writeIstanbulFile(filePath, map) {
+    await fs.mkdir(path.dirname(filePath.value), { recursive: true });
+    await fs.writeFile(filePath.value, JSON.stringify(map, null, 2) + '\n', 'utf-8');
+}
+function _v8UrlToFsPath(url, viteServerBase, projectRoot) {
+    // file:// urls are direct
+    if (url.startsWith('file://')) {
+        try {
+            return path.resolve(fileURLToPath(url));
+        }
+        catch {
+            return undefined;
+        }
+    }
+    let urlPath;
+    if (url.startsWith(viteServerBase)) {
+        const tail = url.slice(viteServerBase.length).split('?')[0].split('#')[0];
+        urlPath = tail.startsWith('/') ? tail : `/${tail}`;
+    }
+    else if (url.startsWith('/') && !url.startsWith('//')) {
+        // Root-relative URLs (e.g. `/src/foo.css`) — produced by sourceURL
+        // annotations on inline stylesheets, or stripped from a server URL.
+        urlPath = url.split('?')[0].split('#')[0];
+    }
+    else {
+        // External URLs (CDN, etc.) — skip
+        return undefined;
+    }
+    // `/@fs/<abs>` is Vite's escape hatch for files outside the project root,
+    // where `<abs>` is already an absolute disk path (POSIX-encoded on Windows).
+    const fsMatch = /^\/@fs\/(.+)$/.exec(urlPath);
+    if (fsMatch) {
+        return path.resolve(decodeURIComponent(fsMatch[1]));
+    }
+    // Strip Vite-internal prefixes that aren't real files.
+    if (urlPath.startsWith('/@id/') || urlPath.startsWith('/@vite/') || urlPath.startsWith('/@react-refresh')) {
+        return undefined;
+    }
+    // Skip the explorer's own virtual HTML route (carries an inline <style>
+    // with the page reset rules — not a source file we want to cover).
+    if (urlPath === '/___explorer' || urlPath.startsWith('/___explorer.')) {
+        return undefined;
+    }
+    // Resolve against the project root. We use posix join then resolve to get a
+    // canonical OS-native absolute path (e.g. on Windows: D:\proj\src\foo.css).
+    return path.resolve(projectRoot, urlPath.replace(/^\/+/, ''));
+}
+
+export { cssEntriesToIstanbul, mergeIstanbul, v8EntriesToIstanbul, validateIstanbulMap, writeIstanbulFile };
+//# sourceMappingURL=coverage.js.map

package/dist/coverage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"coverage.js","sources":["../src/coverage.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/dist/daemon/DaemonService.d.ts

@@ -1,7 +1,7 @@
 import { type IDisposable, type IReader } from '@vscode/observables';
 import { AsyncStream } from '@hediet/simple-api';
 import { ExplorerSession } from '../explorerSession.js';
-import type { ResolvedWatchConfig } from '../watchConfig.js';
+import { type ResolvedConfig } from '../config.js';
 import { type ILogger } from '../logger.js';
 import { type ApprovalStore } from './approvalStore.js';
 import { VisualCache } from '../visualCache.js';
@@ -64,7 +64,6 @@ export declare class DaemonService {
     private readonly _pipeName;
     private readonly _logger;
     private readonly _browserFactory;
-    private readonly _serverFactory;
     private readonly _sessions;
     private readonly _sessionConfigs;
     private readonly _dynamicSessionMeta;
@@ -91,6 +90,9 @@ export declare class DaemonService {
                 sessionName: string;
                 includeImage?: boolean | undefined;
                 stabilityCheck?: boolean | undefined;
+                reloadBeforeRender?: boolean | undefined;
+                input?: unknown;
+                disposeAfter?: boolean | undefined;
             }, {
                 hash: string;
                 sourceTreeId: string;
@@ -98,13 +100,15 @@ export declare class DaemonService {
                 hasError: boolean;
                 error: import("../componentExplorer.js").ExceptionError | undefined;
                 events: import("../componentExplorer.js").RenderEvent[] | undefined;
-                resultData: unknown;
+                output: unknown;
                 isStable: boolean;
                 stabilityScreenshots: {
                     hash: string;
                     delayMs: number;
                     image: string | undefined;
                 }[];
+                previousDispose: import("../componentExplorer.js").DisposeReport | undefined;
+                currentDispose: import("../componentExplorer.js").DisposeReport | undefined;
             } | {
                 hash: string | undefined;
                 sourceTreeId: string;
@@ -112,7 +116,9 @@ export declare class DaemonService {
                 hasError: boolean;
                 error: import("../componentExplorer.js").ExceptionError | undefined;
                 events: import("../componentExplorer.js").RenderEvent[] | undefined;
-                resultData: unknown;
+                output: unknown;
+                previousDispose: import("../componentExplorer.js").DisposeReport | undefined;
+                currentDispose: import("../componentExplorer.js").DisposeReport | undefined;
                 isStable?: undefined;
                 stabilityScreenshots?: undefined;
             }, DaemonContext>;
@@ -121,6 +127,8 @@ export declare class DaemonService {
                 sourceTreeId: string;
                 sessionName: string;
                 includeImages?: boolean | undefined;
+                reloadBetweenFixtures?: boolean | undefined;
+                input?: unknown;
             }, {
                 sourceTreeId: string;
                 screenshots: {
@@ -130,7 +138,7 @@ export declare class DaemonService {
                     hasError: boolean;
                     error: import("../componentExplorer.js").ExceptionError | undefined;
                     events: import("../componentExplorer.js").RenderEvent[] | undefined;
-                    resultData: unknown;
+                    output: unknown;
                 }[];
             }, DaemonContext>;
             compare: import("@hediet/simple-api").IMethod<{
@@ -149,11 +157,11 @@ export declare class DaemonService {
                 baselineHasError: boolean;
                 baselineError: import("../componentExplorer.js").ExceptionError | undefined;
                 baselineEvents: import("../componentExplorer.js").RenderEvent[] | undefined;
-                baselineResultData: unknown;
+                baselineOutput: unknown;
                 currentHasError: boolean;
                 currentError: import("../componentExplorer.js").ExceptionError | undefined;
                 currentEvents: import("../componentExplorer.js").RenderEvent[] | undefined;
-                currentResultData: unknown;
+                currentOutput: unknown;
                 labels: readonly string[] | undefined;
                 labelsBefore: readonly string[] | undefined;
                 approval: import("./approvalStore.js").ApprovalInfo | undefined;
@@ -241,7 +249,7 @@ export declare class DaemonService {
         shutdown: import("@hediet/simple-api").IMethod<Record<string, never>, void, DaemonContext>;
     }>, DaemonContext>;
     private constructor();
-    static create(config: ResolvedWatchConfig, logger: ILogger, pipeName?: string, options?: {
+    static create(config: ResolvedConfig, logger: ILogger, pipeName?: string, options?: {
         idleTimeoutMs?: number;
         headed?: boolean;
     }): Promise<DaemonService>;
@@ -264,6 +272,7 @@ export declare class DaemonService {
     dispose(): Promise<void>;
     private _emit;
     private _restartSession;
+    private _serverContext;
     private _createExplorerSession;
     private _createWorktreeExplorerSession;
     private _setupSession;

package/dist/daemon/DaemonService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DaemonService.d.ts","sourceRoot":"","sources":["../../src/daemon/DaemonService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DaemonService.d.ts","sourceRoot":"","sources":["../../src/daemon/DaemonService.ts"],"names":[],"mappings":"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"}

package/dist/daemon/DaemonService.js

@@ -1,29 +1,29 @@
 import { z } from 'zod';
-import * as path from 'node:path';
-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 { autorun } from '../external/vscode-observables/observables/dist/observableInternal/reactions/autorun.js';
-import { derived } from '../external/vscode-observables/observables/dist/observableInternal/observables/derived.js';
-import { waitForState } from '../external/vscode-observables/observables/dist/observableInternal/utils/utilsCancellation.js';
-import '../external/vscode-observables/observables/dist/observableInternal/utils/utils.js';
-import '../external/vscode-observables/observables/dist/observableInternal/observables/observableFromEvent.js';
-import { createApiFactory } from '../packages/simple-api/dist/chunk-3R7GHWBM.js';
-import { AsyncStream } from '../packages/simple-api/dist/chunk-SGBCNXYH.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 { autorun } from '../vscode-observables/observables/dist/observableInternal/reactions/createEffect.js';
+import { derived } from '../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 { createApiFactory } from '../js-component-explorer/packages/simple-api/dist/chunk-FJ7AVNQE.js';
+import { AsyncStream } from '../js-component-explorer/packages/simple-api/dist/chunk-TTRCY65Z.js';
 import { ExplorerSession } from '../explorerSession.js';
+import '../config.js';
+import { RelativePath } from '../path.js';
 import { GitIndexResolver } from '../git/gitIndexResolver.js';
 import { DirtyWorktreeError } from '../git/gitWorktreeManager.js';
 import { execGit } from '../git/gitUtils.js';
 import { PlaywrightBrowserPageFactory } from '../browserPage.js';
-import { DefaultComponentExplorerHttpServerFactory } from '../httpServer.js';
 import { installDependencies } from '../dependencyInstaller.js';
 import { FileApprovalStore } from './approvalStore.js';
 import { VisualCache } from '../visualCache.js';
 import { contentHash } from '../screenshotCache.js';
 import { WorktreePool } from '../WorktreePool.js';
-import { ViteProjectRef } from '../viteProjectRef.js';
 import { pluginProtocolVersionText, daemonApiVersionText } from './version.js';
 export { isCompatibleVersion, parseVersion } from './version.js';
+import { ViteServerConfig } from '../server/serverConfig.js';
 
 // ---------------------------------------------------------------------------
 // ActivityTracker — monitors idle time and triggers shutdown
@@ -96,7 +96,6 @@ class DaemonService {
     _pipeName;
     _logger;
     _browserFactory;
-    _serverFactory;
     _sessions = new Map();
     _sessionConfigs = new Map();
     _dynamicSessionMeta = new Map();
@@ -110,14 +109,13 @@ class DaemonService {
     approvals;
     visualCache;
     api;
-    constructor(_config, _pipeName, _logger, _browserFactory, _serverFactory, approvalStorePath, idleTimeoutMs) {
+    constructor(_config, _pipeName, _logger, _browserFactory, approvalStorePath, idleTimeoutMs) {
         this._config = _config;
         this._pipeName = _pipeName;
         this._logger = _logger;
         this._browserFactory = _browserFactory;
-        this._serverFactory = _serverFactory;
         this.approvals = new FileApprovalStore(approvalStorePath);
-        this.visualCache = new VisualCache(`${_config.screenshotDir}/visual-cache.json`);
+        this.visualCache = new VisualCache(_config.screenshotDir.join(new RelativePath('visual-cache.json')));
         this._activityTracker = new ActivityTracker(idleTimeoutMs, () => this.requestShutdown(), this._logger);
         if (_config.worktreePool) {
             this._worktreePool = new WorktreePool(_config.worktreePool.maxSlots, _config.repo.worktreeRootPath());
@@ -126,10 +124,9 @@ class DaemonService {
     }
     static async create(config, logger, pipeName, options) {
         const browserFactory = new PlaywrightBrowserPageFactory(options?.headed ?? false, 30_000, logger);
-        const serverFactory = new DefaultComponentExplorerHttpServerFactory();
-        const approvalStorePath = `${config.screenshotDir}/approvals.json`;
+        const approvalStorePath = config.screenshotDir.join(new RelativePath('approvals.json'));
         const idleTimeoutMs = options?.idleTimeoutMs ?? 5 * 60 * 1000; // 5 minutes default
-        const svc = new DaemonService(config, pipeName ?? '', logger, browserFactory, serverFactory, approvalStorePath, idleTimeoutMs);
+        const svc = new DaemonService(config, pipeName, logger, browserFactory, approvalStorePath, idleTimeoutMs);
         for (const sessionConfig of config.sessions) {
             svc._sessionConfigs.set(sessionConfig.name, sessionConfig);
             await svc._setupSession(sessionConfig);
@@ -163,13 +160,20 @@ class DaemonService {
                         sessionName: z.string(),
                         includeImage: z.boolean().optional(),
                         stabilityCheck: z.boolean().optional(),
+                        reloadBeforeRender: z.boolean().optional(),
+                        input: z.unknown().optional(),
+                        disposeAfter: z.boolean().optional(),
                     },
                 }, async (args) => {
                     this._activityTracker.reportActivity();
                     const session = this.getSession(args.sessionName);
                     this.assertSourceTreeId(args.sessionName, args.sourceTreeId);
                     if (args.stabilityCheck) {
-                        const result = await session.explorer.screenshotFixtureStabilityCheck(args.fixtureId);
+                        const result = await session.explorer.screenshotFixtureStabilityCheck(args.fixtureId, {
+                            reloadBeforeRender: args.reloadBeforeRender,
+                            input: args.input,
+                            disposeAfter: args.disposeAfter,
+                        });
                         this.assertSourceTreeId(args.sessionName, args.sourceTreeId);
                         const hashes = result.screenshots.map(s => contentHash(s.image));
                         const isStable = hashes[0] === hashes[1] && hashes[1] === hashes[2];
@@ -189,12 +193,18 @@ class DaemonService {
                             hasError: result.hasError,
                             error: result.error,
                             events: result.events.length > 0 ? result.events : undefined,
-                            resultData: result.resultData,
+                            output: result.output,
                             isStable,
                             stabilityScreenshots,
+                            previousDispose: result.previousDispose,
+                            currentDispose: result.currentDispose,
                         };
                     }
-                    const result = await session.explorer.screenshotFixture(args.fixtureId);
+                    const result = await session.explorer.screenshotFixture(args.fixtureId, {
+                        reloadBeforeRender: args.reloadBeforeRender,
+                        input: args.input,
+                        disposeAfter: args.disposeAfter,
+                    });
                     this.assertSourceTreeId(args.sessionName, args.sourceTreeId);
                     return {
                         hash: result.image ? contentHash(result.image) : undefined,
@@ -205,7 +215,9 @@ class DaemonService {
                         hasError: result.hasError,
                         error: result.error,
                         events: result.events?.length > 0 ? result.events : undefined,
-                        resultData: result.resultData,
+                        output: result.output,
+                        previousDispose: result.previousDispose,
+                        currentDispose: result.currentDispose,
                     };
                 }),
                 takeBatch: createMethod({
@@ -214,6 +226,8 @@ class DaemonService {
                         sourceTreeId: z.string(),
                         sessionName: z.string(),
                         includeImages: z.boolean().optional(),
+                        reloadBetweenFixtures: z.boolean().optional(),
+                        input: z.unknown().optional(),
                     },
                 }, async (args) => {
                     this._activityTracker.reportActivity();
@@ -223,8 +237,14 @@ class DaemonService {
                     this._logger.trace(`takeBatch: ${args.fixtureIds.length} fixtures, session=${args.sessionName}`);
                     const startTime = Date.now();
                     const screenshots = [];
-                    for (const fixtureId of args.fixtureIds) {
-                        const result = await session.explorer.screenshotFixture(fixtureId);
+                    for (let i = 0; i < args.fixtureIds.length; i++) {
+                        const fixtureId = args.fixtureIds[i];
+                        const result = await session.explorer.screenshotFixture(fixtureId, {
+                            reloadOnError: true,
+                            // Reload between fixtures (skip before the first one — the page is already fresh)
+                            reloadBeforeRender: args.reloadBetweenFixtures && i > 0,
+                            input: args.input,
+                        });
                         this.assertSourceTreeId(args.sessionName, args.sourceTreeId);
                         screenshots.push({
                             fixtureId,
@@ -235,7 +255,7 @@ class DaemonService {
                             hasError: result.hasError,
                             error: result.error,
                             events: result.events.length > 0 ? result.events : undefined,
-                            resultData: result.resultData,
+                            output: result.output,
                         });
                     }
                     this._logger.trace(`takeBatch: done in ${Date.now() - startTime}ms`);
@@ -284,11 +304,11 @@ class DaemonService {
                         baselineHasError: baselineResult.hasError,
                         baselineError: baselineResult.error,
                         baselineEvents: baselineResult.events.length > 0 ? baselineResult.events : undefined,
-                        baselineResultData: baselineResult.resultData,
+                        baselineOutput: baselineResult.output,
                         currentHasError: currentResult.hasError,
                         currentError: currentResult.error,
                         currentEvents: currentResult.events.length > 0 ? currentResult.events : undefined,
-                        currentResultData: currentResult.resultData,
+                        currentOutput: currentResult.output,
                         labels,
                         labelsBefore: labelsChanged ? baselineFixture.labels : undefined,
                         approval: (baselineHash !== undefined && currentHash !== undefined && baselineHash !== currentHash)
@@ -470,7 +490,7 @@ class DaemonService {
                     sourceKind: 'worktree',
                     serverUrl: session.serverUrl,
                     sourceTreeId: reader ? session.sourceTreeId.read(reader).value : session.sourceTreeId.get().value,
-                    worktreePath: meta.worktreePath,
+                    worktreePath: meta.worktreePath.value,
                     ref: meta.ref,
                 });
             }
@@ -498,7 +518,7 @@ class DaemonService {
                     sourceKind: 'worktree',
                     serverUrl: session.serverUrl,
                     sourceTreeId: reader ? session.sourceTreeId.read(reader).value : session.sourceTreeId.get().value,
-                    worktreePath: meta.worktreePath,
+                    worktreePath: meta.worktreePath.value,
                     ref: meta.ref,
                 });
             }
@@ -707,43 +727,30 @@ class DaemonService {
             await this._createExplorerSession(config);
         }
     }
-    async _createExplorerSession(sessionConfig) {
-        const session = await ExplorerSession.create(sessionConfig.name, sessionConfig.server, this._serverFactory, this._browserFactory, {
+    _serverContext(sessionName) {
+        return {
             logger: this._logger,
-            daemonConfig: {
+            daemonConfig: this._pipeName ? {
                 pipeName: this._pipeName,
-                sessionName: sessionConfig.name,
+                sessionName,
                 daemonApiVersion: daemonApiVersionText,
                 pluginProtocolVersion: pluginProtocolVersionText,
-            },
-        });
+            } : undefined,
+        };
+    }
+    async _createExplorerSession(sessionConfig) {
+        const session = await ExplorerSession.create(sessionConfig.name, sessionConfig.server, this._browserFactory, this._serverContext(sessionConfig.name));
         this._sessions.set(sessionConfig.name, session);
         this._logger.debug(`Session ready: ${sessionConfig.name} (${session.serverUrl})`);
     }
     async _createWorktreeExplorerSession(sessionName, worktreePath) {
         const defaultServer = this._config.defaultServerConfig;
-        if (defaultServer.kind !== 'vite') {
+        if (!(defaultServer instanceof ViteServerConfig)) {
             throw new Error(`Worktree sessions require a Vite server configuration`);
         }
-        const configDirRelToGitRoot = path.relative(this._config.repo.gitRoot, this._config.configDir);
-        const worktreeConfigDir = path.resolve(worktreePath, configDirRelToGitRoot);
-        const defaultViteConfig = path.basename(defaultServer.viteProject.configFile ?? 'vite.config.ts');
-        const viteConfigPath = path.resolve(worktreeConfigDir, defaultViteConfig);
-        const viteProject = ViteProjectRef.fromViteConfigPath(viteConfigPath);
-        const currentSession = this._config.sessions.find(s => s.source.kind === 'current');
-        const resolveViteFrom = currentSession?.server.kind === 'vite' ? currentSession.server.viteProject.configFile : undefined;
-        this._logger.debug(`Worktree session "${sessionName}": resolveViteFrom=${resolveViteFrom}`);
-        const worktreeServerConfig = { kind: 'vite', viteProject, hmr: defaultServer.hmr };
-        const session = await ExplorerSession.create(sessionName, worktreeServerConfig, this._serverFactory, this._browserFactory, {
-            logger: this._logger,
-            resolveViteFrom,
-            daemonConfig: {
-                pipeName: this._pipeName,
-                sessionName,
-                daemonApiVersion: daemonApiVersionText,
-                pluginProtocolVersion: pluginProtocolVersionText,
-            },
-        });
+        const worktreeServerConfig = defaultServer.forWorktree(this._config.repo.gitRoot, worktreePath, this._config.configDir);
+        this._logger.debug(`Worktree session "${sessionName}": resolveViteFrom=${worktreeServerConfig.viteProject.configFile}`);
+        const session = await ExplorerSession.create(sessionName, worktreeServerConfig, this._browserFactory, this._serverContext(sessionName));
         this._sessions.set(sessionName, session);
         this._logger.debug(`Session ready: ${sessionName} (${session.serverUrl})`);
     }