refactor: Mark tool errors with isError flag for consistent error detection and handling throughout the codebase

Author: Winify

src/recording/step-recorder.ts

@@ -49,9 +49,7 @@ export function withRecording(toolName: string, callback: ToolCallback): ToolCal
   return async (params, extra) => {
     const start = Date.now();
     const result = await callback(params, extra);
-    const isError = result.content.some(
-      (c: any) => c.type === 'text' && typeof (c as any).text === 'string' && (c as any).text.startsWith('Error'),
-    );
+    const isError = (result as any).isError === true;
     appendStep(
       toolName,
       params as Record<string, unknown>,

src/tools/app-actions.tool.ts

@@ -44,6 +44,7 @@ export const getAppStateTool: ToolCallback = async (args: {
     };
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error getting app state: ${e}` }],
     };
   }

src/tools/app-session.tool.ts

@@ -228,6 +228,7 @@ export const startAppTool: ToolCallback = async (args: {
     };
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error starting app session: ${e}` }],
     };
   }

src/tools/attach-browser.tool.ts

@@ -98,6 +98,7 @@ export const attachBrowserTool: ToolCallback = async ({
     };
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error attaching to browser: ${e}` }],
     };
   }

src/tools/browser.tool.ts

@@ -258,6 +258,7 @@ export const closeSessionTool: ToolCallback = async (args: { detach?: boolean }
     };
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error closing session: ${e}` }],
     };
   }

src/tools/click.tool.ts

@@ -29,6 +29,7 @@ const clickAction = async (selector: string, timeout: number, scrollToView = tru
     };
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error clicking element: ${e}` }],
     };
   }

src/tools/context.tool.ts

@@ -48,6 +48,7 @@ export const getContextsTool: ToolCallback = async (): Promise<CallToolResult> =
     };
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error getting contexts: ${e}` }],
     };
   }
@@ -65,6 +66,7 @@ export const getCurrentContextTool: ToolCallback = async (): Promise<CallToolRes
     };
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error getting current context: ${e}` }],
     };
   }
@@ -103,6 +105,7 @@ export const switchContextTool: ToolCallback = async (args: {
     };
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error switching context: ${e}` }],
     };
   }

src/tools/cookies.tool.ts

@@ -43,6 +43,7 @@ export const getCookiesTool: ToolCallback = async ({ name}: { name?: string }):
 
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error getting cookies: ${e}` }],
     };
   }
@@ -86,6 +87,7 @@ export const setCookieTool: ToolCallback = async ({
     };
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error setting cookie: ${e}` }],
     };
   }
@@ -119,6 +121,7 @@ export const deleteCookiesTool: ToolCallback = async ({ name}: { name?: string }
 
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error deleting cookies: ${e}` }],
     };
   }

src/tools/device.tool.ts

@@ -51,6 +51,7 @@ export const rotateDeviceTool: ToolCallback = async (args: {
     };
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error rotating device: ${e}` }],
     };
   }
@@ -68,6 +69,7 @@ export const hideKeyboardTool: ToolCallback = async (): Promise<CallToolResult>
     };
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error hiding keyboard: ${e}` }],
     };
   }
@@ -90,6 +92,7 @@ export const getGeolocationTool: ToolCallback = async (): Promise<CallToolResult
     };
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error getting geolocation: ${e}` }],
     };
   }
@@ -117,6 +120,7 @@ export const setGeolocationTool: ToolCallback = async (args: {
     };
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error setting geolocation: ${e}` }],
     };
   }

src/tools/emulate-device.tool.ts

@@ -41,13 +41,15 @@ export const emulateDeviceTool: ToolCallback = async ({
     // Guard: mobile sessions
     if (metadata?.type === 'ios' || metadata?.type === 'android') {
       return {
+        isError: true,
         content: [{ type: 'text', text: 'Error: emulate_device is only supported for web browser sessions, not iOS/Android.' }],
       };
     }
 
     // Guard: BiDi required
     if (!browser.isBidi) {
       return {
+        isError: true,
         content: [{
           type: 'text',
           text: 'Error: emulate_device requires a BiDi-enabled session.\nRestart the browser with: start_browser({ capabilities: { webSocketUrl: true } })',
@@ -68,7 +70,7 @@ export const emulateDeviceTool: ToolCallback = async ({
             content: [{ type: 'text', text: `Available devices (${names.length}):\n${names.join('\n')}` }],
           };
         }
-        return { content: [{ type: 'text', text: `Error listing devices: ${e}` }] };
+        return { isError: true, content: [{ type: 'text', text: `Error listing devices: ${e}` }] };
       }
       return { content: [{ type: 'text', text: 'Could not retrieve device list.' }] };
     }
@@ -101,10 +103,11 @@ export const emulateDeviceTool: ToolCallback = async ({
           }],
         };
       }
-      return { content: [{ type: 'text', text: `Error: ${e}` }] };
+      return { isError: true, content: [{ type: 'text', text: `Error: ${e}` }] };
     }
   } catch (e) {
     return {
+      isError: true,
       content: [{ type: 'text', text: `Error: ${e}` }],
     };
   }