agent-web-interface 4.3.0 → 4.5.0

package/dist/src/query/scoring.js

@@ -0,0 +1,162 @@
+/**
+ * Scoring
+ *
+ * Relevance scoring for query matches.
+ * Calculates how well a node matches the query request.
+ */
+/**
+ * Scoring weights for relevance calculation.
+ * Values represent the maximum contribution each signal can add to the score.
+ */
+export const SCORING_WEIGHTS = {
+    labelMatch: {
+        exact: 0.4,
+        contains: 0.3,
+        fuzzy: 0.25, // Base, multiplied by fuzzy match quality
+    },
+    kindMatch: 0.15,
+    regionMatch: 0.12,
+    stateMatch: 0.03, // Per matching state property (max ~0.27 for 9 props)
+    groupMatch: 0.08,
+    headingMatch: 0.08,
+    visibility: 0.02,
+};
+/**
+ * Normalize a label filter to its constituent parts.
+ * Shared helper used by both scoring and the query engine.
+ */
+export function normalizeLabelFilter(filter) {
+    if (typeof filter === 'string') {
+        return { text: filter, mode: 'contains', caseSensitive: false };
+    }
+    return {
+        text: filter.text,
+        mode: filter.mode ?? 'contains',
+        caseSensitive: filter.caseSensitive ?? false,
+        fuzzyOptions: filter.fuzzyOptions,
+    };
+}
+/**
+ * Calculate relevance score and match reasons for a node.
+ *
+ * @param node - The node to score
+ * @param request - The original query request
+ * @param labelMatchScore - Pre-computed label match score (for fuzzy matching)
+ * @returns Relevance score (0-1) and list of reasons
+ */
+export function scoreMatch(node, request, labelMatchScore) {
+    let relevance = 0;
+    const reasons = [];
+    // Label scoring
+    if (request.label !== undefined) {
+        const { mode } = normalizeLabelFilter(request.label);
+        let labelContribution;
+        if (mode === 'fuzzy' && labelMatchScore !== undefined) {
+            // Fuzzy: base weight * match quality
+            labelContribution = SCORING_WEIGHTS.labelMatch.fuzzy * labelMatchScore;
+        }
+        else if (mode === 'exact') {
+            labelContribution = SCORING_WEIGHTS.labelMatch.exact;
+        }
+        else {
+            labelContribution = SCORING_WEIGHTS.labelMatch.contains;
+        }
+        relevance += labelContribution;
+        reasons.push({
+            type: 'label',
+            description: `Label "${truncateLabel(node.label)}" matches query`,
+            score_contribution: labelContribution,
+        });
+    }
+    // Kind scoring
+    if (request.kind !== undefined) {
+        relevance += SCORING_WEIGHTS.kindMatch;
+        reasons.push({
+            type: 'kind',
+            description: `Kind "${node.kind}" matches filter`,
+            score_contribution: SCORING_WEIGHTS.kindMatch,
+        });
+    }
+    // Region scoring
+    if (request.region !== undefined) {
+        relevance += SCORING_WEIGHTS.regionMatch;
+        reasons.push({
+            type: 'region',
+            description: `Region "${node.where.region}" matches filter`,
+            score_contribution: SCORING_WEIGHTS.regionMatch,
+        });
+    }
+    // State scoring (per matched property)
+    if (request.state !== undefined && node.state) {
+        const matchedStates = Object.keys(request.state).filter((k) => request.state[k] !== undefined &&
+            request.state[k] === node.state[k]);
+        const stateContribution = matchedStates.length * SCORING_WEIGHTS.stateMatch;
+        if (stateContribution > 0) {
+            relevance += stateContribution;
+            reasons.push({
+                type: 'state',
+                description: `States match: ${matchedStates.join(', ')}`,
+                score_contribution: stateContribution,
+            });
+        }
+    }
+    // Group scoring
+    if (request.group_id !== undefined) {
+        relevance += SCORING_WEIGHTS.groupMatch;
+        reasons.push({
+            type: 'group',
+            description: `Group "${node.where.group_id}" matches`,
+            score_contribution: SCORING_WEIGHTS.groupMatch,
+        });
+    }
+    // Heading context scoring
+    if (request.heading_context !== undefined) {
+        relevance += SCORING_WEIGHTS.headingMatch;
+        reasons.push({
+            type: 'heading',
+            description: `Heading context "${node.where.heading_context}" matches`,
+            score_contribution: SCORING_WEIGHTS.headingMatch,
+        });
+    }
+    // Visibility bonus (always applied if node is visible)
+    if (node.state?.visible) {
+        relevance += SCORING_WEIGHTS.visibility;
+    }
+    // Normalize to 0-1 range based on what was actually queried
+    // This gives higher scores when fewer filters are used but all match
+    const maxPossible = calculateMaxPossibleScore(request);
+    const normalizedRelevance = maxPossible > 0 ? Math.min(1, relevance / maxPossible) : 0;
+    return { relevance: normalizedRelevance, reasons };
+}
+/**
+ * Calculate the maximum possible score given the request filters.
+ */
+export function calculateMaxPossibleScore(request) {
+    let max = SCORING_WEIGHTS.visibility; // Always possible
+    if (request.label !== undefined) {
+        const { mode } = normalizeLabelFilter(request.label);
+        max += SCORING_WEIGHTS.labelMatch[mode];
+    }
+    if (request.kind !== undefined)
+        max += SCORING_WEIGHTS.kindMatch;
+    if (request.region !== undefined)
+        max += SCORING_WEIGHTS.regionMatch;
+    if (request.state !== undefined) {
+        const stateCount = Object.keys(request.state).filter((k) => request.state[k] !== undefined).length;
+        max += stateCount * SCORING_WEIGHTS.stateMatch;
+    }
+    if (request.group_id !== undefined)
+        max += SCORING_WEIGHTS.groupMatch;
+    if (request.heading_context !== undefined)
+        max += SCORING_WEIGHTS.headingMatch;
+    return max;
+}
+/**
+ * Truncate a label for display in reasons.
+ */
+function truncateLabel(label, maxLength = 30) {
+    if (label.length <= maxLength)
+        return label;
+    return label.slice(0, maxLength - 1) + '…';
+}
+//# sourceMappingURL=scoring.js.map

package/dist/src/query/scoring.js.map

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

package/dist/src/server/index.d.ts

@@ -4,5 +4,4 @@
  * Barrel export for MCP server components.
  */
 export { BrowserAutomationServer, type ServerConfig } from './mcp-server.js';
-export { SessionStore, type TenantSession, type SessionStoreOptions } from './session-store.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,uBAAuB,EAAE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,uBAAuB,EAAE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC"}

package/dist/src/server/index.js

@@ -4,5 +4,4 @@
  * Barrel export for MCP server components.
  */
 export { BrowserAutomationServer } from './mcp-server.js';
-export { SessionStore } from './session-store.js';
 //# sourceMappingURL=index.js.map

package/dist/src/server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,uBAAuB,EAAqB,MAAM,iBAAiB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAgD,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,uBAAuB,EAAqB,MAAM,iBAAiB,CAAC"}

package/dist/src/server/mcp-server.d.ts

@@ -7,6 +7,7 @@
 import { EventEmitter } from 'events';
 import type { ZodRawShape } from 'zod';
 import { type LogLevel, type McpNotificationSender } from '../shared/services/logging.service.js';
+import type { ToolRegistrar } from './tool-registrar.types.js';
 export interface ServerConfig {
     name: string;
     version: string;
@@ -17,13 +18,16 @@ export interface ServerConfig {
  * Minimal shell - tool handlers will be registered by the new semantic snapshot system.
  */
 export interface SessionStartEvent {
-    clientInfo: import('./session-store.js').ClientInfo | undefined;
+    clientInfo: {
+        name: string;
+        version: string;
+    } | undefined;
 }
 export interface BrowserAutomationServerEvents {
     'session:start': [event: SessionStartEvent];
     'session:end': [];
 }
-export declare class BrowserAutomationServer extends EventEmitter implements McpNotificationSender {
+export declare class BrowserAutomationServer extends EventEmitter implements McpNotificationSender, ToolRegistrar {
     private readonly config;
     private server;
     private transport;

package/dist/src/server/mcp-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server.d.ts","sourceRoot":"","sources":["../../../src/server/mcp-server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AACvC,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,qBAAqB,EAC3B,MAAM,uCAAuC,CAAC;AAI/C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,OAAO,oBAAoB,EAAE,UAAU,GAAG,SAAS,CAAC;CACjE;AAED,MAAM,WAAW,6BAA6B;IAC5C,eAAe,EAAE,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;IAC5C,aAAa,EAAE,EAAE,CAAC;CACnB;AAED,qBAAa,uBAAwB,SAAQ,YAAa,YAAW,qBAAqB;IAI5E,OAAO,CAAC,QAAQ,CAAC,MAAM;IAHnC,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,SAAS,CAAuB;gBAEX,MAAM,EAAE,YAAY;IAmCjD;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAMxB;;OAEG;IACH,YAAY,CACV,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,WAAW,CAAC;QACzB,YAAY,CAAC,EAAE,WAAW,CAAC;KAC5B,EACD,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAC5C,IAAI;IA6GP;;OAEG;IACG,kBAAkB,CAAC,MAAM,EAAE;QAC/B,KAAK,EAAE,QAAQ,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC/B,GAAG,OAAO,CAAC,IAAI,CAAC;IAWjB;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAU/B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAe9B;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAG5B"}
+{"version":3,"file":"mcp-server.d.ts","sourceRoot":"","sources":["../../../src/server/mcp-server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AACvC,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,qBAAqB,EAC3B,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAG/D,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;CAC3D;AAED,MAAM,WAAW,6BAA6B;IAC5C,eAAe,EAAE,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;IAC5C,aAAa,EAAE,EAAE,CAAC;CACnB;AAED,qBAAa,uBACX,SAAQ,YACR,YAAW,qBAAqB,EAAE,aAAa;IAKnC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAHnC,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,SAAS,CAAuB;gBAEX,MAAM,EAAE,YAAY;IAmCjD;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAMxB;;OAEG;IACH,YAAY,CACV,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,WAAW,CAAC;QACzB,YAAY,CAAC,EAAE,WAAW,CAAC;KAC5B,EACD,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAC5C,IAAI;IAcP;;OAEG;IACG,kBAAkB,CAAC,MAAM,EAAE;QAC/B,KAAK,EAAE,QAAQ,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC/B,GAAG,OAAO,CAAC,IAAI,CAAC;IAWjB;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAU/B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAe9B;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAG5B"}

package/dist/src/server/mcp-server.js

@@ -9,7 +9,7 @@ import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { getLogger, } from '../shared/services/logging.service.js';
 import { SetLevelRequestSchema } from '@modelcontextprotocol/sdk/types.js';
-import { isCompositeResult, isImageResult, isFileResult } from '../tools/tool-result.types.js';
+import { wrapToolHandler } from './tool-result-handler.js';
 export class BrowserAutomationServer extends EventEmitter {
     config;
     server;
@@ -54,101 +54,13 @@ export class BrowserAutomationServer extends EventEmitter {
      * Register a custom tool with the MCP server
      */
     registerTool(name, definition, handler) {
+        const wrapped = wrapToolHandler(name, handler, !!definition.outputSchema);
         this.server.registerTool(name, {
             title: definition.title,
             description: definition.description,
             inputSchema: definition.inputSchema,
             outputSchema: definition.outputSchema,
-        }, async (input) => {
-            const logger = getLogger();
-            const startTime = Date.now();
-            try {
-                logger.debug(`Executing tool: ${name}`);
-                const result = await handler(input);
-                const executionTime = Date.now() - startTime;
-                logger.debug(`Tool ${name} completed in ${executionTime}ms`);
-                // Composite result - return as multi-content (text + image)
-                if (isCompositeResult(result)) {
-                    if (isImageResult(result.image)) {
-                        return {
-                            content: [
-                                { type: 'text', text: result.text },
-                                {
-                                    type: 'image',
-                                    data: result.image.data,
-                                    mimeType: result.image.mimeType,
-                                },
-                            ],
-                        };
-                    }
-                    else {
-                        // FileResult fallback - return text + file path
-                        const sizeMB = (result.image.sizeBytes / 1024 / 1024).toFixed(2);
-                        return {
-                            content: [
-                                { type: 'text', text: result.text },
-                                {
-                                    type: 'text',
-                                    text: `Screenshot saved to: ${result.image.path} (${sizeMB} MB, ${result.image.mimeType})`,
-                                },
-                            ],
-                        };
-                    }
-                }
-                // Image result - return as MCP ImageContent (inline base64)
-                if (isImageResult(result)) {
-                    return {
-                        content: [
-                            {
-                                type: 'image',
-                                data: result.data,
-                                mimeType: result.mimeType,
-                            },
-                        ],
-                    };
-                }
-                // File result - return file path as text (for large screenshots)
-                if (isFileResult(result)) {
-                    const sizeMB = (result.sizeBytes / 1024 / 1024).toFixed(2);
-                    return {
-                        content: [
-                            {
-                                type: 'text',
-                                text: `Screenshot saved to: ${result.path} (${sizeMB} MB, ${result.mimeType})`,
-                            },
-                        ],
-                    };
-                }
-                // When outputSchema is defined, return structuredContent for MCP validation
-                if (definition.outputSchema) {
-                    return {
-                        content: [{ type: 'text', text: JSON.stringify(result) }],
-                        structuredContent: result,
-                    };
-                }
-                // If result is already a string (e.g., XML), use it directly
-                // Otherwise JSON.stringify it
-                const textContent = typeof result === 'string' ? result : JSON.stringify(result);
-                return {
-                    content: [{ type: 'text', text: textContent }],
-                };
-            }
-            catch (error) {
-                const executionTime = Date.now() - startTime;
-                logger.error(`Tool ${name} failed after ${executionTime}ms`, error instanceof Error ? error : undefined);
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: error instanceof Error ? error.message : String(error),
-                            }),
-                        },
-                    ],
-                    isError: true,
-                };
-            }
-        });
+        }, wrapped);
     }
     /**
      * Send logging message notification via MCP protocol

package/dist/src/server/mcp-server.js.map

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

package/dist/src/server/server-config.d.ts

@@ -1,11 +1,12 @@
 /**
  * Server Configuration
  *
- * Global server configuration combining CLI args and environment variables.
- * Provides the ensureBrowserForTools function that tool handlers call.
+ * Global server configuration from CLI args and environment variables.
+ * Contains only transport-level settings (transport mode, port).
+ *
+ * Browser configuration is per-session and managed by SessionController.
  */
 import { type ServerArgs } from '../cli/args.js';
-import { SessionManager } from '../browser/session-manager.js';
 /**
  * Initialize server configuration from CLI arguments and environment variables.
  *
@@ -17,23 +18,6 @@ export declare function initServerConfig(argv: string[]): void;
  * Throws if not initialized.
  */
 export declare function getServerConfig(): ServerArgs;
-/**
- * Get or create the SessionManager singleton.
- */
-export declare function getSessionManager(): SessionManager;
-/**
- * Check if the SessionManager has been initialized.
- * Use this before calling getSessionManager() in cleanup paths
- * to avoid creating a new instance unnecessarily.
- */
-export declare function isSessionManagerInitialized(): boolean;
-/**
- * Ensure browser is ready for tool execution.
- *
- * This is the main entry point for tools to call before executing.
- * It will lazily launch or connect to a browser based on server configuration.
- */
-export declare function ensureBrowserForTools(): Promise<void>;
 /**
  * Reset server state (for testing).
  */

package/dist/src/server/server-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-config.d.ts","sourceRoot":"","sources":["../../../src/server/server-config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAO/D;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAUrD;AAED;;;GAGG;AACH,wBAAgB,eAAe,IAAI,UAAU,CAK5C;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,cAAc,CAGlD;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,IAAI,OAAO,CAErD;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAgB3D;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAGvC"}
+{"version":3,"file":"server-config.d.ts","sourceRoot":"","sources":["../../../src/server/server-config.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAK5D;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAErD;AAED;;;GAGG;AACH,wBAAgB,eAAe,IAAI,UAAU,CAK5C;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC"}

package/dist/src/server/server-config.js

@@ -1,28 +1,21 @@
 /**
  * Server Configuration
  *
- * Global server configuration combining CLI args and environment variables.
- * Provides the ensureBrowserForTools function that tool handlers call.
+ * Global server configuration from CLI args and environment variables.
+ * Contains only transport-level settings (transport mode, port).
+ *
+ * Browser configuration is per-session and managed by SessionController.
  */
 import { parseArgs } from '../cli/args.js';
-import { SessionManager } from '../browser/session-manager.js';
-import { ensureBrowserReady } from '../browser/ensure-browser.js';
-// Singleton instances
+// Singleton config
 let serverConfig = null;
-let sessionManager = null;
 /**
  * Initialize server configuration from CLI arguments and environment variables.
  *
  * @param argv - Command line arguments (process.argv.slice(2))
  */
 export function initServerConfig(argv) {
-    const args = parseArgs(argv);
-    // Apply environment variable overrides
-    // Only enable autoConnect from env if no explicit browserUrl/wsEndpoint was provided
-    if (process.env.AUTO_CONNECT === 'true' && !args.browserUrl && !args.wsEndpoint) {
-        args.autoConnect = true;
-    }
-    serverConfig = args;
+    serverConfig = parseArgs(argv);
 }
 /**
  * Get the current server configuration.
@@ -34,47 +27,10 @@ export function getServerConfig() {
     }
     return serverConfig;
 }
-/**
- * Get or create the SessionManager singleton.
- */
-export function getSessionManager() {
-    sessionManager ??= new SessionManager();
-    return sessionManager;
-}
-/**
- * Check if the SessionManager has been initialized.
- * Use this before calling getSessionManager() in cleanup paths
- * to avoid creating a new instance unnecessarily.
- */
-export function isSessionManagerInitialized() {
-    return sessionManager !== null;
-}
-/**
- * Ensure browser is ready for tool execution.
- *
- * This is the main entry point for tools to call before executing.
- * It will lazily launch or connect to a browser based on server configuration.
- */
-export async function ensureBrowserForTools() {
-    const config = getServerConfig();
-    const session = getSessionManager();
-    const options = {
-        headless: config.headless,
-        isolated: config.isolated,
-        browserUrl: config.browserUrl,
-        wsEndpoint: config.wsEndpoint,
-        autoConnect: config.autoConnect,
-        userDataDir: config.userDataDir,
-        channel: config.channel,
-        executablePath: config.executablePath,
-    };
-    await ensureBrowserReady(session, options);
-}
 /**
  * Reset server state (for testing).
  */
 export function resetServerState() {
     serverConfig = null;
-    sessionManager = null;
 }
 //# sourceMappingURL=server-config.js.map

package/dist/src/server/server-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"server-config.js","sourceRoot":"","sources":["../../../src/server/server-config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAA6B,MAAM,8BAA8B,CAAC;AAE7F,sBAAsB;AACtB,IAAI,YAAY,GAAsB,IAAI,CAAC;AAC3C,IAAI,cAAc,GAA0B,IAAI,CAAC;AAEjD;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAc;IAC7C,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAE7B,uCAAuC;IACvC,qFAAqF;IACrF,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED,YAAY,GAAG,IAAI,CAAC;AACtB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe;IAC7B,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;IACnF,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB;IAC/B,cAAc,KAAK,IAAI,cAAc,EAAE,CAAC;IACxC,OAAO,cAAc,CAAC;AACxB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,2BAA2B;IACzC,OAAO,cAAc,KAAK,IAAI,CAAC;AACjC,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB;IACzC,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IAEpC,MAAM,OAAO,GAAyB;QACpC,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,cAAc,EAAE,MAAM,CAAC,cAAc;KACtC,CAAC;IAEF,MAAM,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC7C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB;IAC9B,YAAY,GAAG,IAAI,CAAC;IACpB,cAAc,GAAG,IAAI,CAAC;AACxB,CAAC"}
+{"version":3,"file":"server-config.js","sourceRoot":"","sources":["../../../src/server/server-config.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AAE5D,mBAAmB;AACnB,IAAI,YAAY,GAAsB,IAAI,CAAC;AAE3C;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAc;IAC7C,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe;IAC7B,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;IACnF,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB;IAC9B,YAAY,GAAG,IAAI,CAAC;AACtB,CAAC"}

package/dist/src/server/tool-registrar.types.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Tool Registrar Types
+ *
+ * Defines the minimal interface for registering MCP tools.
+ * Used by both BrowserAutomationServer (stdio) and HttpGateway (HTTP).
+ *
+ * @module server/tool-registrar.types
+ */
+import type { ZodRawShape } from 'zod';
+/**
+ * Minimal interface for registering tools on an MCP server.
+ *
+ * Implemented by:
+ * - BrowserAutomationServer (stdio transport with logging/error wrapping)
+ * - HttpToolRegistrar (HTTP transport, wraps McpServer.registerTool)
+ */
+export interface ToolRegistrar {
+    registerTool(name: string, definition: {
+        title: string;
+        description?: string;
+        inputSchema: ZodRawShape;
+        outputSchema?: ZodRawShape;
+    }, handler: (input: unknown) => Promise<unknown>): void;
+}
+//# sourceMappingURL=tool-registrar.types.d.ts.map

package/dist/src/server/tool-registrar.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-registrar.types.d.ts","sourceRoot":"","sources":["../../../src/server/tool-registrar.types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AAEvC;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,YAAY,CACV,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,WAAW,CAAC;QACzB,YAAY,CAAC,EAAE,WAAW,CAAC;KAC5B,EACD,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAC5C,IAAI,CAAC;CACT"}

package/dist/src/server/tool-registrar.types.js

@@ -0,0 +1,10 @@
+/**
+ * Tool Registrar Types
+ *
+ * Defines the minimal interface for registering MCP tools.
+ * Used by both BrowserAutomationServer (stdio) and HttpGateway (HTTP).
+ *
+ * @module server/tool-registrar.types
+ */
+export {};
+//# sourceMappingURL=tool-registrar.types.js.map

package/dist/src/server/tool-registrar.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-registrar.types.js","sourceRoot":"","sources":["../../../src/server/tool-registrar.types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG"}

package/dist/src/server/tool-result-handler.d.ts

@@ -0,0 +1,61 @@
+/**
+ * Tool Result Handler
+ *
+ * Shared result-wrapping logic for converting tool handler return values
+ * into MCP-compatible content arrays. Used by both BrowserAutomationServer
+ * (stdio) and HttpToolRegistrar (HTTP) to avoid duplication.
+ *
+ * @module server/tool-result-handler
+ */
+/** MCP text content */
+interface TextContent {
+    readonly type: 'text';
+    readonly text: string;
+}
+/** MCP image content */
+interface ImageContent {
+    readonly type: 'image';
+    readonly data: string;
+    readonly mimeType: string;
+}
+/** Union of MCP content types produced by this module */
+export type Content = TextContent | ImageContent;
+/** Formatted tool result ready for MCP response */
+export interface FormattedToolResult {
+    [key: string]: unknown;
+    content: Content[];
+    structuredContent?: Record<string, unknown>;
+    isError?: boolean;
+}
+/**
+ * Format a tool handler result into an MCP-compatible content array.
+ *
+ * Handles CompositeResult, ImageResult, FileResult, structured output,
+ * plain strings, and arbitrary objects (JSON-stringified).
+ *
+ * @param result - The raw return value from a tool handler
+ * @param hasOutputSchema - Whether the tool definition has an outputSchema
+ * @returns MCP-compatible content array with optional structuredContent
+ */
+export declare function formatToolResult(result: unknown, hasOutputSchema?: boolean): FormattedToolResult;
+/**
+ * Format an error into an MCP-compatible error response.
+ *
+ * @param error - The caught error
+ * @returns MCP-compatible error content
+ */
+export declare function formatToolError(error: unknown): FormattedToolResult;
+/**
+ * Wrap a tool handler with logging, timing, and MCP result formatting.
+ *
+ * Shared by both BrowserAutomationServer (stdio) and HttpToolRegistrar (HTTP)
+ * to avoid duplicating the try/catch/timing/logging boilerplate.
+ *
+ * @param name - Tool name used in log messages
+ * @param handler - The raw tool handler function
+ * @param hasOutputSchema - Whether the tool definition has an outputSchema
+ * @returns A wrapped handler that returns a FormattedToolResult
+ */
+export declare function wrapToolHandler<T>(name: string, handler: (input: T) => Promise<unknown>, hasOutputSchema: boolean): (input: T) => Promise<FormattedToolResult>;
+export {};
+//# sourceMappingURL=tool-result-handler.d.ts.map

package/dist/src/server/tool-result-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-result-handler.d.ts","sourceRoot":"","sources":["../../../src/server/tool-result-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAKH,uBAAuB;AACvB,UAAU,WAAW;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,wBAAwB;AACxB,UAAU,YAAY;IACpB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED,yDAAyD;AACzD,MAAM,MAAM,OAAO,GAAG,WAAW,GAAG,YAAY,CAAC;AAEjD,mDAAmD;AACnD,MAAM,WAAW,mBAAmB;IAClC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,eAAe,UAAQ,GAAG,mBAAmB,CAqE9F;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,mBAAmB,CAYnE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAC/B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,EACvC,eAAe,EAAE,OAAO,GACvB,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAmB5C"}