Skip to content

Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.

chore: render cli errors (#38895)

Pavel Feldman9bab10babae3
diff --git a/packages/playwright/src/mcp/terminal/cli.ts b/packages/playwright/src/mcp/terminal/cli.ts
index a8a0343299..da6b904f6b 100644
--- a/packages/playwright/src/mcp/terminal/cli.ts
+++ b/packages/playwright/src/mcp/terminal/cli.ts
@@ -52,7 +52,7 @@ async function socketExists(socketPath: string): Promise<boolean> {
class SocketSession {
private _connection: SocketConnection;
private _nextMessageId = 1;
- private _callbacks = new Map<number, { resolve: (o: any) => void, reject: (e: Error) => void, error: Error }>();
+ private _callbacks = new Map<number, { resolve: (o: any) => void, reject: (e: Error) => void }>();
constructor(connection: SocketConnection) {
this._connection = connection;
@@ -78,13 +78,13 @@ class SocketSession {
};
await this._connection.send(message);
return new Promise<any>((resolve, reject) => {
- this._callbacks.set(messageId, { resolve, reject, error: new Error(`Error in method: ${method}`) });
+ this._callbacks.set(messageId, { resolve, reject });
});
}
dispose() {
for (const callback of this._callbacks.values())
- callback.reject(callback.error);
+ callback.reject(new Error('Disposed'));
this._callbacks.clear();
this._connection.close();
}
@@ -93,12 +93,10 @@ class SocketSession {
if (object.id && this._callbacks.has(object.id)) {
const callback = this._callbacks.get(object.id)!;
this._callbacks.delete(object.id);
- if (object.error) {
- callback.error.cause = new Error(object.error);
- callback.reject(callback.error);
- } else {
+ if (object.error)
+ callback.reject(new Error(object.error));
+ else
callback.resolve(object.result);
- }
} else if (object.id) {
throw new Error(`Unexpected message id: ${object.id}`);
} else {
@@ -209,8 +207,7 @@ function main() {
}
runCliCommand(args).catch(e => {
- console.error(e);
-
+ console.error(e.message);
process.exit(1);
});
}
diff --git a/packages/playwright/src/mcp/terminal/command.ts b/packages/playwright/src/mcp/terminal/command.ts
index 306114788a..9146504d97 100644
--- a/packages/playwright/src/mcp/terminal/command.ts
+++ b/packages/playwright/src/mcp/terminal/command.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+
import type zodType from 'zod';
export type CommandSchema<Args extends zodType.ZodTypeAny, Options extends zodType.ZodTypeAny> = {
@@ -39,8 +40,22 @@ export function parseCommand(command: AnyCommandSchema, args: Record<string, str
let i = 0;
for (const name of Object.keys(shape))
argsObject[name] = argv[++i];
- const parsedArgsObject = command.args?.parse(argsObject) ?? {};
+
+ let parsedArgsObject: Record<string, string> = {};
+ try {
+ parsedArgsObject = command.args?.parse(argsObject) ?? {};
+ } catch (e) {
+ throw new Error(formatZodError(e as zodType.ZodError));
+ }
+
const toolName = typeof command.toolName === 'function' ? command.toolName(parsedArgsObject, options) : command.toolName;
const toolParams = command.toolParams(parsedArgsObject, options);
return { toolName, toolParams };
}
+
+function formatZodError(error: zodType.ZodError): string {
+ const issue = error.issues[0];
+ if (issue.code === 'invalid_type')
+ return `${issue.message} in <${issue.path.join('.')}>`;
+ return error.issues.map(i => i.message).join('\n');
+}
diff --git a/packages/playwright/src/mcp/terminal/commands.ts b/packages/playwright/src/mcp/terminal/commands.ts
index 2b858bc2bf..41006924c1 100644
--- a/packages/playwright/src/mcp/terminal/commands.ts
+++ b/packages/playwright/src/mcp/terminal/commands.ts
@@ -258,7 +258,7 @@ const tab = declareCommand({
index: z.number().optional().describe('Tab index. If omitted, current tab is closed.'),
}),
toolName: 'browser_tabs',
- toolParams: ({ index }) => ({ action: 'close', index }),
+ toolParams: ({ action, index }) => ({ action, index }),
});
const mouseClickXy = declareCommand({