@vscode/component-explorer-cli 0.2.1-14 → 0.2.1-16

package/dist/mcp/McpServer.js

@@ -10,118 +10,13 @@ import '../external/vscode-observables/observables/dist/observableInternal/utils
 import '../external/vscode-observables/observables/dist/observableInternal/observables/observableFromEvent.js';
 import { buildExplorerUrl } from '../utils.js';
 import { TaskManager } from './TaskManager.js';
+import { isPipeConnectionError } from '../daemon/pipeClient.js';
 
-// ---------------------------------------------------------------------------
-// Client-local state
-// ---------------------------------------------------------------------------
-class ImageLruCache {
-    _maxSize;
-    _entries = [];
-    constructor(_maxSize = 10) {
-        this._maxSize = _maxSize;
-    }
-    put(hash, image) {
-        const idx = this._entries.findIndex(e => e.hash === hash);
-        if (idx !== -1) {
-            this._entries.splice(idx, 1);
-        }
-        this._entries.unshift({ hash, image });
-        if (this._entries.length > this._maxSize) {
-            this._entries.length = this._maxSize;
-        }
-    }
-    get(hash) {
-        const idx = this._entries.findIndex(e => e.hash === hash);
-        if (idx === -1) {
-            return undefined;
-        }
-        const [entry] = this._entries.splice(idx, 1);
-        this._entries.unshift(entry);
-        return entry.image;
-    }
-    keys() {
-        return this._entries.map(e => e.hash);
-    }
-}
-class WatchList {
-    _fixtureIds = new Set();
-    _hashes = new Map();
-    get fixtureIds() { return this._fixtureIds; }
-    add(ids) {
-        for (const id of ids) {
-            this._fixtureIds.add(id);
-        }
-    }
-    remove(ids) {
-        for (const id of ids) {
-            this._fixtureIds.delete(id);
-            this._hashes.delete(id);
-        }
-    }
-    set(ids) {
-        this._fixtureIds.clear();
-        this._hashes.clear();
-        for (const id of ids) {
-            this._fixtureIds.add(id);
-        }
-    }
-    getHash(fixtureId) {
-        return this._hashes.get(fixtureId);
-    }
-    setHash(fixtureId, hash) {
-        this._hashes.set(fixtureId, hash);
-    }
-    toJSON() {
-        return {
-            fixtureIds: [...this._fixtureIds],
-            hashes: Object.fromEntries(this._hashes),
-        };
-    }
-}
-function noDaemonError(hint) {
-    let text = 'Error: No daemon is currently running.';
-    if (hint) {
-        text += ` ${hint}`;
-    }
-    else {
-        text += ' Please start the Component Explorer daemon first by running:\n\n' +
-            '  component-explorer serve --project <config.json>\n\n' +
-            'Or start it in the background:\n\n' +
-            '  component-explorer serve --project <config.json> --background\n\n' +
-            'The daemon manages dev servers and enables fixture screenshots.';
-    }
-    return {
-        content: [{ type: 'text', text }],
-        isError: true,
-    };
-}
-// ---------------------------------------------------------------------------
-// DaemonConnection - wrapper to avoid Proxy issues with observables
-// ---------------------------------------------------------------------------
-class DaemonConnection {
-    client;
-    _stale = false;
-    constructor(client) {
-        this.client = client;
-    }
-    get isStale() { return this._stale; }
-    markStale() { this._stale = true; }
-}
-function isPipeConnectionError(e) {
-    if (!(e instanceof Error)) {
-        return false;
-    }
-    const code = e.code;
-    if (code === 'ENOENT' || code === 'ECONNREFUSED' || code === 'ECONNRESET' || code === 'EPIPE') {
-        return true;
-    }
-    return /connect ENOENT|ECONNREFUSED|ECONNRESET|EPIPE/.test(e.message);
-}
 // ---------------------------------------------------------------------------
 // ComponentExplorerMcpServer
 // ---------------------------------------------------------------------------
 class ComponentExplorerMcpServer extends Disposable {
-    _daemonConnection;
+    _daemon;
     static async create(daemon, options) {
         const server = new ComponentExplorerMcpServer(daemon, options ?? {});
         const transport = new StdioServerTransport();
@@ -133,16 +28,12 @@ class ComponentExplorerMcpServer extends Disposable {
     _imageLru = new ImageLruCache(10);
     _taskManager = new TaskManager();
     _taskLastReportedIndex = new Map();
-    _pollFn;
-    _noAutostartHint;
     _multiSessionTools = [];
     _sessions = [];
     _eventStreamAbortController;
-    constructor(_daemonConnection, options) {
+    constructor(_daemon, options) {
         super();
-        this._daemonConnection = _daemonConnection;
-        this._pollFn = options.pollFn;
-        this._noAutostartHint = options.noAutostartHint;
+        this._daemon = _daemon;
         this._callTimeoutMs = options.callTimeoutMs ?? ComponentExplorerMcpServer._DEFAULT_CALL_TIMEOUT_MS;
         this._mcp = new McpServer({
             name: 'component-explorer',
@@ -150,8 +41,8 @@ class ComponentExplorerMcpServer extends Disposable {
         });
         this._registerTools();
         this._store.add(autorun(async (reader) => {
-            const conn = this._daemonConnection.read(reader);
-            await this._onDaemonChanged(conn?.client);
+            const client = this._daemon.connection.read(reader);
+            await this._onDaemonChanged(client);
         }));
     }
     async _onDaemonChanged(daemon) {
@@ -173,49 +64,13 @@ class ComponentExplorerMcpServer extends Disposable {
             this._sessions = [];
         }
     }
-    _getConnection() {
-        const conn = this._daemonConnection.get();
-        if (conn?.isStale) {
-            return undefined;
-        }
-        return conn;
-    }
-    async _waitForDaemon() {
-        let conn = this._getConnection();
-        if (conn) {
-            return conn.client;
-        }
-        if (!this._pollFn) {
-            return undefined;
-        }
-        this._log('debug', { type: 'waiting-for-daemon' });
-        const startTime = Date.now();
-        const timeout = 3000;
-        while (Date.now() - startTime < timeout) {
-            await this._pollFn();
-            conn = this._getConnection();
-            if (conn) {
-                return conn.client;
-            }
-            await new Promise(resolve => setTimeout(resolve, 200));
-        }
-        return undefined;
-    }
-    _handleDisconnect() {
-        const conn = this._daemonConnection.get();
-        if (conn && !conn.isStale) {
-            conn.markStale();
-            this._sessions = [];
-            this._log('debug', { type: 'daemon-connection-lost' });
-        }
-    }
     _noDaemonError() {
-        return noDaemonError(this._noAutostartHint);
+        return noDaemonError(this._daemon.noDaemonHint);
     }
     static _DEFAULT_CALL_TIMEOUT_MS = 15_000;
     _callTimeoutMs;
     async _withDaemon(fn, options) {
-        const daemon = await this._waitForDaemon();
+        const daemon = await this._daemon.getDaemonOrStart();
         if (!daemon) {
             return this._noDaemonError();
         }
@@ -235,7 +90,6 @@ class ComponentExplorerMcpServer extends Disposable {
             }
             if (isPipeConnectionError(e)) {
                 this._log('debug', { type: 'daemon-call-failed', error: String(e) });
-                this._handleDisconnect();
                 return this._noDaemonError();
             }
             throw e;
@@ -259,7 +113,7 @@ class ComponentExplorerMcpServer extends Disposable {
                         this._updateSessionSourceTreeId(event.sessionName, event.sourceTreeId);
                     }
                     if (event.type === 'ref-change' || event.type === 'session-change') {
-                        await this._refreshSessions();
+                        await this._refreshSessions(daemon);
                     }
                     this._log(event.type === 'log' && event.level === 'debug' ? 'debug' : 'info', event);
                 }
@@ -293,24 +147,11 @@ class ComponentExplorerMcpServer extends Disposable {
             s.sourceTreeId = sourceTreeId;
         }
     }
-    async _refreshSessions() {
-        const conn = this._getConnection();
-        if (conn) {
-            try {
-                const prevCount = this._sessions.length;
-                this._sessions = await conn.client.methods.sessions();
-                if (this._sessions.length !== prevCount) {
-                    this._updateMultiSessionToolVisibility();
-                }
-            }
-            catch (e) {
-                if (isPipeConnectionError(e)) {
-                    this._handleDisconnect();
-                }
-                else {
-                    throw e;
-                }
-            }
+    async _refreshSessions(daemon) {
+        const prevCount = this._sessions.length;
+        this._sessions = await daemon.methods.sessions();
+        if (this._sessions.length !== prevCount) {
+            this._updateMultiSessionToolVisibility();
         }
     }
     _updateMultiSessionToolVisibility() {
@@ -324,14 +165,14 @@ class ComponentExplorerMcpServer extends Disposable {
             }
         }
     }
-    async _withSourceTreeRetry(fn) {
+    async _withSourceTreeRetry(daemon, fn) {
         try {
             return await fn();
         }
         catch (e) {
             const msg = e instanceof Error ? e.message : String(e);
             if (msg.includes('Source tree changed')) {
-                await this._refreshSessions();
+                await this._refreshSessions(daemon);
                 return await fn();
             }
             throw e;
@@ -402,7 +243,7 @@ class ComponentExplorerMcpServer extends Disposable {
         }, async (args) => this._withDaemon(async (daemon) => {
             const sessionName = args.sessionName ?? this._defaultSessionName();
             this._log('debug', { type: 'tool-call', tool: 'list_fixtures', sessionName });
-            return this._withSourceTreeRetry(async () => {
+            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);
@@ -433,7 +274,7 @@ class ComponentExplorerMcpServer extends Disposable {
             const sessionName = args.sessionName ?? this._defaultSessionName();
             this._log('debug', { type: 'tool-call', tool: 'screenshot', fixtureId: args.fixtureId, sessionName });
             this._log('trace', { type: 'tool-args', tool: 'screenshot', args });
-            return this._withSourceTreeRetry(async () => {
+            return this._withSourceTreeRetry(daemon, async () => {
                 const sourceTreeId = args.sourceTreeId ?? this._sourceTreeId(sessionName);
                 const result = await daemon.methods.screenshots.take({
                     fixtureId: args.fixtureId,
@@ -522,7 +363,7 @@ class ComponentExplorerMcpServer extends Disposable {
             const baselineSessionName = args.baselineSessionName ?? this._defaultBaselineSessionName();
             const currentSessionName = args.currentSessionName ?? this._defaultCurrentSessionName();
             this._log('debug', { type: 'tool-call', tool: 'compare_screenshot', fixtureId: args.fixtureId, baselineSessionName, currentSessionName });
-            return this._withSourceTreeRetry(async () => {
+            return this._withSourceTreeRetry(daemon, async () => {
                 const baselineSourceTreeId = args.baselineSourceTreeId ?? this._sourceTreeId(baselineSessionName);
                 const currentSourceTreeId = args.currentSourceTreeId ?? this._sourceTreeId(currentSessionName);
                 const result = await daemon.methods.screenshots.compare({
@@ -620,7 +461,7 @@ class ComponentExplorerMcpServer extends Disposable {
         }, 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 });
-            return this._withSourceTreeRetry(async () => {
+            return this._withSourceTreeRetry(daemon, async () => {
                 const sourceTreeId = args.sourceTreeId ?? this._sourceTreeId(sessionName);
                 // Get fixture descriptions
                 const listResult = await daemon.methods.fixtures.list({ sessionName, sourceTreeId });
@@ -670,7 +511,7 @@ class ComponentExplorerMcpServer extends Disposable {
         }, async (args) => this._withDaemon(async (daemon) => {
             const sessionName = args.sessionName ?? this._defaultSessionName();
             this._log('debug', { type: 'tool-call', tool: 'check_visuals', sessionName });
-            return this._withSourceTreeRetry(async () => {
+            return this._withSourceTreeRetry(daemon, async () => {
                 const sourceTreeId = args.sourceTreeId ?? this._sourceTreeId(sessionName);
                 const listResult = await daemon.methods.fixtures.list({ sessionName, sourceTreeId });
                 if (listResult.loadError) {
@@ -744,7 +585,7 @@ class ComponentExplorerMcpServer extends Disposable {
             const sessionName = args.sessionName ?? this._defaultSessionName();
             this._log('debug', { type: 'tool-call', tool: 'evaluate_js', sessionName, hasFixtureId: !!args.fixtureId });
             this._log('trace', { type: 'tool-args', tool: 'evaluate_js', expressionLength: args.expression.length, fixtureId: args.fixtureId });
-            return this._withSourceTreeRetry(async () => {
+            return this._withSourceTreeRetry(daemon, async () => {
                 const sourceTreeId = args.sourceTreeId ?? this._sourceTreeId(sessionName);
                 const result = await daemon.methods.evaluate({
                     sessionName,
@@ -853,7 +694,7 @@ class ComponentExplorerMcpServer extends Disposable {
             }
             const baselineSessionName = args.baselineSessionName ?? this._defaultBaselineSessionName();
             const currentSessionName = args.currentSessionName ?? this._defaultCurrentSessionName();
-            return this._withSourceTreeRetry(async () => {
+            return this._withSourceTreeRetry(daemon, async () => {
                 const baselineSourceTreeId = args.baselineSourceTreeId ?? this._sourceTreeId(baselineSessionName);
                 const currentSourceTreeId = args.currentSourceTreeId ?? this._sourceTreeId(currentSessionName);
                 const [baselineResult, currentResult] = await Promise.all([
@@ -946,7 +787,7 @@ class ComponentExplorerMcpServer extends Disposable {
                         this._updateSessionSourceTreeId(ev.sessionName, ev.sourceTreeId);
                     }
                     if (ev.type === 'ref-change') {
-                        const refreshResult = await Promise.race([this._refreshSessions(), timeout]);
+                        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) }] };
                         }
@@ -1003,8 +844,8 @@ class ComponentExplorerMcpServer extends Disposable {
         this._mcp.registerTool('sessions', {
             description: 'List active sessions with their names, URLs, and current sourceTreeIds',
             annotations: { readOnlyHint: true },
-        }, async () => this._withDaemon(async (_daemon) => {
-            await this._refreshSessions();
+        }, async () => this._withDaemon(async (daemon) => {
+            await this._refreshSessions(daemon);
             return {
                 content: [{ type: 'text', text: JSON.stringify(this._sessions, null, 2) }],
             };
@@ -1104,24 +945,11 @@ class ComponentExplorerMcpServer extends Disposable {
                 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) => {
+        }, async (args) => this._withDaemon(async (daemon) => {
             const sessionName = args.sessionName ?? this._defaultSessionName();
             let session = this._sessions.find(s => s.name === sessionName);
             if (!session) {
-                const daemon = await this._waitForDaemon();
-                if (daemon) {
-                    try {
-                        await this._refreshSessions();
-                    }
-                    catch (e) {
-                        if (isPipeConnectionError(e)) {
-                            this._handleDisconnect();
-                        }
-                        else {
-                            throw e;
-                        }
-                    }
-                }
+                await this._refreshSessions(daemon);
                 session = this._sessions.find(s => s.name === sessionName);
                 if (!session) {
                     return {
@@ -1170,7 +998,7 @@ class ComponentExplorerMcpServer extends Disposable {
             return {
                 content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
             };
-        });
+        }));
     }
     _registerCheckFixtureErrors() {
         this._mcp.registerTool('check_fixture_errors', {
@@ -1186,7 +1014,7 @@ class ComponentExplorerMcpServer extends Disposable {
         }, 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 });
-            return this._withSourceTreeRetry(async () => {
+            return this._withSourceTreeRetry(daemon, async () => {
                 const sourceTreeId = args.sourceTreeId ?? this._sourceTreeId(sessionName);
                 const listResult = await daemon.methods.fixtures.list({ sessionName, sourceTreeId });
                 if (listResult.loadError) {
@@ -1278,7 +1106,7 @@ class ComponentExplorerMcpServer extends Disposable {
         }, 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 });
-            return this._withSourceTreeRetry(async () => {
+            return this._withSourceTreeRetry(daemon, async () => {
                 const sourceTreeId = args.sourceTreeId ?? this._sourceTreeId(sessionName);
                 const listResult = await daemon.methods.fixtures.list({ sessionName, sourceTreeId });
                 if (listResult.loadError) {
@@ -1459,6 +1287,90 @@ class ComponentExplorerMcpServer extends Disposable {
         }));
     }
 }
+// ---------------------------------------------------------------------------
+// Client-local state
+// ---------------------------------------------------------------------------
+class ImageLruCache {
+    _maxSize;
+    _entries = [];
+    constructor(_maxSize = 10) {
+        this._maxSize = _maxSize;
+    }
+    put(hash, image) {
+        const idx = this._entries.findIndex(e => e.hash === hash);
+        if (idx !== -1) {
+            this._entries.splice(idx, 1);
+        }
+        this._entries.unshift({ hash, image });
+        if (this._entries.length > this._maxSize) {
+            this._entries.length = this._maxSize;
+        }
+    }
+    get(hash) {
+        const idx = this._entries.findIndex(e => e.hash === hash);
+        if (idx === -1) {
+            return undefined;
+        }
+        const [entry] = this._entries.splice(idx, 1);
+        this._entries.unshift(entry);
+        return entry.image;
+    }
+    keys() {
+        return this._entries.map(e => e.hash);
+    }
+}
+class WatchList {
+    _fixtureIds = new Set();
+    _hashes = new Map();
+    get fixtureIds() { return this._fixtureIds; }
+    add(ids) {
+        for (const id of ids) {
+            this._fixtureIds.add(id);
+        }
+    }
+    remove(ids) {
+        for (const id of ids) {
+            this._fixtureIds.delete(id);
+            this._hashes.delete(id);
+        }
+    }
+    set(ids) {
+        this._fixtureIds.clear();
+        this._hashes.clear();
+        for (const id of ids) {
+            this._fixtureIds.add(id);
+        }
+    }
+    getHash(fixtureId) {
+        return this._hashes.get(fixtureId);
+    }
+    setHash(fixtureId, hash) {
+        this._hashes.set(fixtureId, hash);
+    }
+    toJSON() {
+        return {
+            fixtureIds: [...this._fixtureIds],
+            hashes: Object.fromEntries(this._hashes),
+        };
+    }
+}
+function noDaemonError(hint) {
+    let text = 'Error: No daemon is currently running.';
+    if (hint) {
+        text += ` ${hint}`;
+    }
+    else {
+        text += ' Please start the Component Explorer daemon first by running:\n\n' +
+            '  component-explorer serve --project <config.json>\n\n' +
+            'Or start it in the background:\n\n' +
+            '  component-explorer serve --project <config.json> --background\n\n' +
+            'The daemon manages dev servers and enables fixture screenshots.';
+    }
+    return {
+        content: [{ type: 'text', text }],
+        isError: true,
+    };
+}
 
-export { ComponentExplorerMcpServer, DaemonConnection };
+export { ComponentExplorerMcpServer };
 //# sourceMappingURL=McpServer.js.map