browser-debug-mcp-bridge 1.11.0 → 1.12.0

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

@@ -5,6 +5,7 @@ import { createHash, randomUUID } from 'crypto';
 import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'fs';
 import { dirname, resolve } from 'path';
 import { z } from 'zod';
+import { WorkflowTargetResolutionError, hasSemanticActionTargetMatcher, resolveWorkflowActionTarget, summarizeWorkflowTargetMatcher, } from './target-resolution.js';
 import { getConnection } from '../db/connection.js';
 import { diagnoseOverridePoc, insertOverridePlanAudit, listOverridePlanAudits, listOverridePocRequests, listOverridePocRuns, } from '../override-audit.js';
 import { createOverrideProfileConfig, OVERRIDE_PROFILE_ADAPTERS, } from '../override-profile-generator.js';
@@ -15,6 +16,7 @@ import { mapNextOverrideAssetsWithDrift } from '../next-asset-mapper.js';
 import { planNextSourceOverride } from '../next-source-override-planner.js';
 import { listObservedOverrideAssets, persistObservedOverrideAssets } from '../override-observed-assets.js';
 import { planOverrideResponsePatch } from '../override-response-planner.js';
+import { createToolLoopGuard } from './tool-loop-guard.js';
 function createDefaultMcpLogger() {
     const write = (level, message, payload) => {
         process.stderr.write(`${message} ${JSON.stringify({ level, ...payload })}\n`);
@@ -31,12 +33,93 @@ function createDefaultMcpLogger() {
         },
     };
 }
+const UIActionTargetScopeSchema = z.enum(['buttons', 'links', 'inputs', 'modals', 'focused']);
+const UIActionLocatorMatcherSchema = z.union([
+    z.string().min(1),
+    z.object({
+        pattern: z.string().min(1),
+        flags: z.string().regex(/^[imsu]*$/).optional(),
+    }),
+]);
+const UIActionLocatorStepSchema = z.object({
+    kind: z.enum(['css', 'role', 'text', 'label', 'testId', 'placeholder', 'altText']),
+    value: UIActionLocatorMatcherSchema.optional(),
+    role: z.string().min(1).optional(),
+    name: UIActionLocatorMatcherSchema.optional(),
+    exact: z.boolean().optional(),
+    relation: z.enum(['filter', 'descendant', 'ancestor']).optional(),
+}).superRefine((value, ctx) => {
+    if (value.kind === 'role' && !value.role && !value.value) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'role locator step requires role or value',
+            path: ['role'],
+        });
+    }
+    if (value.kind !== 'role' && !value.value) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: `${value.kind} locator step requires value`,
+            path: ['value'],
+        });
+    }
+});
+const UIActionLocatorSchema = z.object({
+    scope: UIActionTargetScopeSchema.optional(),
+    frame: z.object({
+        selector: z.string().min(1).optional(),
+        urlContains: z.string().min(1).optional(),
+        titleContains: z.string().min(1).optional(),
+    }).optional(),
+    steps: z.array(UIActionLocatorStepSchema).min(1).max(8),
+});
+const UIActionCoordinateTargetSchema = z.object({
+    x: z.number().finite(),
+    y: z.number().finite(),
+    frameId: z.number().int().min(0).optional(),
+});
 const LiveUIActionTargetSchema = z.object({
     selector: z.string().min(1).optional(),
     elementRef: z.string().min(1).optional(),
+    coordinates: UIActionCoordinateTargetSchema.optional(),
     tabId: z.number().int().min(0).optional(),
     frameId: z.number().int().min(0).optional(),
     url: z.string().url().optional(),
+    locator: UIActionLocatorSchema.optional(),
+    frameUrlContains: z.string().min(1).optional(),
+    frameTitleContains: z.string().min(1).optional(),
+    testId: z.string().min(1).optional(),
+    scope: UIActionTargetScopeSchema.optional(),
+    textContains: z.string().min(1).optional(),
+    labelContains: z.string().min(1).optional(),
+    titleContains: z.string().min(1).optional(),
+    role: z.string().min(1).optional(),
+    name: z.string().min(1).optional(),
+    placeholder: z.string().min(1).optional(),
+    altText: z.string().min(1).optional(),
+    tagName: z.string().min(1).optional(),
+    type: z.string().min(1).optional(),
+    exact: z.boolean().optional(),
+    nth: z.number().int().min(0).optional(),
+    first: z.boolean().optional(),
+    last: z.boolean().optional(),
+    strict: z.boolean().optional(),
+    visible: z.boolean().optional(),
+    disabled: z.boolean().optional(),
+    selected: z.boolean().optional(),
+    pressed: z.boolean().optional(),
+    expanded: z.boolean().optional(),
+    readOnly: z.boolean().optional(),
+    requiredField: z.boolean().optional(),
+}).superRefine((value, ctx) => {
+    const positionFields = [value.nth !== undefined, value.first === true, value.last === true].filter(Boolean).length;
+    if (positionFields > 1) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'target can use only one of nth, first, or last',
+            path: ['target'],
+        });
+    }
 });
 const LiveUIActionBaseSchema = z.object({
     traceId: z.string().min(1).optional(),
@@ -50,6 +133,10 @@ const LiveUIActionRequestSchema = z.discriminatedUnion('action', [
             clickCount: z.number().int().min(1).max(3).optional(),
         }).optional(),
     }),
+    LiveUIActionBaseSchema.extend({
+        action: z.literal('hover'),
+        input: z.object({}).optional(),
+    }),
     LiveUIActionBaseSchema.extend({
         action: z.literal('input'),
         input: z.object({
@@ -95,20 +182,34 @@ const LiveUIActionRequestSchema = z.discriminatedUnion('action', [
 ]);
 const UIWorkflowModeSchema = z.enum(['safe', 'fast']);
 const UIWorkflowFailureStrategySchema = z.enum(['stop', 'continue', 'retry_once']);
-const UIWorkflowActionTargetScopeSchema = z.enum(['buttons', 'inputs', 'modals', 'focused']);
+const UIWorkflowActionTargetScopeSchema = UIActionTargetScopeSchema;
 const UIWorkflowActionTargetSchema = z.object({
     selector: z.string().min(1).optional(),
     elementRef: z.string().min(1).optional(),
+    coordinates: UIActionCoordinateTargetSchema.optional(),
     tabId: z.number().int().min(0).optional(),
     frameId: z.number().int().min(0).optional(),
     url: z.string().url().optional(),
+    locator: UIActionLocatorSchema.optional(),
+    frameUrlContains: z.string().min(1).optional(),
+    frameTitleContains: z.string().min(1).optional(),
     testId: z.string().min(1).optional(),
     scope: UIWorkflowActionTargetScopeSchema.optional(),
     textContains: z.string().min(1).optional(),
     labelContains: z.string().min(1).optional(),
     titleContains: z.string().min(1).optional(),
+    role: z.string().min(1).optional(),
+    name: z.string().min(1).optional(),
+    placeholder: z.string().min(1).optional(),
+    altText: z.string().min(1).optional(),
     tagName: z.string().min(1).optional(),
     type: z.string().min(1).optional(),
+    exact: z.boolean().optional(),
+    nth: z.number().int().min(0).optional(),
+    first: z.boolean().optional(),
+    last: z.boolean().optional(),
+    strict: z.boolean().optional(),
+    visible: z.boolean().optional(),
     disabled: z.boolean().optional(),
     selected: z.boolean().optional(),
     pressed: z.boolean().optional(),
@@ -118,13 +219,28 @@ const UIWorkflowActionTargetSchema = z.object({
 }).superRefine((value, ctx) => {
     if (!value.selector
         && !value.elementRef
+        && !value.coordinates
+        && !value.locator
+        && !value.scope
         && !value.testId
         && !value.textContains
         && !value.labelContains
-        && !value.titleContains) {
+        && !value.titleContains
+        && !value.role
+        && !value.name
+        && !value.placeholder
+        && !value.altText) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'target requires selector, elementRef, coordinates, locator, scope, testId, textContains, labelContains, titleContains, role, name, placeholder, or altText',
+            path: ['target'],
+        });
+    }
+    const positionFields = [value.nth !== undefined, value.first === true, value.last === true].filter(Boolean).length;
+    if (positionFields > 1) {
         ctx.addIssue({
             code: z.ZodIssueCode.custom,
-            message: 'target requires selector, elementRef, testId, textContains, labelContains, or titleContains',
+            message: 'target can use only one of nth, first, or last',
             path: ['target'],
         });
     }
@@ -163,6 +279,10 @@ const UIWorkflowActionStepSchema = z.discriminatedUnion('action', [
             clickCount: z.number().int().min(1).max(3).optional(),
         }).optional(),
     }),
+    UIWorkflowActionBaseSchema.extend({
+        action: z.literal('hover'),
+        input: z.object({}).optional(),
+    }),
     UIWorkflowActionBaseSchema.extend({
         action: z.literal('input'),
         input: z.object({
@@ -207,14 +327,22 @@ const UIWorkflowActionStepSchema = z.discriminatedUnion('action', [
     }),
 ]);
 const UIWorkflowPageStateMatcherSchema = z.object({
-    scope: z.enum(['buttons', 'inputs', 'modals', 'focused', 'page']),
+    scope: z.enum(['buttons', 'links', 'inputs', 'modals', 'focused', 'page']),
     selector: z.string().optional(),
     testId: z.string().optional(),
     textContains: z.string().optional(),
     labelContains: z.string().optional(),
     titleContains: z.string().optional(),
+    role: z.string().optional(),
+    name: z.string().optional(),
+    placeholder: z.string().optional(),
+    altText: z.string().optional(),
+    exact: z.boolean().optional(),
+    frameUrlContains: z.string().optional(),
+    frameTitleContains: z.string().optional(),
     urlContains: z.string().optional(),
     language: z.string().optional(),
+    visible: z.boolean().optional(),
     disabled: z.boolean().optional(),
     selected: z.boolean().optional(),
     pressed: z.boolean().optional(),
@@ -247,10 +375,201 @@ const UIWorkflowAssertStepSchema = UIWorkflowStepBaseSchema.extend({
     kind: z.literal('assert'),
     matcher: UIWorkflowPageStateMatcherSchema,
 });
+const AutomationWaitBaseSchema = z.object({
+    timeoutMs: z.number().int().min(100).max(120000).optional(),
+    pollIntervalMs: z.number().int().min(50).max(5000).optional(),
+});
+const AutomationWaitUrlSchema = AutomationWaitBaseSchema.extend({
+    waitKind: z.literal('url'),
+    urlContains: z.string().min(1).optional(),
+    urlRegex: z.string().min(1).optional(),
+    exactUrl: z.string().min(1).optional(),
+}).superRefine((value, ctx) => {
+    if (!value.urlContains && !value.urlRegex && !value.exactUrl) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'url wait requires urlContains, urlRegex, or exactUrl',
+            path: ['wait'],
+        });
+    }
+});
+const AutomationWaitNavigationSchema = AutomationWaitBaseSchema.extend({
+    waitKind: z.literal('navigation'),
+    urlContains: z.string().min(1).optional(),
+    urlRegex: z.string().min(1).optional(),
+    exactUrl: z.string().min(1).optional(),
+    fromUrlContains: z.string().min(1).optional(),
+    fromUrlRegex: z.string().min(1).optional(),
+    trigger: z.string().min(1).optional(),
+    sinceTs: z.number().int().min(0).optional(),
+    tabId: z.number().int().min(0).optional(),
+}).superRefine((value, ctx) => {
+    if (!value.urlContains
+        && !value.urlRegex
+        && !value.exactUrl
+        && !value.fromUrlContains
+        && !value.fromUrlRegex
+        && !value.trigger) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'navigation wait requires a URL, from-URL, or trigger predicate',
+            path: ['wait'],
+        });
+    }
+});
+const AutomationWaitNavigationLifecycleSchema = AutomationWaitBaseSchema.extend({
+    waitKind: z.literal('navigation_lifecycle'),
+    state: z.enum(['commit', 'same_document', 'domcontentloaded', 'load', 'network_idle']).default('load'),
+    urlContains: z.string().min(1).optional(),
+    urlRegex: z.string().min(1).optional(),
+    exactUrl: z.string().min(1).optional(),
+    tabId: z.number().int().min(0).optional(),
+});
+const AutomationWaitLoadStateSchema = AutomationWaitBaseSchema.extend({
+    waitKind: z.literal('load_state'),
+    state: z.enum(['domcontentloaded', 'load']).default('load'),
+    urlContains: z.string().min(1).optional(),
+    urlRegex: z.string().min(1).optional(),
+    exactUrl: z.string().min(1).optional(),
+});
+const AutomationWaitSelectorStateSchema = AutomationWaitBaseSchema.extend({
+    waitKind: z.literal('selector_state'),
+    selector: z.string().min(1),
+    state: z.enum(['attached', 'detached', 'visible', 'hidden']).default('visible'),
+    frameId: z.number().int().min(0).default(0),
+});
+const AutomationWaitConsoleSchema = AutomationWaitBaseSchema.extend({
+    waitKind: z.literal('console'),
+    levels: z.array(z.string().min(1)).optional(),
+    contains: z.string().min(1).optional(),
+    sinceTs: z.number().int().min(0).optional(),
+    includeRuntimeErrors: z.boolean().optional(),
+});
+const AutomationWaitDialogSchema = AutomationWaitBaseSchema.extend({
+    waitKind: z.literal('dialog'),
+    type: z.enum(['alert', 'confirm', 'prompt', 'beforeunload']).optional(),
+    messageContains: z.string().min(1).optional(),
+    urlContains: z.string().min(1).optional(),
+    action: z.enum(['none', 'accept', 'dismiss']).default('none'),
+    promptText: z.string().optional(),
+    tabId: z.number().int().min(0).optional(),
+});
+const AutomationWaitStableLayoutSchema = AutomationWaitBaseSchema.extend({
+    waitKind: z.literal('stable_layout'),
+    selector: z.string().min(1).optional(),
+    stableMs: z.number().int().min(100).max(10000).default(500),
+    tabId: z.number().int().min(0).optional(),
+});
+const AutomationWaitDownloadSchema = AutomationWaitBaseSchema.extend({
+    waitKind: z.literal('download'),
+    urlContains: z.string().min(1).optional(),
+    urlRegex: z.string().min(1).optional(),
+    exactUrl: z.string().min(1).optional(),
+    filenameContains: z.string().min(1).optional(),
+    filenameRegex: z.string().min(1).optional(),
+    state: z.enum(['started', 'completed']).default('started'),
+    tabId: z.number().int().min(0).optional(),
+}).superRefine((value, ctx) => {
+    if (!value.urlContains && !value.urlRegex && !value.exactUrl && !value.filenameContains && !value.filenameRegex) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'download wait requires a URL or filename predicate',
+            path: ['wait'],
+        });
+    }
+});
+const AutomationWaitPopupSchema = AutomationWaitBaseSchema.extend({
+    waitKind: z.literal('popup'),
+    urlContains: z.string().min(1).optional(),
+    urlRegex: z.string().min(1).optional(),
+    exactUrl: z.string().min(1).optional(),
+    openerTabId: z.number().int().min(0).optional(),
+}).superRefine((value, ctx) => {
+    if (!value.urlContains && !value.urlRegex && !value.exactUrl && value.openerTabId === undefined) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'popup wait requires a URL predicate or openerTabId',
+            path: ['wait'],
+        });
+    }
+});
+const AutomationWaitNetworkQuietSchema = AutomationWaitBaseSchema.extend({
+    waitKind: z.literal('network_quiet'),
+    quietMs: z.number().int().min(100).max(10000).default(500),
+    urlContains: z.string().min(1).optional(),
+    method: z.string().min(1).optional(),
+    tabId: z.number().int().min(0).optional(),
+});
+const AutomationWaitNetworkBaseSchema = AutomationWaitBaseSchema.extend({
+    urlContains: z.string().min(1).optional(),
+    urlRegex: z.string().min(1).optional(),
+    exactUrl: z.string().min(1).optional(),
+    method: z.string().min(1).optional(),
+    traceId: z.string().min(1).optional(),
+    initiator: z.enum(['fetch', 'xhr', 'img', 'script', 'other']).optional(),
+    requestContentType: z.string().min(1).optional(),
+    sinceTs: z.number().int().min(0).optional(),
+    tabId: z.number().int().min(0).optional(),
+    includeBodies: z.boolean().optional(),
+});
+const AutomationWaitRequestSchema = AutomationWaitNetworkBaseSchema.extend({
+    waitKind: z.literal('request'),
+}).superRefine((value, ctx) => {
+    if (!value.urlContains && !value.urlRegex && !value.exactUrl && !value.traceId) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'request wait requires urlContains, urlRegex, exactUrl, or traceId',
+            path: ['wait'],
+        });
+    }
+});
+const AutomationWaitResponseSchema = AutomationWaitNetworkBaseSchema.extend({
+    waitKind: z.literal('response'),
+    statusIn: z.array(z.number().int().min(100).max(599)).optional(),
+    statusGte: z.number().int().min(100).max(599).optional(),
+    statusLt: z.number().int().min(100).max(600).optional(),
+    responseContentType: z.string().min(1).optional(),
+    errorType: z.string().min(1).optional(),
+}).superRefine((value, ctx) => {
+    if (!value.urlContains && !value.urlRegex && !value.exactUrl && !value.traceId) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'response wait requires urlContains, urlRegex, exactUrl, or traceId',
+            path: ['wait'],
+        });
+    }
+    if (value.statusGte !== undefined && value.statusLt !== undefined && value.statusGte >= value.statusLt) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'statusGte must be less than statusLt',
+            path: ['statusGte'],
+        });
+    }
+});
+const AutomationWaitSpecSchema = z.discriminatedUnion('waitKind', [
+    AutomationWaitUrlSchema,
+    AutomationWaitNavigationSchema,
+    AutomationWaitNavigationLifecycleSchema,
+    AutomationWaitLoadStateSchema,
+    AutomationWaitSelectorStateSchema,
+    AutomationWaitConsoleSchema,
+    AutomationWaitDialogSchema,
+    AutomationWaitStableLayoutSchema,
+    AutomationWaitDownloadSchema,
+    AutomationWaitPopupSchema,
+    AutomationWaitNetworkQuietSchema,
+    AutomationWaitRequestSchema,
+    AutomationWaitResponseSchema,
+]);
+const UIWorkflowGenericWaitStepSchema = UIWorkflowStepBaseSchema.extend({
+    kind: z.literal('wait'),
+    wait: AutomationWaitSpecSchema,
+});
 const UIWorkflowStepSchema = z.discriminatedUnion('kind', [
     UIWorkflowActionStepSchema,
     UIWorkflowWaitForStepSchema,
     UIWorkflowAssertStepSchema,
+    UIWorkflowGenericWaitStepSchema,
 ]);
 const RunUIStepsSchema = z.object({
     sessionId: z.string().min(1),
@@ -263,6 +582,91 @@ const RunUIStepsSchema = z.object({
 function createUIWorkflowTraceId() {
     return `uiworkflow-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
 }
+const LOCATOR_MATCHER_TOOL_SCHEMA = {
+    anyOf: [
+        { type: 'string' },
+        {
+            type: 'object',
+            required: ['pattern'],
+            properties: {
+                pattern: { type: 'string' },
+                flags: { type: 'string' },
+            },
+        },
+    ],
+};
+const ACTION_LOCATOR_TOOL_SCHEMA = {
+    type: 'object',
+    required: ['steps'],
+    properties: {
+        scope: { type: 'string', enum: ['buttons', 'links', 'inputs', 'modals', 'focused'] },
+        frame: {
+            type: 'object',
+            properties: {
+                selector: { type: 'string' },
+                urlContains: { type: 'string' },
+                titleContains: { type: 'string' },
+            },
+        },
+        steps: {
+            type: 'array',
+            minItems: 1,
+            maxItems: 8,
+            items: {
+                type: 'object',
+                required: ['kind'],
+                properties: {
+                    kind: { type: 'string', enum: ['css', 'role', 'text', 'label', 'testId', 'placeholder', 'altText'] },
+                    value: LOCATOR_MATCHER_TOOL_SCHEMA,
+                    role: { type: 'string' },
+                    name: LOCATOR_MATCHER_TOOL_SCHEMA,
+                    exact: { type: 'boolean' },
+                    relation: { type: 'string', enum: ['filter', 'descendant', 'ancestor'] },
+                },
+            },
+        },
+    },
+};
+const AUTOMATION_WAIT_TOOL_SCHEMA = {
+    type: 'object',
+    required: ['waitKind'],
+    properties: {
+        waitKind: { type: 'string', enum: ['url', 'navigation', 'navigation_lifecycle', 'load_state', 'selector_state', 'console', 'dialog', 'stable_layout', 'download', 'popup', 'network_quiet', 'request', 'response'] },
+        timeoutMs: { type: 'number' },
+        pollIntervalMs: { type: 'number' },
+        urlContains: { type: 'string' },
+        urlRegex: { type: 'string' },
+        exactUrl: { type: 'string' },
+        fromUrlContains: { type: 'string' },
+        fromUrlRegex: { type: 'string' },
+        trigger: { type: 'string' },
+        state: { type: 'string', enum: ['commit', 'same_document', 'domcontentloaded', 'load', 'network_idle', 'attached', 'detached', 'visible', 'hidden', 'started', 'completed'] },
+        selector: { type: 'string' },
+        frameId: { type: 'number' },
+        levels: { type: 'array', items: { type: 'string' } },
+        contains: { type: 'string' },
+        sinceTs: { type: 'number' },
+        includeRuntimeErrors: { type: 'boolean' },
+        action: { type: 'string', enum: ['none', 'accept', 'dismiss'] },
+        promptText: { type: 'string' },
+        stableMs: { type: 'number' },
+        filenameContains: { type: 'string' },
+        filenameRegex: { type: 'string' },
+        openerTabId: { type: 'number' },
+        quietMs: { type: 'number' },
+        method: { type: 'string' },
+        traceId: { type: 'string' },
+        initiator: { type: 'string', enum: ['fetch', 'xhr', 'img', 'script', 'other'] },
+        requestContentType: { type: 'string' },
+        responseContentType: { type: 'string' },
+        statusIn: { type: 'array', items: { type: 'number' } },
+        statusGte: { type: 'number' },
+        statusLt: { type: 'number' },
+        errorType: { type: 'string' },
+        includeBodies: { type: 'boolean' },
+        tabId: { type: 'number' },
+    },
+};
 const TOOL_SCHEMAS = {
     list_sessions: {
         type: 'object',
@@ -451,6 +855,7 @@ const TOOL_SCHEMAS = {
         properties: {
             sessionId: { type: 'string' },
             selector: { type: 'string' },
+            frameId: { type: 'number' },
             properties: { type: 'array', items: { type: 'string' } },
         },
     },
@@ -460,6 +865,7 @@ const TOOL_SCHEMAS = {
         properties: {
             sessionId: { type: 'string' },
             selector: { type: 'string' },
+            frameId: { type: 'number' },
         },
     },
     get_page_state: {
@@ -470,6 +876,7 @@ const TOOL_SCHEMAS = {
             maxItems: { type: 'number' },
             maxTextLength: { type: 'number' },
             includeButtons: { type: 'boolean' },
+            includeLinks: { type: 'boolean' },
             includeInputs: { type: 'boolean' },
             includeModals: { type: 'boolean' },
         },
@@ -481,7 +888,7 @@ const TOOL_SCHEMAS = {
             sessionId: { type: 'string' },
             kinds: {
                 type: 'array',
-                items: { type: 'string', enum: ['buttons', 'inputs', 'modals', 'focused'] },
+                items: { type: 'string', enum: ['buttons', 'links', 'inputs', 'modals', 'focused'] },
             },
             maxItems: { type: 'number' },
             maxTextLength: { type: 'number' },
@@ -501,14 +908,22 @@ const TOOL_SCHEMAS = {
         required: ['sessionId', 'scope'],
         properties: {
             sessionId: { type: 'string' },
-            scope: { type: 'string', enum: ['buttons', 'inputs', 'modals', 'focused', 'page'] },
+            scope: { type: 'string', enum: ['buttons', 'links', 'inputs', 'modals', 'focused', 'page'] },
             selector: { type: 'string' },
             testId: { type: 'string' },
             textContains: { type: 'string' },
             labelContains: { type: 'string' },
             titleContains: { type: 'string' },
+            role: { type: 'string' },
+            name: { type: 'string' },
+            placeholder: { type: 'string' },
+            altText: { type: 'string' },
+            exact: { type: 'boolean' },
+            frameUrlContains: { type: 'string' },
+            frameTitleContains: { type: 'string' },
             urlContains: { type: 'string' },
             language: { type: 'string' },
+            visible: { type: 'boolean' },
             disabled: { type: 'boolean' },
             selected: { type: 'boolean' },
             pressed: { type: 'boolean' },
@@ -528,14 +943,22 @@ const TOOL_SCHEMAS = {
         required: ['sessionId', 'scope'],
         properties: {
             sessionId: { type: 'string' },
-            scope: { type: 'string', enum: ['buttons', 'inputs', 'modals', 'focused', 'page'] },
+            scope: { type: 'string', enum: ['buttons', 'links', 'inputs', 'modals', 'focused', 'page'] },
             selector: { type: 'string' },
             testId: { type: 'string' },
             textContains: { type: 'string' },
             labelContains: { type: 'string' },
             titleContains: { type: 'string' },
+            role: { type: 'string' },
+            name: { type: 'string' },
+            placeholder: { type: 'string' },
+            altText: { type: 'string' },
+            exact: { type: 'boolean' },
+            frameUrlContains: { type: 'string' },
+            frameTitleContains: { type: 'string' },
             urlContains: { type: 'string' },
             language: { type: 'string' },
+            visible: { type: 'boolean' },
             disabled: { type: 'boolean' },
             selected: { type: 'boolean' },
             pressed: { type: 'boolean' },
@@ -552,143 +975,356 @@ const TOOL_SCHEMAS = {
             pollIntervalMs: { type: 'number' },
         },
     },
-    capture_ui_snapshot: {
+    preflight_automation_flow: {
         type: 'object',
         required: ['sessionId'],
         properties: {
             sessionId: { type: 'string' },
-            selector: { type: 'string' },
-            trigger: { type: 'string' },
-            mode: { type: 'string' },
-            styleMode: { type: 'string' },
-            maxDepth: { type: 'number' },
-            maxBytes: { type: 'number' },
-            maxAncestors: { type: 'number' },
-            includeDom: { type: 'boolean' },
-            includeStyles: { type: 'boolean' },
-            includePngDataUrl: { type: 'boolean' },
+            expectedUrlContains: { type: 'string' },
+            requireSensitiveAutomation: { type: 'boolean' },
+            plannedActions: { type: 'array', items: { type: 'string' } },
+            includePageState: { type: 'boolean' },
+            maxItems: { type: 'number' },
+            maxTextLength: { type: 'number' },
         },
     },
-    get_live_console_logs: {
+    wait_for_url: {
         type: 'object',
         required: ['sessionId'],
         properties: {
             sessionId: { type: 'string' },
-            url: { type: 'string' },
-            tabId: { type: 'number' },
-            levels: { type: 'array', items: { type: 'string' } },
-            contains: { type: 'string' },
+            urlContains: { type: 'string' },
+            urlRegex: { type: 'string' },
+            exactUrl: { type: 'string' },
+            timeoutMs: { type: 'number' },
+            pollIntervalMs: { type: 'number' },
+        },
+    },
+    wait_for_navigation: {
+        type: 'object',
+        required: ['sessionId'],
+        properties: {
+            sessionId: { type: 'string' },
+            urlContains: { type: 'string' },
+            urlRegex: { type: 'string' },
+            exactUrl: { type: 'string' },
+            fromUrlContains: { type: 'string' },
+            fromUrlRegex: { type: 'string' },
+            trigger: { type: 'string' },
             sinceTs: { type: 'number' },
-            includeRuntimeErrors: { type: 'boolean' },
-            dedupeWindowMs: { type: 'number' },
-            limit: { type: 'number' },
-            responseProfile: { type: 'string' },
-            includeArgs: { type: 'boolean' },
-            maxResponseBytes: { type: 'number' },
+            tabId: { type: 'number' },
+            timeoutMs: { type: 'number' },
+            pollIntervalMs: { type: 'number' },
         },
     },
-    list_override_profiles: {
+    wait_for_navigation_lifecycle: {
         type: 'object',
-        properties: {},
+        required: ['sessionId'],
+        properties: {
+            sessionId: { type: 'string' },
+            state: { type: 'string', enum: ['commit', 'same_document', 'domcontentloaded', 'load', 'network_idle'] },
+            urlContains: { type: 'string' },
+            urlRegex: { type: 'string' },
+            exactUrl: { type: 'string' },
+            tabId: { type: 'number' },
+            timeoutMs: { type: 'number' },
+            pollIntervalMs: { type: 'number' },
+        },
     },
-    create_override_profile: {
+    wait_for_load_state: {
         type: 'object',
-        required: ['targetBaseUrl'],
+        required: ['sessionId'],
         properties: {
-            adapter: { type: 'string' },
-            mode: { type: 'string' },
-            targetBaseUrl: { type: 'string' },
-            projectRoot: { type: 'string' },
-            assetRoot: { type: 'string' },
-            nextDir: { type: 'string' },
-            configPath: { type: 'string' },
-            profileId: { type: 'string' },
-            profileName: { type: 'string' },
-            enabled: { type: 'boolean' },
-            profileEnabled: { type: 'boolean' },
-            autoReload: { type: 'boolean' },
-            includeManifestFiles: { type: 'boolean' },
-            includeStaticFiles: { type: 'boolean' },
-            extensions: { type: 'array', items: { type: 'string' } },
-            maxRules: { type: 'number' },
-            writeConfig: { type: 'boolean' },
-            overwrite: { type: 'boolean' },
+            sessionId: { type: 'string' },
+            state: { type: 'string', enum: ['domcontentloaded', 'load'] },
+            urlContains: { type: 'string' },
+            urlRegex: { type: 'string' },
+            exactUrl: { type: 'string' },
+            timeoutMs: { type: 'number' },
+            pollIntervalMs: { type: 'number' },
         },
     },
-    validate_override_profile: {
+    wait_for_selector_state: {
         type: 'object',
+        required: ['sessionId', 'selector'],
         properties: {
-            profileId: { type: 'string' },
+            sessionId: { type: 'string' },
+            selector: { type: 'string' },
+            state: { type: 'string', enum: ['attached', 'detached', 'visible', 'hidden'] },
+            frameId: { type: 'number' },
+            timeoutMs: { type: 'number' },
+            pollIntervalMs: { type: 'number' },
         },
     },
-    preflight_overrides: {
+    wait_for_console: {
         type: 'object',
         required: ['sessionId'],
         properties: {
             sessionId: { type: 'string' },
-            profileId: { type: 'string' },
+            levels: { type: 'array', items: { type: 'string' } },
+            contains: { type: 'string' },
+            sinceTs: { type: 'number' },
+            includeRuntimeErrors: { type: 'boolean' },
+            timeoutMs: { type: 'number' },
+            pollIntervalMs: { type: 'number' },
         },
     },
-    observe_override_assets: {
+    wait_for_dialog: {
         type: 'object',
         required: ['sessionId'],
         properties: {
             sessionId: { type: 'string' },
+            type: { type: 'string', enum: ['alert', 'confirm', 'prompt', 'beforeunload'] },
+            messageContains: { type: 'string' },
+            urlContains: { type: 'string' },
+            action: { type: 'string', enum: ['none', 'accept', 'dismiss'] },
+            promptText: { type: 'string' },
             tabId: { type: 'number' },
-            includePerformance: { type: 'boolean' },
+            timeoutMs: { type: 'number' },
+            pollIntervalMs: { type: 'number' },
         },
     },
-    capture_override_response_body: {
+    wait_for_stable_layout: {
         type: 'object',
         required: ['sessionId'],
         properties: {
             sessionId: { type: 'string' },
+            selector: { type: 'string' },
+            stableMs: { type: 'number' },
             tabId: { type: 'number' },
-            targetUrl: { type: 'string' },
-            targetAssetUrl: { type: 'string' },
-            captureMode: { type: 'string', enum: ['extension-fetch', 'cdp-response'] },
-            triggerReload: { type: 'boolean' },
-            matchMode: { type: 'string', enum: ['exact', 'prefix'] },
-            requestMethod: { type: 'string' },
-            requestHeaders: { type: 'object' },
             timeoutMs: { type: 'number' },
-            maxBodyBytes: { type: 'number' },
-            includeBody: { type: 'boolean' },
+            pollIntervalMs: { type: 'number' },
         },
     },
-    list_observed_override_assets: {
+    wait_for_download: {
         type: 'object',
         required: ['sessionId'],
         properties: {
             sessionId: { type: 'string' },
-            limit: { type: 'number' },
-            sinceTimestamp: { type: 'number' },
+            urlContains: { type: 'string' },
+            urlRegex: { type: 'string' },
+            exactUrl: { type: 'string' },
+            filenameContains: { type: 'string' },
+            filenameRegex: { type: 'string' },
+            state: { type: 'string', enum: ['started', 'completed'] },
+            tabId: { type: 'number' },
+            timeoutMs: { type: 'number' },
+            pollIntervalMs: { type: 'number' },
         },
     },
-    map_next_override_assets: {
+    wait_for_popup: {
         type: 'object',
-        required: ['projectRoot'],
+        required: ['sessionId'],
         properties: {
             sessionId: { type: 'string' },
-            tabId: { type: 'number' },
-            projectRoot: { type: 'string' },
-            nextDir: { type: 'string' },
-            route: { type: 'string' },
-            sourcePaths: { type: 'array', items: { type: 'string' } },
-            observedAssets: { type: 'array', items: { type: 'object' } },
-            maxResults: { type: 'number' },
-            fetchProductionAssets: { type: 'boolean' },
-            productionFetchTimeoutMs: { type: 'number' },
-            maxProductionAssetBytes: { type: 'number' },
-            maxDriftCandidates: { type: 'number' },
-            productionFetchConcurrency: { type: 'number' },
+            urlContains: { type: 'string' },
+            urlRegex: { type: 'string' },
+            exactUrl: { type: 'string' },
+            openerTabId: { type: 'number' },
+            timeoutMs: { type: 'number' },
+            pollIntervalMs: { type: 'number' },
         },
     },
-    plan_override_response_patch: {
+    wait_for_request: {
         type: 'object',
+        required: ['sessionId'],
         properties: {
             sessionId: { type: 'string' },
-            tabId: { type: 'number' },
+            urlContains: { type: 'string' },
+            urlRegex: { type: 'string' },
+            exactUrl: { type: 'string' },
+            method: { type: 'string' },
+            traceId: { type: 'string' },
+            initiator: { type: 'string', enum: ['fetch', 'xhr', 'img', 'script', 'other'] },
+            requestContentType: { type: 'string' },
+            sinceTs: { type: 'number' },
+            tabId: { type: 'number' },
+            includeBodies: { type: 'boolean' },
+            timeoutMs: { type: 'number' },
+            pollIntervalMs: { type: 'number' },
+        },
+    },
+    wait_for_response: {
+        type: 'object',
+        required: ['sessionId'],
+        properties: {
+            sessionId: { type: 'string' },
+            urlContains: { type: 'string' },
+            urlRegex: { type: 'string' },
+            exactUrl: { type: 'string' },
+            method: { type: 'string' },
+            traceId: { type: 'string' },
+            initiator: { type: 'string', enum: ['fetch', 'xhr', 'img', 'script', 'other'] },
+            requestContentType: { type: 'string' },
+            responseContentType: { type: 'string' },
+            statusIn: { type: 'array', items: { type: 'number' } },
+            statusGte: { type: 'number' },
+            statusLt: { type: 'number' },
+            errorType: { type: 'string' },
+            sinceTs: { type: 'number' },
+            tabId: { type: 'number' },
+            includeBodies: { type: 'boolean' },
+            timeoutMs: { type: 'number' },
+            pollIntervalMs: { type: 'number' },
+        },
+    },
+    wait_for_network_quiet: {
+        type: 'object',
+        required: ['sessionId'],
+        properties: {
+            sessionId: { type: 'string' },
+            quietMs: { type: 'number' },
+            urlContains: { type: 'string' },
+            method: { type: 'string' },
+            tabId: { type: 'number' },
+            timeoutMs: { type: 'number' },
+            pollIntervalMs: { type: 'number' },
+        },
+    },
+    capture_ui_snapshot: {
+        type: 'object',
+        required: ['sessionId'],
+        properties: {
+            sessionId: { type: 'string' },
+            selector: { type: 'string' },
+            trigger: { type: 'string' },
+            mode: { type: 'string' },
+            styleMode: { type: 'string' },
+            maxDepth: { type: 'number' },
+            maxBytes: { type: 'number' },
+            maxAncestors: { type: 'number' },
+            includeDom: { type: 'boolean' },
+            includeStyles: { type: 'boolean' },
+            includePngDataUrl: { type: 'boolean' },
+        },
+    },
+    get_live_console_logs: {
+        type: 'object',
+        required: ['sessionId'],
+        properties: {
+            sessionId: { type: 'string' },
+            url: { type: 'string' },
+            tabId: { type: 'number' },
+            levels: { type: 'array', items: { type: 'string' } },
+            contains: { type: 'string' },
+            sinceTs: { type: 'number' },
+            includeRuntimeErrors: { type: 'boolean' },
+            dedupeWindowMs: { type: 'number' },
+            limit: { type: 'number' },
+            responseProfile: { type: 'string' },
+            includeArgs: { type: 'boolean' },
+            maxResponseBytes: { type: 'number' },
+        },
+    },
+    list_override_profiles: {
+        type: 'object',
+        properties: {
+            responseProfile: { type: 'string', enum: ['compact', 'full'] },
+        },
+    },
+    create_override_profile: {
+        type: 'object',
+        required: ['targetBaseUrl'],
+        properties: {
+            adapter: { type: 'string' },
+            mode: { type: 'string' },
+            targetBaseUrl: { type: 'string' },
+            projectRoot: { type: 'string' },
+            assetRoot: { type: 'string' },
+            nextDir: { type: 'string' },
+            configPath: { type: 'string' },
+            profileId: { type: 'string' },
+            profileName: { type: 'string' },
+            enabled: { type: 'boolean' },
+            profileEnabled: { type: 'boolean' },
+            autoReload: { type: 'boolean' },
+            includeManifestFiles: { type: 'boolean' },
+            includeStaticFiles: { type: 'boolean' },
+            extensions: { type: 'array', items: { type: 'string' } },
+            maxRules: { type: 'number' },
+            writeConfig: { type: 'boolean' },
+            overwrite: { type: 'boolean' },
+            responseProfile: { type: 'string', enum: ['compact', 'full'] },
+            includeConfigJson: { type: 'boolean' },
+        },
+    },
+    validate_override_profile: {
+        type: 'object',
+        properties: {
+            profileId: { type: 'string' },
+            responseProfile: { type: 'string', enum: ['compact', 'full'] },
+        },
+    },
+    preflight_overrides: {
+        type: 'object',
+        required: ['sessionId'],
+        properties: {
+            sessionId: { type: 'string' },
+            profileId: { type: 'string' },
+        },
+    },
+    observe_override_assets: {
+        type: 'object',
+        required: ['sessionId'],
+        properties: {
+            sessionId: { type: 'string' },
+            tabId: { type: 'number' },
+            includePerformance: { type: 'boolean' },
+        },
+    },
+    capture_override_response_body: {
+        type: 'object',
+        required: ['sessionId'],
+        properties: {
+            sessionId: { type: 'string' },
+            tabId: { type: 'number' },
+            targetUrl: { type: 'string' },
+            targetAssetUrl: { type: 'string' },
+            captureMode: { type: 'string', enum: ['extension-fetch', 'cdp-response'] },
+            triggerReload: { type: 'boolean' },
+            matchMode: { type: 'string', enum: ['exact', 'prefix'] },
+            ruleType: { type: 'string' },
+            requestMethod: { type: 'string' },
+            requestHeaders: { type: 'object' },
+            timeoutMs: { type: 'number' },
+            maxBodyBytes: { type: 'number' },
+            includeBody: { type: 'boolean' },
+        },
+    },
+    list_observed_override_assets: {
+        type: 'object',
+        required: ['sessionId'],
+        properties: {
+            sessionId: { type: 'string' },
+            limit: { type: 'number' },
+            sinceTimestamp: { type: 'number' },
+            responseProfile: { type: 'string', enum: ['compact', 'full'] },
+        },
+    },
+    map_next_override_assets: {
+        type: 'object',
+        required: ['projectRoot'],
+        properties: {
+            sessionId: { type: 'string' },
+            tabId: { type: 'number' },
+            projectRoot: { type: 'string' },
+            nextDir: { type: 'string' },
+            route: { type: 'string' },
+            sourcePaths: { type: 'array', items: { type: 'string' } },
+            observedAssets: { type: 'array', items: { type: 'object' } },
+            maxResults: { type: 'number' },
+            fetchProductionAssets: { type: 'boolean' },
+            productionFetchTimeoutMs: { type: 'number' },
+            maxProductionAssetBytes: { type: 'number' },
+            maxDriftCandidates: { type: 'number' },
+            productionFetchConcurrency: { type: 'number' },
+        },
+    },
+    plan_override_response_patch: {
+        type: 'object',
+        properties: {
+            sessionId: { type: 'string' },
+            tabId: { type: 'number' },
             targetUrl: { type: 'string' },
             targetAssetUrl: { type: 'string' },
             captureMode: { type: 'string', enum: ['extension-fetch', 'cdp-response'] },
@@ -861,7 +1497,7 @@ const TOOL_SCHEMAS = {
         properties: {
             sessionId: { type: 'string' },
             status: { type: 'string', enum: ['requested', 'started', 'succeeded', 'failed', 'rejected', 'stopped'] },
-            action: { type: 'string', enum: ['click', 'input', 'focus', 'blur', 'scroll', 'press_key', 'submit', 'reload'] },
+            action: { type: 'string', enum: ['click', 'hover', 'input', 'focus', 'blur', 'scroll', 'press_key', 'submit', 'reload'] },
             traceId: { type: 'string' },
             limit: { type: 'number' },
             offset: { type: 'number' },
@@ -884,16 +1520,53 @@ const TOOL_SCHEMAS = {
         required: ['sessionId', 'action'],
         properties: {
             sessionId: { type: 'string' },
-            action: { type: 'string', enum: ['click', 'input', 'focus', 'blur', 'scroll', 'press_key', 'submit', 'reload'] },
+            action: { type: 'string', enum: ['click', 'hover', 'input', 'focus', 'blur', 'scroll', 'press_key', 'submit', 'reload'] },
             traceId: { type: 'string' },
             target: {
                 type: 'object',
                 properties: {
                     selector: { type: 'string' },
                     elementRef: { type: 'string' },
+                    coordinates: {
+                        type: 'object',
+                        properties: {
+                            x: { type: 'number' },
+                            y: { type: 'number' },
+                            frameId: { type: 'number' },
+                        },
+                    },
                     tabId: { type: 'number' },
                     frameId: { type: 'number' },
                     url: { type: 'string' },
+                    locator: ACTION_LOCATOR_TOOL_SCHEMA,
+                    frameUrlContains: { type: 'string' },
+                    frameTitleContains: { type: 'string' },
+                    testId: { type: 'string' },
+                    scope: { type: 'string', enum: ['buttons', 'links', 'inputs', 'modals', 'focused'] },
+                    textContains: { type: 'string' },
+                    labelContains: { type: 'string' },
+                    titleContains: { type: 'string' },
+                    role: { type: 'string' },
+                    name: { type: 'string' },
+                    placeholder: { type: 'string' },
+                    altText: { type: 'string' },
+                    exact: { type: 'boolean' },
+                    nth: { type: 'number' },
+                    first: { type: 'boolean' },
+                    last: { type: 'boolean' },
+                    strict: { type: 'boolean' },
+                    tagName: { type: 'string' },
+                    type: { type: 'string' },
+                    visible: { type: 'boolean' },
+                    enabled: { type: 'boolean' },
+                    disabled: { type: 'boolean' },
+                    editable: { type: 'boolean' },
+                    checked: { type: 'boolean' },
+                    selected: { type: 'boolean' },
+                    pressed: { type: 'boolean' },
+                    expanded: { type: 'boolean' },
+                    readOnly: { type: 'boolean' },
+                    requiredField: { type: 'boolean' },
                 },
             },
             input: { type: 'object' },
@@ -916,14 +1589,22 @@ const TOOL_SCHEMAS = {
                 type: 'object',
                 required: ['scope'],
                 properties: {
-                    scope: { type: 'string', enum: ['buttons', 'inputs', 'modals', 'focused', 'page'] },
+                    scope: { type: 'string', enum: ['buttons', 'links', 'inputs', 'modals', 'focused', 'page'] },
                     selector: { type: 'string' },
                     testId: { type: 'string' },
                     textContains: { type: 'string' },
                     labelContains: { type: 'string' },
                     titleContains: { type: 'string' },
+                    role: { type: 'string' },
+                    name: { type: 'string' },
+                    placeholder: { type: 'string' },
+                    altText: { type: 'string' },
+                    exact: { type: 'boolean' },
+                    frameUrlContains: { type: 'string' },
+                    frameTitleContains: { type: 'string' },
                     urlContains: { type: 'string' },
                     language: { type: 'string' },
+                    visible: { type: 'boolean' },
                     disabled: { type: 'boolean' },
                     selected: { type: 'boolean' },
                     pressed: { type: 'boolean' },
@@ -960,7 +1641,7 @@ const TOOL_SCHEMAS = {
                     properties: {
                         id: { type: 'string' },
                         note: { type: 'string' },
-                        kind: { type: 'string', enum: ['action', 'waitFor', 'assert'] },
+                        kind: { type: 'string', enum: ['action', 'waitFor', 'assert', 'wait'] },
                         action: { type: 'string' },
                         traceId: { type: 'string' },
                         target: {
@@ -968,16 +1649,37 @@ const TOOL_SCHEMAS = {
                             properties: {
                                 selector: { type: 'string' },
                                 elementRef: { type: 'string' },
+                                coordinates: {
+                                    type: 'object',
+                                    properties: {
+                                        x: { type: 'number' },
+                                        y: { type: 'number' },
+                                        frameId: { type: 'number' },
+                                    },
+                                },
                                 tabId: { type: 'number' },
                                 frameId: { type: 'number' },
                                 url: { type: 'string' },
+                                locator: ACTION_LOCATOR_TOOL_SCHEMA,
+                                frameUrlContains: { type: 'string' },
+                                frameTitleContains: { type: 'string' },
                                 testId: { type: 'string' },
-                                scope: { type: 'string', enum: ['buttons', 'inputs', 'modals', 'focused'] },
+                                scope: { type: 'string', enum: ['buttons', 'links', 'inputs', 'modals', 'focused'] },
                                 textContains: { type: 'string' },
                                 labelContains: { type: 'string' },
                                 titleContains: { type: 'string' },
+                                role: { type: 'string' },
+                                name: { type: 'string' },
+                                placeholder: { type: 'string' },
+                                altText: { type: 'string' },
+                                exact: { type: 'boolean' },
+                                nth: { type: 'number' },
+                                first: { type: 'boolean' },
+                                last: { type: 'boolean' },
+                                strict: { type: 'boolean' },
                                 tagName: { type: 'string' },
                                 type: { type: 'string' },
+                                visible: { type: 'boolean' },
                                 disabled: { type: 'boolean' },
                                 selected: { type: 'boolean' },
                                 pressed: { type: 'boolean' },
@@ -1011,14 +1713,22 @@ const TOOL_SCHEMAS = {
                         matcher: {
                             type: 'object',
                             properties: {
-                                scope: { type: 'string', enum: ['buttons', 'inputs', 'modals', 'focused', 'page'] },
+                                scope: { type: 'string', enum: ['buttons', 'links', 'inputs', 'modals', 'focused', 'page'] },
                                 selector: { type: 'string' },
                                 testId: { type: 'string' },
                                 textContains: { type: 'string' },
                                 labelContains: { type: 'string' },
                                 titleContains: { type: 'string' },
+                                role: { type: 'string' },
+                                name: { type: 'string' },
+                                placeholder: { type: 'string' },
+                                altText: { type: 'string' },
+                                exact: { type: 'boolean' },
+                                frameUrlContains: { type: 'string' },
+                                frameTitleContains: { type: 'string' },
                                 urlContains: { type: 'string' },
                                 language: { type: 'string' },
+                                visible: { type: 'boolean' },
                                 disabled: { type: 'boolean' },
                                 selected: { type: 'boolean' },
                                 pressed: { type: 'boolean' },
@@ -1035,6 +1745,7 @@ const TOOL_SCHEMAS = {
                                 pollIntervalMs: { type: 'number' },
                             },
                         },
+                        wait: AUTOMATION_WAIT_TOOL_SCHEMA,
                     },
                 },
             },
@@ -1061,11 +1772,25 @@ const TOOL_DESCRIPTIONS = {
     get_computed_styles: 'Read computed CSS styles for an element',
     get_layout_metrics: 'Read viewport and element layout metrics',
     get_page_state: 'Read a compact structured page model for forms, buttons, modals, and viewport state',
-    get_interactive_elements: 'Read compact live element references for buttons, inputs, modals, and focused elements',
+    get_interactive_elements: 'Read compact live element references for buttons, links, inputs, modals, and focused elements',
     get_live_session_health: 'Read live transport health and session binding details for one session',
     set_viewport: 'Resize the live browser window for a session and return the resulting viewport metrics',
     assert_page_state: 'Assert compact page-state conditions without pulling raw DOM payloads',
     wait_for_page_state: 'Poll compact page state until a structured assertion becomes true',
+    preflight_automation_flow: 'Check live-session readiness and production risks before running an automation flow',
+    wait_for_url: 'Poll the live page URL until it matches an exact, contains, or regex condition',
+    wait_for_navigation: 'Poll persisted navigation events until a matching URL or trigger is observed',
+    wait_for_navigation_lifecycle: 'Wait for a live navigation lifecycle milestone such as commit, load, or network idle',
+    wait_for_load_state: 'Poll the live page document readiness until domcontentloaded or load is reached',
+    wait_for_selector_state: 'Poll a selector until it is attached, detached, visible, or hidden',
+    wait_for_console: 'Poll live console logs until a matching message appears',
+    wait_for_dialog: 'Wait for a native JavaScript dialog and optionally accept or dismiss it',
+    wait_for_stable_layout: 'Wait until the page or selector layout stays unchanged for a stable window',
+    wait_for_download: 'Wait for a download started by the bound tab and optionally until completion',
+    wait_for_popup: 'Wait for a popup tab or window opened from the bound session tab',
+    wait_for_network_quiet: 'Wait until persisted network activity is quiet for a bounded window',
+    wait_for_request: 'Poll persisted network activity until a matching request is observed',
+    wait_for_response: 'Poll persisted network activity until a matching response is observed',
     capture_ui_snapshot: 'Capture redacted UI snapshot (DOM/styles/optional PNG) and persist it',
     get_live_console_logs: 'Read in-memory live console logs for a connected session',
     list_override_profiles: 'List configured browser override profiles',
@@ -1112,7 +1837,10 @@ const MAX_BODY_CHUNK_BYTES = 256 * 1024;
 const DEFAULT_NETWORK_POLL_TIMEOUT_MS = 15_000;
 const MAX_NETWORK_POLL_TIMEOUT_MS = 120_000;
 const DEFAULT_NETWORK_POLL_INTERVAL_MS = 250;
+const DEFAULT_AUTOMATION_WAIT_LOOKBACK_MS = 5_000;
 const LIVE_SESSION_DISCONNECTED_CODE = 'LIVE_SESSION_DISCONNECTED';
+const OVERRIDE_LIVE_COMMAND_TIMEOUT_CODE = 'OVERRIDE_LIVE_COMMAND_TIMEOUT';
+const OVERRIDE_LIVE_COMMAND_FAILED_CODE = 'OVERRIDE_LIVE_COMMAND_FAILED';
 const STALE_LIVE_CONNECTION_GRACE_WINDOW_MS = 30 * 60 * 1000;
 const NOISE_SESSION_HOST_PATTERNS = [
     /(^|\.)adtrafficquality\.google$/i,
@@ -1392,7 +2120,7 @@ function buildOverrideProfileRecords() {
         active: profile.profileId === summary.activeProfileId,
         configEnabled: summary.configEnabled,
         enabled: profile.enabled,
-        effectiveEnabled: summary.configEnabled && profile.enabled && profile.enabledRuleCount > 0,
+        effectiveEnabled: profile.enabled && profile.enabledRuleCount > 0,
         autoReload: profile.autoReload,
         configPath: summary.configPath,
         fileExists: profile.fileExists,
@@ -1411,6 +2139,72 @@ function resolveOverrideProfileRecord(value) {
     }
     return profile;
 }
+function resolveOverrideResponseProfile(value) {
+    return value === 'full' ? 'full' : 'compact';
+}
+function compactOverrideRule(rule) {
+    if (!isRecord(rule)) {
+        return {};
+    }
+    return {
+        ruleId: rule.ruleId,
+        enabled: rule.enabled,
+        ruleType: rule.ruleType,
+        requestMethod: rule.requestMethod,
+        matchMode: rule.matchMode,
+        targetAssetUrl: rule.targetAssetUrl,
+        localFilePath: rule.localFilePath,
+        contentType: rule.contentType,
+        fileExists: rule.fileExists,
+        integrity: rule.integrity,
+    };
+}
+function compactOverrideProfile(profile, ruleLimit = 10) {
+    const rules = Array.isArray(profile.rules) ? profile.rules : [];
+    return {
+        profileId: profile.profileId,
+        name: profile.name,
+        active: profile.active,
+        configEnabled: profile.configEnabled,
+        enabled: profile.enabled,
+        effectiveEnabled: profile.effectiveEnabled,
+        autoReload: profile.autoReload,
+        configPath: profile.configPath,
+        fileExists: profile.fileExists,
+        ruleCount: profile.ruleCount,
+        enabledRuleCount: profile.enabledRuleCount,
+        rules: rules.slice(0, ruleLimit).map(compactOverrideRule),
+        rulesOmitted: Math.max(0, rules.length - ruleLimit),
+    };
+}
+function serializeOverrideProfile(profile, responseProfile) {
+    return responseProfile === 'full' ? profile : compactOverrideProfile(profile);
+}
+function compactObservedOverrideAsset(asset) {
+    if (!isRecord(asset)) {
+        return {};
+    }
+    return {
+        observedAssetId: asset.observedAssetId,
+        lastSeenAt: asset.lastSeenAt,
+        tabId: asset.tabId,
+        url: asset.url,
+        ruleType: asset.ruleType,
+        requestMethod: asset.requestMethod,
+        resourceType: asset.resourceType,
+        contentType: asset.contentType,
+        statusCode: asset.statusCode,
+        pathname: asset.pathname,
+        assetPath: asset.assetPath,
+        kind: asset.kind,
+        integrity: asset.integrity,
+        fromDom: asset.fromDom,
+        fromPerformance: asset.fromPerformance,
+        fromNavigation: asset.fromNavigation,
+        fromFetch: asset.fromFetch,
+        serviceWorkerControlled: asset.serviceWorkerControlled,
+    };
+}
 const SHA256_HEX_PATTERN = /^[a-f0-9]{64}$/;
 function sha256Text(value) {
     return createHash('sha256').update(value, 'utf8').digest('hex');
@@ -1422,6 +2216,29 @@ function isRecordWithRscFlightMetadata(value) {
         && value.source !== undefined
         && value.patchKind !== undefined;
 }
+function normalizeRuleStringHeaders(value) {
+    if (!isRecord(value)) {
+        return undefined;
+    }
+    const headers = {};
+    for (const [name, rawValue] of Object.entries(value)) {
+        if (typeof rawValue !== 'string') {
+            continue;
+        }
+        const normalizedName = name.trim().toLowerCase();
+        const normalizedValue = rawValue.trim();
+        if (normalizedName.length > 0 && normalizedValue.length > 0) {
+            headers[normalizedName] = normalizedValue;
+        }
+    }
+    return Object.keys(headers).length > 0 ? headers : undefined;
+}
+function getRscFlightRuleRequestHeaders(rule) {
+    return isRecord(rule.rscFlight) ? normalizeRuleStringHeaders(rule.rscFlight.requestHeaders) : undefined;
+}
+function getOverrideRuleRequestHeaders(rule) {
+    return normalizeRuleStringHeaders(rule.requestHeaders) ?? getRscFlightRuleRequestHeaders(rule);
+}
 function buildRscFlightRuleIssues(rule) {
     const ruleId = String(rule.ruleId ?? 'unknown');
     const issues = [];
@@ -1465,17 +2282,20 @@ function buildRscFlightRuleIssues(rule) {
             }
         }
     }
-    if (rule.requestMethod !== 'GET') {
+    const requestMethod = normalizeOverrideRequestMethod(rule.requestMethod);
+    const requestHeaders = getRscFlightRuleRequestHeaders(rule);
+    const isCapturedPostRscFlight = requestMethod === 'POST' && requestHeaders?.rsc === '1';
+    if (requestMethod !== 'GET' && !isCapturedPostRscFlight) {
         issues.push({
             code: 'RSC_FLIGHT_METHOD_UNSUPPORTED',
             severity: 'error',
-            message: `Rule ${ruleId} RSC flight overrides only support GET requests.`,
+            message: `Rule ${ruleId} RSC flight overrides only support GET requests or captured POST RSC response-stage patches.`,
         });
     }
     const targetAssetUrl = typeof rule.targetAssetUrl === 'string' ? rule.targetAssetUrl : '';
     try {
         const parsed = new URL(targetAssetUrl);
-        if (!parsed.searchParams.has('_rsc')) {
+        if (requestMethod === 'GET' && !parsed.searchParams.has('_rsc')) {
             issues.push({
                 code: 'RSC_FLIGHT_TARGET_INVALID',
                 severity: 'error',
@@ -1553,13 +2373,6 @@ function buildOverrideProfileIssues(profile) {
     const rules = Array.isArray(profile.rules)
         ? profile.rules.filter((rule) => isRecord(rule))
         : [];
-    if (profile.configEnabled !== true) {
-        issues.push({
-            code: 'CONFIG_DISABLED',
-            severity: 'warning',
-            message: 'The override config is disabled and cannot replace requests until enabled.',
-        });
-    }
     if (profile.enabled !== true) {
         issues.push({
             code: 'PROFILE_DISABLED',
@@ -1595,7 +2408,7 @@ function buildOverrideProfileIssues(profile) {
         issues.push(...classifyOverrideResponseRequestCapability({
             ruleId: rule.ruleId,
             requestMethod: rule.requestMethod,
-            requestHeaders: rule.requestHeaders,
+            requestHeaders: getOverrideRuleRequestHeaders(rule),
             ruleType: rule.ruleType,
         }).issues.map((issue) => ({ ...issue })));
         if (rule.ruleType === 'rsc-flight') {
@@ -1648,12 +2461,6 @@ function buildOverrideProfileNextActions(profile, issues) {
                 message: 'Regenerate the RSC rule with plan_override_response_patch from a captured text/x-component response body.',
             }];
     }
-    if (profile.configEnabled !== true) {
-        return [{
-                code: 'ENABLE_CONFIG',
-                message: 'Set the root override config enabled=true after reviewing the profile.',
-            }];
-    }
     if (profile.enabled !== true) {
         return [{
                 code: 'ENABLE_PROFILE',
@@ -1676,8 +2483,14 @@ function hasEnabledExperimentalRscFlightRule(profile) {
     });
 }
 function canBypassPreflightForExperimentalRsc(profile, blockingCodes) {
+    const allowedExperimentalBlockers = new Set([
+        'UNSUPPORTED_RSC_FLIGHT_RULE',
+        'NO_OBSERVED_ASSETS',
+        'TARGET_ASSET_NOT_OBSERVED',
+    ]);
     return blockingCodes.length > 0
-        && blockingCodes.every((code) => code === 'UNSUPPORTED_RSC_FLIGHT_RULE')
+        && blockingCodes.includes('UNSUPPORTED_RSC_FLIGHT_RULE')
+        && blockingCodes.every((code) => allowedExperimentalBlockers.has(code))
         && hasEnabledExperimentalRscFlightRule(profile);
 }
 const OVERRIDE_VARIANT_HEADER_ALLOWLIST = new Set([
@@ -1797,6 +2610,36 @@ function pushOverridePreflightIssue(issues, issue) {
     }
     issues.push(issue);
 }
+function getPreflightIssues(preflight) {
+    return Array.isArray(preflight?.issues)
+        ? preflight.issues.filter((issue) => isRecord(issue))
+        : [];
+}
+function getBlockingPreflightCodes(preflight) {
+    return getPreflightIssues(preflight)
+        .filter((issue) => issue.severity === 'error')
+        .map((issue) => String(issue.code ?? 'UNKNOWN'));
+}
+function hasPreflightIssue(preflight, codes) {
+    const expected = new Set(codes);
+    return getPreflightIssues(preflight).some((issue) => expected.has(String(issue.code ?? '')));
+}
+function shouldRefreshObservedAssetsForEnable(preflight) {
+    const assetReadinessCodes = new Set([
+        'NO_OBSERVED_ASSETS',
+        'TARGET_ASSET_NOT_OBSERVED',
+        'SESSION_SCOPE_DRIFT',
+    ]);
+    const blockingCodes = getBlockingPreflightCodes(preflight);
+    if (blockingCodes.length === 0 || !blockingCodes.every((code) => assetReadinessCodes.has(code))) {
+        return false;
+    }
+    return hasPreflightIssue(preflight, [
+        'NO_OBSERVED_ASSETS',
+        'TARGET_ASSET_NOT_OBSERVED',
+        'SESSION_SCOPE_DRIFT',
+    ]);
+}
 function buildOverridePreflight(options) {
     const session = options.db
         .prepare(`
@@ -1835,7 +2678,20 @@ function buildOverridePreflight(options) {
             .filter((context) => context !== null)
             .map((context) => [String(context.variantKey ?? JSON.stringify(context)), context])).values()];
     const sessionState = options.getSessionConnectionState?.(options.sessionId);
+    const hasLiveConnectionLookup = typeof options.getSessionConnectionState === 'function';
     const diagnosis = session ? diagnoseOverridePoc(options.db, options.sessionId, latestRun?.runId) : null;
+    const observedAssetTabs = [...new Set(observedAssets
+            .map((asset) => asset.tabId)
+            .filter((tabId) => typeof tabId === 'number' && Number.isFinite(tabId)))].sort((a, b) => a - b);
+    const observedAssetPageUrls = [...new Set(observedAssets
+            .map((asset) => asset.pageUrl)
+            .filter((pageUrl) => typeof pageUrl === 'string' && pageUrl.trim().length > 0))].slice(0, 5);
+    const sessionTabId = typeof session?.tab_id === 'number' ? session.tab_id : undefined;
+    const observedAssetsWithKnownTabs = observedAssets.filter((asset) => typeof asset.tabId === 'number');
+    const topLevelScopeLikely = sessionTabId === undefined
+        || observedAssets.length === 0
+        || observedAssetsWithKnownTabs.length === 0
+        || observedAssetsWithKnownTabs.some((asset) => asset.tabId === sessionTabId);
     for (const issue of buildOverrideProfileIssues(profile)) {
         pushOverridePreflightIssue(issues, { ...issue, source: 'profile' });
     }
@@ -1865,55 +2721,117 @@ function buildOverridePreflight(options) {
                 message: `Session ${options.sessionId} has ended and cannot enable overrides.`,
             });
         }
-        if (sessionState && sessionState.connected !== true) {
+        if (hasLiveConnectionLookup && (!sessionState || sessionState.connected !== true)) {
             pushOverridePreflightIssue(issues, {
                 code: LIVE_SESSION_DISCONNECTED_CODE,
                 severity: 'error',
                 source: 'connection',
-                message: `Session ${options.sessionId} is not currently connected to the live extension bridge.`,
+                message: sessionState
+                    ? `Session ${options.sessionId} is not currently connected to the live extension bridge. Last disconnect reason: ${sessionState.disconnectReason ?? 'unknown'}.`
+                    : `Session ${options.sessionId} has no current live extension connection state.`,
+                disconnectedAt: sessionState?.disconnectedAt,
+                disconnectReason: sessionState?.disconnectReason,
             });
         }
     }
     const enabledRules = Array.isArray(profile.rules)
         ? profile.rules.filter((rule) => isRecord(rule) && rule.enabled === true)
         : [];
+    const enabledRuleAssetReadiness = enabledRules
+        .map((rule) => {
+        const targetAssetUrl = normalizeOptionalString(rule.targetAssetUrl);
+        if (!targetAssetUrl) {
+            return null;
+        }
+        const requestMethod = normalizeOverrideRequestMethod(rule.requestMethod);
+        const matchMode = String(rule.matchMode ?? 'exact');
+        const matchingAssets = observedAssets.filter((asset) => {
+            const methodMatches = normalizeOverrideRequestMethod(asset.requestMethod) === requestMethod;
+            if (!methodMatches) {
+                return false;
+            }
+            return matchMode === 'prefix'
+                ? asset.url.startsWith(targetAssetUrl)
+                : asset.url === targetAssetUrl;
+        });
+        return {
+            ruleId: String(rule.ruleId ?? 'unknown'),
+            targetAssetUrl,
+            requestMethod,
+            matchMode,
+            captureProven: rule.ruleType === 'rsc-flight' && isRecordWithRscFlightMetadata(rule.rscFlight),
+            matchingAssets,
+        };
+    })
+        .filter((readiness) => readiness !== null);
+    const matchedTargetAssetCount = enabledRuleAssetReadiness.filter((readiness) => readiness.matchingAssets.length > 0).length;
+    const capturedTargetAssetCount = enabledRuleAssetReadiness
+        .filter((readiness) => readiness.matchingAssets.length === 0 && readiness.captureProven)
+        .length;
+    const unobservedTargetAssetCount = enabledRuleAssetReadiness.length - matchedTargetAssetCount;
+    const unsatisfiedTargetAssetCount = enabledRuleAssetReadiness.length - matchedTargetAssetCount - capturedTargetAssetCount;
+    const targetAssetObserved = observedAssets.length > 0 && matchedTargetAssetCount > 0;
+    const targetAssetReadinessSatisfied = observedAssets.length > 0
+        && (enabledRuleAssetReadiness.length === 0 || matchedTargetAssetCount > 0 || capturedTargetAssetCount > 0);
     const anyServiceWorkerControlled = observedAssets.some((asset) => asset.serviceWorkerControlled);
     const cspMetaTags = [...new Set(observedAssets.flatMap((asset) => asset.cspMetaTags))];
     if (observedAssets.length === 0) {
         pushOverridePreflightIssue(issues, {
             code: 'NO_OBSERVED_ASSETS',
-            severity: 'warning',
+            severity: 'error',
             source: 'observed-assets',
-            message: 'No observed production assets are stored for this session yet.',
+            message: 'No observed production assets are stored for this session yet; the target route is not capture-ready for override enablement.',
         });
     }
-    for (const rule of enabledRules) {
-        const ruleId = String(rule.ruleId ?? 'unknown');
-        const targetAssetUrl = normalizeOptionalString(rule.targetAssetUrl);
-        if (!targetAssetUrl) {
-            continue;
-        }
-        const requestMethod = normalizeOverrideRequestMethod(rule.requestMethod);
-        const matchingAssets = observedAssets.filter((asset) => {
-            return asset.url === targetAssetUrl
-                && normalizeOverrideRequestMethod(asset.requestMethod) === requestMethod;
+    else if (!topLevelScopeLikely) {
+        pushOverridePreflightIssue(issues, {
+            code: 'SESSION_SCOPE_DRIFT',
+            severity: 'error',
+            source: 'observed-assets',
+            message: `Observed override assets were recorded only for tab(s) ${observedAssetTabs.join(', ')}, but the session top-level tab is ${sessionTabId}.`,
+            observedAssetTabs,
+            sessionTabId,
+            observedPageUrls: observedAssetPageUrls,
         });
-        if (observedAssets.length > 0 && matchingAssets.length === 0) {
+    }
+    if (observedAssets.length > 0 && enabledRuleAssetReadiness.length > 0 && matchedTargetAssetCount === 0 && capturedTargetAssetCount === 0) {
+        const sampleTargets = enabledRuleAssetReadiness.slice(0, 5).map((readiness) => ({
+            ruleId: readiness.ruleId,
+            requestMethod: readiness.requestMethod,
+            matchMode: readiness.matchMode,
+            targetAssetUrl: readiness.targetAssetUrl,
+        }));
+        pushOverridePreflightIssue(issues, {
+            code: 'TARGET_ASSET_NOT_OBSERVED',
+            severity: 'error',
+            source: 'observed-assets',
+            message: enabledRuleAssetReadiness.length === 1
+                ? `Rule ${enabledRuleAssetReadiness[0].ruleId} target asset was not observed for ${enabledRuleAssetReadiness[0].requestMethod} ${enabledRuleAssetReadiness[0].targetAssetUrl}.`
+                : `None of the ${enabledRuleAssetReadiness.length} enabled override targets were observed for this session.`,
+            checkedTargetAssetCount: enabledRuleAssetReadiness.length,
+            sampleTargets,
+        });
+    }
+    for (const readiness of enabledRuleAssetReadiness) {
+        if (readiness.matchingAssets.length === 0) {
+            if (readiness.captureProven) {
+                continue;
+            }
             pushOverridePreflightIssue(issues, {
-                code: 'TARGET_ASSET_NOT_OBSERVED',
+                code: 'TARGET_ASSET_NOT_OBSERVED_FOR_RULE',
                 severity: 'warning',
                 source: 'observed-assets',
-                message: `Rule ${ruleId} target asset was not observed for ${requestMethod} ${targetAssetUrl}.`,
+                message: `Rule ${readiness.ruleId} target asset was not observed for ${readiness.requestMethod} ${readiness.targetAssetUrl}.`,
             });
             continue;
         }
-        for (const asset of matchingAssets) {
+        for (const asset of readiness.matchingAssets) {
             if (typeof asset.integrity === 'string' && asset.integrity.length > 0) {
                 pushOverridePreflightIssue(issues, {
                     code: 'TARGET_ASSET_SRI_PRESENT',
                     severity: 'error',
                     source: 'observed-assets',
-                    message: `Rule ${ruleId} target asset ${asset.url} includes integrity="${asset.integrity}" and cannot be overridden safely.`,
+                    message: `Rule ${readiness.ruleId} target asset ${asset.url} includes integrity="${asset.integrity}" and cannot be overridden safely.`,
                 });
             }
         }
@@ -1936,23 +2854,29 @@ function buildOverridePreflight(options) {
     }
     const ready = !issues.some((issue) => issue.severity === 'error');
     const nextActions = !ready
-        ? issues.some((issue) => issue.code === 'SERVER_ACTION_UNSUPPORTED')
-            ? [{
-                    code: 'REPLAN_SERVER_ACTION_OVERRIDE',
-                    message: 'Server actions stay unsupported in production override mode; move the override to a GET document/data/API response.',
-                }]
-            : issues.some((issue) => issue.code === 'MUTATION_REPLAY_UNSUPPORTED')
-                ? [{
-                        code: 'REPLAN_MUTATION_OVERRIDE',
-                        message: 'Mutation responses are not replay-safe; use a GET document/data/API response path instead.',
-                    }]
-                : issues.some((issue) => issue.code === 'UNSAFE_REQUEST_METHOD')
-                    ? [{ code: 'REPLAN_GET_ONLY_OVERRIDE', message: 'Remove or regenerate non-GET rules before enabling overrides.' }]
-                    : issues.some((issue) => issue.code === 'TARGET_ASSET_SRI_PRESENT')
-                        ? [{ code: 'CHOOSE_ANOTHER_OVERRIDE_PATH', message: 'Choose a document/data response path or remove SRI on the production asset before enabling overrides.' }]
-                        : issues.some((issue) => issue.code === 'SESSION_NOT_FOUND' || issue.code === 'SESSION_PAUSED' || issue.code === 'SESSION_ENDED' || issue.code === LIVE_SESSION_DISCONNECTED_CODE)
-                            ? [{ code: 'RECONNECT_SESSION', message: 'Reconnect or resume the target session before enabling overrides.' }]
-                            : buildOverrideProfileNextActions(profile, issues)
+        ? issues.some((issue) => issue.code === 'SESSION_NOT_FOUND' || issue.code === 'SESSION_PAUSED' || issue.code === 'SESSION_ENDED' || issue.code === LIVE_SESSION_DISCONNECTED_CODE)
+            ? [{ code: 'RECONNECT_SESSION', message: 'Reconnect or resume the target session before enabling overrides.' }]
+            : issues.some((issue) => issue.code === 'SESSION_SCOPE_DRIFT')
+                ? [{ code: 'FOCUS_BOUND_TAB', message: 'Focus or reselect the bound top-level tab, then observe override assets again.' }]
+                : issues.some((issue) => issue.code === 'SERVER_ACTION_UNSUPPORTED')
+                    ? [{
+                            code: 'REPLAN_SERVER_ACTION_OVERRIDE',
+                            message: 'Server actions stay unsupported in production override mode; move the override to a GET document/data/API response.',
+                        }]
+                    : issues.some((issue) => issue.code === 'MUTATION_REPLAY_UNSUPPORTED')
+                        ? [{
+                                code: 'REPLAN_MUTATION_OVERRIDE',
+                                message: 'Mutation responses are not replay-safe; use a GET document/data/API response path instead.',
+                            }]
+                        : issues.some((issue) => issue.code === 'UNSAFE_REQUEST_METHOD')
+                            ? [{ code: 'REPLAN_GET_ONLY_OVERRIDE', message: 'Remove or regenerate non-GET rules before enabling overrides.' }]
+                            : issues.some((issue) => issue.code === 'TARGET_ASSET_SRI_PRESENT')
+                                ? [{ code: 'CHOOSE_ANOTHER_OVERRIDE_PATH', message: 'Choose a document/data response path or remove SRI on the production asset before enabling overrides.' }]
+                                : issues.some((issue) => issue.code === 'NO_OBSERVED_ASSETS')
+                                    ? [{ code: 'OBSERVE_OVERRIDE_ASSETS', message: 'Observe the bound target route before enabling overrides.' }]
+                                    : issues.some((issue) => issue.code === 'TARGET_ASSET_NOT_OBSERVED')
+                                        ? [{ code: 'OBSERVE_TARGET_ROUTE', message: 'Load the route that requests the configured target and observe assets again.' }]
+                                        : buildOverrideProfileNextActions(profile, issues)
         : observedAssets.length === 0
             ? [{ code: 'OBSERVE_OVERRIDE_ASSETS', message: 'Run observe_override_assets on the target route before enabling overrides in production workflows.' }]
             : [{ code: 'ENABLE_OVERRIDES', message: 'Preflight checks passed; the selected profile can be enabled on the live session.' }];
@@ -1976,8 +2900,22 @@ function buildOverridePreflight(options) {
         checks: {
             sessionFound: session !== undefined,
             connected: sessionState?.connected === true,
+            captureReady: session !== undefined
+                && getSessionStatus(session) === 'active'
+                && (!hasLiveConnectionLookup || sessionState?.connected === true)
+                && observedAssets.length > 0
+                && topLevelScopeLikely
+                && !issues.some((issue) => issue.severity === 'error'),
+            topLevelScopeLikely,
+            observedAssetTabs,
+            observedAssetPageUrls,
             observedAssetCount: observedAssets.length,
-            targetAssetObserved: issues.every((issue) => issue.code !== 'TARGET_ASSET_NOT_OBSERVED'),
+            targetAssetObserved,
+            targetAssetReadinessSatisfied,
+            matchedTargetAssetCount,
+            capturedTargetAssetCount,
+            unobservedTargetAssetCount,
+            unsatisfiedTargetAssetCount,
             serviceWorkerControlled: anyServiceWorkerControlled,
             cspMetaTagCount: cspMetaTags.length,
             recentPlanCount: recentPlans.length,
@@ -1985,6 +2923,14 @@ function buildOverridePreflight(options) {
         },
         observedAssets: {
             count: observedAssets.length,
+            tabIds: observedAssetTabs,
+            pageUrls: observedAssetPageUrls,
+            targetAssetObserved,
+            targetAssetReadinessSatisfied,
+            matchedTargetAssetCount,
+            capturedTargetAssetCount,
+            unobservedTargetAssetCount,
+            unsatisfiedTargetAssetCount,
             serviceWorkerControlled: anyServiceWorkerControlled,
             cspMetaTags,
         },
@@ -2390,6 +3336,7 @@ function mapAutomationRunRecord(row) {
             : undefined,
         stopReason: row.stop_reason ?? undefined,
         target: parseJsonOrUndefined(row.target_summary_json),
+        diagnostics: parseJsonOrUndefined(row.diagnostics_json),
         failure: parseJsonOrUndefined(row.failure_json),
         redaction: parseJsonOrUndefined(row.redaction_json),
         stepCount: row.step_count,
@@ -2414,6 +3361,7 @@ function mapAutomationStepRecord(row) {
         durationMs: row.duration_ms ?? undefined,
         tabId: row.tab_id ?? undefined,
         target: parseJsonOrUndefined(row.target_summary_json),
+        diagnostics: parseJsonOrUndefined(row.diagnostics_json),
         redaction: parseJsonOrUndefined(row.redaction_json),
         failure: parseJsonOrUndefined(row.failure_json),
         inputMetadata: parseJsonOrUndefined(row.input_metadata_json),
@@ -2424,6 +3372,109 @@ function mapAutomationStepRecord(row) {
         source: 'automation_steps',
     };
 }
+function asRecordOrUndefined(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value)
+        ? value
+        : undefined;
+}
+function buildFailureEvidenceSummary(failureEvidence) {
+    if (!failureEvidence) {
+        return undefined;
+    }
+    const snapshot = asRecordOrUndefined(failureEvidence.snapshot);
+    const snapshotRoot = asRecordOrUndefined(snapshot?.snapshot);
+    return {
+        captured: failureEvidence.captured === true,
+        error: typeof failureEvidence.error === 'string' ? failureEvidence.error : undefined,
+        limitsApplied: asRecordOrUndefined(failureEvidence.limitsApplied),
+        snapshot: snapshot
+            ? {
+                timestamp: typeof snapshot.timestamp === 'number' ? snapshot.timestamp : undefined,
+                trigger: typeof snapshot.trigger === 'string' ? snapshot.trigger : undefined,
+                selector: typeof snapshot.selector === 'string' ? snapshot.selector : undefined,
+                url: typeof snapshot.url === 'string' ? snapshot.url : undefined,
+                mode: snapshot.mode,
+                hasDom: Boolean(snapshotRoot && 'dom' in snapshotRoot),
+                hasStyles: Boolean(snapshotRoot && 'styles' in snapshotRoot),
+                hasPng: Boolean(snapshot.png),
+            }
+            : undefined,
+    };
+}
+function findRelatedFailureSnapshot(db, sessionId, failureEvidence) {
+    const snapshotSummary = asRecordOrUndefined(buildFailureEvidenceSummary(failureEvidence)?.snapshot);
+    if (!snapshotSummary) {
+        return undefined;
+    }
+    const timestamp = typeof snapshotSummary.timestamp === 'number' ? snapshotSummary.timestamp : undefined;
+    const selector = typeof snapshotSummary.selector === 'string' ? snapshotSummary.selector : undefined;
+    const url = typeof snapshotSummary.url === 'string' ? snapshotSummary.url : undefined;
+    const where = ['session_id = ?'];
+    const params = [sessionId];
+    if (selector) {
+        where.push('selector = ?');
+        params.push(selector);
+    }
+    if (url) {
+        where.push('url = ?');
+        params.push(url);
+    }
+    if (timestamp !== undefined) {
+        where.push('ts BETWEEN ? AND ?');
+        params.push(timestamp - 10_000, timestamp + 10_000);
+    }
+    const row = db.prepare(`SELECT snapshot_id, trigger_event_id, ts, selector, url
+     FROM snapshots
+     WHERE ${where.join(' AND ')}
+     ORDER BY ${timestamp !== undefined ? 'ABS(ts - ?) ASC,' : ''} ts DESC
+     LIMIT 1`).get(...params, ...(timestamp !== undefined ? [timestamp] : []));
+    if (!row) {
+        return undefined;
+    }
+    return {
+        snapshotId: row.snapshot_id,
+        triggerEventId: row.trigger_event_id ?? undefined,
+        timestamp: row.ts,
+        selector: row.selector ?? undefined,
+        url: row.url ?? undefined,
+    };
+}
+function mergeAutomationDiagnosticsEvidence(db, options) {
+    if (!options.traceId) {
+        return;
+    }
+    const failureEvidence = buildFailureEvidenceSummary(options.failureEvidence);
+    const linkedSnapshot = findRelatedFailureSnapshot(db, options.sessionId, options.failureEvidence);
+    if (!failureEvidence && !linkedSnapshot && !options.cdpFailure) {
+        return;
+    }
+    const updateDiagnosticsJson = (tableName, keyColumn, keyValue, existingJson) => {
+        const existing = asRecordOrUndefined(parseJsonOrUndefined(existingJson)) ?? {};
+        const merged = {
+            ...existing,
+            ...(options.cdpFailure ? { cdpFailure: options.cdpFailure } : {}),
+            ...(failureEvidence ? { failureEvidence } : {}),
+            ...(linkedSnapshot ? { linkedSnapshot } : {}),
+        };
+        db.prepare(`UPDATE ${tableName} SET diagnostics_json = ?, updated_at = ? WHERE ${keyColumn} = ?`).run(JSON.stringify(merged), Date.now(), keyValue);
+    };
+    const runRow = db.prepare(`SELECT run_id, diagnostics_json
+     FROM automation_runs
+     WHERE session_id = ? AND trace_id = ?
+     ORDER BY started_at DESC, updated_at DESC
+     LIMIT 1`).get(options.sessionId, options.traceId);
+    if (runRow) {
+        updateDiagnosticsJson('automation_runs', 'run_id', runRow.run_id, runRow.diagnostics_json);
+    }
+    const stepRow = db.prepare(`SELECT step_id, diagnostics_json
+     FROM automation_steps
+     WHERE session_id = ? AND trace_id = ?
+     ORDER BY step_order DESC, updated_at DESC
+     LIMIT 1`).get(options.sessionId, options.traceId);
+    if (stepRow) {
+        updateDiagnosticsJson('automation_steps', 'step_id', stepRow.step_id, stepRow.diagnostics_json);
+    }
+}
 function formatUrlPath(url) {
     try {
         const parsed = new URL(url);
@@ -2556,15 +3607,25 @@ function resolveViewportDimension(value, axis) {
     }
     return floored;
 }
-class WorkflowTargetResolutionError extends Error {
-    code;
-    details;
-    constructor(code, message, details) {
-        super(message);
-        this.name = 'WorkflowTargetResolutionError';
-        this.code = code;
-        this.details = details;
+function buildWaitTimeoutDiagnostics(options) {
+    const diagnostics = {
+        waitKind: options.waitKind,
+        timeoutMs: options.timeoutMs,
+        waitedMs: options.waitedMs,
+        attempts: options.attempts,
+        pollIntervalMs: options.pollIntervalMs,
+        matcherSummary: options.matcherSummary,
+    };
+    if (options.lastObserved !== undefined) {
+        diagnostics.lastObserved = options.lastObserved;
+    }
+    if (typeof options.candidateCount === 'number') {
+        diagnostics.candidateCount = options.candidateCount;
     }
+    if (Array.isArray(options.sampledCandidates) && options.sampledCandidates.length > 0) {
+        diagnostics.sampledCandidates = options.sampledCandidates;
+    }
+    return diagnostics;
 }
 function resolveOptionalMatcherString(value) {
     if (typeof value !== 'string') {
@@ -2587,10 +3648,10 @@ function resolveOptionalMatcherCount(value, field) {
     return floored;
 }
 function resolvePageStateScope(value) {
-    if (value === 'buttons' || value === 'inputs' || value === 'modals' || value === 'focused' || value === 'page') {
+    if (value === 'buttons' || value === 'links' || value === 'inputs' || value === 'modals' || value === 'focused' || value === 'page') {
         return value;
     }
-    throw new Error('scope must be one of buttons, inputs, modals, focused, or page');
+    throw new Error('scope must be one of buttons, links, inputs, modals, focused, or page');
 }
 function resolvePageStateMatcher(input) {
     const matcher = {
@@ -2600,6 +3661,13 @@ function resolvePageStateMatcher(input) {
         textContains: resolveOptionalMatcherString(input.textContains),
         labelContains: resolveOptionalMatcherString(input.labelContains),
         titleContains: resolveOptionalMatcherString(input.titleContains),
+        role: resolveOptionalMatcherString(input.role)?.toLowerCase(),
+        name: resolveOptionalMatcherString(input.name),
+        placeholder: resolveOptionalMatcherString(input.placeholder),
+        altText: resolveOptionalMatcherString(input.altText),
+        exact: resolveOptionalMatcherBoolean(input.exact),
+        frameUrlContains: resolveOptionalMatcherString(input.frameUrlContains),
+        frameTitleContains: resolveOptionalMatcherString(input.frameTitleContains),
         urlContains: resolveOptionalMatcherString(input.urlContains),
         language: resolveOptionalMatcherString(input.language),
         disabled: resolveOptionalMatcherBoolean(input.disabled),
@@ -2610,6 +3678,7 @@ function resolvePageStateMatcher(input) {
         requiredField: resolveOptionalMatcherBoolean(input.requiredField),
         tagName: resolveOptionalMatcherString(input.tagName)?.toLowerCase(),
         type: resolveOptionalMatcherString(input.type)?.toLowerCase(),
+        visible: resolveOptionalMatcherBoolean(input.visible),
         countExactly: resolveOptionalMatcherCount(input.countExactly, 'countExactly'),
         countAtLeast: resolveOptionalMatcherCount(input.countAtLeast, 'countAtLeast'),
     };
@@ -2624,6 +3693,19 @@ function includesNormalized(value, needle) {
     }
     return typeof value === 'string' && value.toLowerCase().includes(needle.toLowerCase());
 }
+function matchesTextValue(value, expected, exact) {
+    if (!expected) {
+        return true;
+    }
+    if (typeof value !== 'string') {
+        return false;
+    }
+    const normalizedValue = value.trim().toLowerCase();
+    const normalizedExpected = expected.trim().toLowerCase();
+    return exact === true
+        ? normalizedValue === normalizedExpected
+        : normalizedValue.includes(normalizedExpected);
+}
 function equalsNormalized(value, expected) {
     if (!expected) {
         return true;
@@ -2637,7 +3719,7 @@ function equalsOptionalBoolean(value, expected) {
     return value === expected;
 }
 function pickPageStateScopeItems(payload, scope) {
-    if (scope === 'buttons' || scope === 'inputs' || scope === 'modals') {
+    if (scope === 'buttons' || scope === 'links' || scope === 'inputs' || scope === 'modals') {
         const value = payload[scope];
         return asRecordArray(value);
     }
@@ -2650,13 +3732,20 @@ function pickPageStateScopeItems(payload, scope) {
 function matchesPageStateItem(item, matcher) {
     return (includesNormalized(item.selector, matcher.selector)
         && equalsNormalized(item.testId, matcher.testId)
-        && includesNormalized(item.text, matcher.textContains)
-        && includesNormalized(item.label, matcher.labelContains)
-        && includesNormalized(item.title, matcher.titleContains)
+        && matchesTextValue(item.text, matcher.textContains, matcher.exact)
+        && matchesTextValue(item.label, matcher.labelContains, matcher.exact)
+        && matchesTextValue(item.title, matcher.titleContains, matcher.exact)
+        && equalsNormalized(item.role, matcher.role)
+        && matchesTextValue(item.name, matcher.name, matcher.exact)
+        && matchesTextValue(item.placeholder, matcher.placeholder, matcher.exact)
+        && matchesTextValue(item.altText, matcher.altText, matcher.exact)
+        && includesNormalized(item.frameUrl, matcher.frameUrlContains)
+        && includesNormalized(item.frameTitle, matcher.frameTitleContains)
         && includesNormalized(item.url, matcher.urlContains)
         && equalsNormalized(item.language, matcher.language)
         && equalsNormalized(item.tagName, matcher.tagName)
         && equalsNormalized(item.type, matcher.type)
+        && equalsOptionalBoolean(item.visible, matcher.visible)
         && equalsOptionalBoolean(item.disabled, matcher.disabled)
         && equalsOptionalBoolean(item.selected, matcher.selected)
         && equalsOptionalBoolean(item.pressed, matcher.pressed)
@@ -2713,7 +3802,7 @@ function createPageChangeSummary(previousCapture, currentCapture) {
     const previousSummary = previous?.summary;
     const currentSummary = current.summary;
     const summaryDelta = {};
-    for (const key of ['buttons', 'inputs', 'modals']) {
+    for (const key of ['buttons', 'links', 'inputs', 'modals']) {
         const previousValue = typeof previousSummary?.[key] === 'number' ? previousSummary[key] : undefined;
         const currentValue = typeof currentSummary?.[key] === 'number' ? currentSummary[key] : undefined;
         if (previousValue !== currentValue && currentValue !== undefined) {
@@ -2742,13 +3831,13 @@ function createPageChangeSummary(previousCapture, currentCapture) {
 }
 function resolveInteractiveKinds(value) {
     if (!Array.isArray(value) || value.length === 0) {
-        return ['buttons', 'inputs', 'modals', 'focused'];
+        return ['buttons', 'links', 'inputs', 'modals', 'focused'];
     }
-    const allowed = new Set(['buttons', 'inputs', 'modals', 'focused']);
+    const allowed = new Set(['buttons', 'links', 'inputs', 'modals', 'focused']);
     const kinds = value
         .filter((entry) => typeof entry === 'string' && allowed.has(entry))
         .map((entry) => entry);
-    return kinds.length > 0 ? Array.from(new Set(kinds)) : ['buttons', 'inputs', 'modals', 'focused'];
+    return kinds.length > 0 ? Array.from(new Set(kinds)) : ['buttons', 'links', 'inputs', 'modals', 'focused'];
 }
 function collectInteractiveElementRefs(payload, kinds, maxItems) {
     const refs = [];
@@ -2868,132 +3957,1345 @@ async function waitForPageStateCondition(sessionId, input, capturePageState) {
     const { lastCapture: _lastCapture, ...waited } = detailed;
     return waited;
 }
-function candidateTextForWorkflowTarget(item) {
-    return [item.text, item.label, item.title]
-        .filter((value) => typeof value === 'string' && value.trim().length > 0)
-        .join(' ')
-        .trim();
+function compileWaitRegex(value, fieldName) {
+    if (!value) {
+        return undefined;
+    }
+    try {
+        return new RegExp(value);
+    }
+    catch {
+        throw new Error(`${fieldName} must be a valid regular expression`);
+    }
+}
+function matchesUrlWait(url, wait) {
+    return matchesUrlPredicates(url, {
+        exactUrl: wait.exactUrl,
+        urlContains: wait.urlContains,
+        urlRegex: wait.urlRegex,
+    });
+}
+function matchesUrlPredicates(url, predicates) {
+    if (typeof url !== 'string') {
+        return false;
+    }
+    if (predicates.exactUrl && url !== predicates.exactUrl) {
+        return false;
+    }
+    if (predicates.urlContains && !url.includes(predicates.urlContains)) {
+        return false;
+    }
+    const regex = compileWaitRegex(predicates.urlRegex, predicates.regexFieldName ?? 'urlRegex');
+    if (regex && !regex.test(url)) {
+        return false;
+    }
+    return true;
+}
+function resolveAutomationWaitSinceTs(value) {
+    return resolveOptionalTimestamp(value) ?? Math.max(0, Date.now() - DEFAULT_AUTOMATION_WAIT_LOOKBACK_MS);
+}
+function isElementMissingError(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return /no element found for selector/i.test(message);
+}
+async function captureSelectorState(captureClient, sessionId, selector, frameId = 0) {
+    try {
+        const [styleCapture, layoutCapture] = await Promise.all([
+            executeLiveCapture(captureClient, sessionId, 'CAPTURE_COMPUTED_STYLES', { selector, frameId, properties: ['display', 'visibility', 'opacity'] }, 3_000),
+            executeLiveCapture(captureClient, sessionId, 'CAPTURE_LAYOUT_METRICS', { selector, frameId }, 3_000),
+        ]);
+        const stylePayload = ensureCaptureSuccess(styleCapture, sessionId);
+        const layoutPayload = ensureCaptureSuccess(layoutCapture, sessionId);
+        const properties = isRecord(stylePayload.properties) ? stylePayload.properties : {};
+        const element = isRecord(layoutPayload.element) ? layoutPayload.element : {};
+        const width = typeof element.width === 'number' ? element.width : 0;
+        const height = typeof element.height === 'number' ? element.height : 0;
+        const display = typeof properties.display === 'string' ? properties.display : undefined;
+        const visibility = typeof properties.visibility === 'string' ? properties.visibility : undefined;
+        const opacityText = typeof properties.opacity === 'string' ? properties.opacity : undefined;
+        const opacity = opacityText !== undefined ? Number.parseFloat(opacityText) : undefined;
+        const visible = display !== 'none'
+            && visibility !== 'hidden'
+            && visibility !== 'collapse'
+            && opacity !== 0
+            && width > 0
+            && height > 0;
+        return {
+            selector,
+            frameId,
+            attached: true,
+            visible,
+            styles: properties,
+            element,
+            viewport: layoutPayload.viewport,
+        };
+    }
+    catch (error) {
+        if (isElementMissingError(error)) {
+            return {
+                selector,
+                frameId,
+                attached: false,
+                visible: false,
+                missing: true,
+                message: error instanceof Error ? error.message : String(error),
+            };
+        }
+        throw error;
+    }
+}
+function selectorStateMatches(state, expectedState) {
+    const attached = state.attached === true;
+    const visible = state.visible === true;
+    switch (expectedState) {
+        case 'attached':
+            return attached;
+        case 'detached':
+            return !attached;
+        case 'visible':
+            return attached && visible;
+        case 'hidden':
+            return !attached || !visible;
+    }
+}
+async function waitForUrlCondition(sessionId, wait, capturePageState) {
+    const timeoutMs = resolveTimeoutMs(wait.timeoutMs, 5_000, MAX_NETWORK_POLL_TIMEOUT_MS);
+    const pollIntervalMs = resolveDurationMs(wait.pollIntervalMs, 100, 5_000);
+    const startedAt = Date.now();
+    const deadline = startedAt + timeoutMs;
+    let attempts = 0;
+    let lastPage;
+    while (Date.now() <= deadline) {
+        attempts += 1;
+        const capture = await capturePageState(sessionId, {
+            includeButtons: false,
+            includeLinks: false,
+            includeInputs: false,
+            includeModals: false,
+            maxItems: 1,
+            maxTextLength: 40,
+        });
+        lastPage = {
+            url: capture.payload.url,
+            title: capture.payload.title,
+            language: capture.payload.language,
+            viewport: capture.payload.viewport,
+        };
+        if (matchesUrlWait(capture.payload.url, wait)) {
+            return {
+                waitKind: 'url',
+                matched: true,
+                waitedMs: Date.now() - startedAt,
+                attempts,
+                timeoutMs,
+                pollIntervalMs,
+                evidence: { page: lastPage },
+            };
+        }
+        await sleep(pollIntervalMs);
+    }
+    return {
+        waitKind: 'url',
+        matched: false,
+        waitedMs: Date.now() - startedAt,
+        attempts,
+        timeoutMs,
+        pollIntervalMs,
+        evidence: {
+            page: lastPage,
+            expected: wait,
+            timeoutDiagnostics: buildWaitTimeoutDiagnostics({
+                waitKind: 'url',
+                timeoutMs,
+                waitedMs: Date.now() - startedAt,
+                attempts,
+                pollIntervalMs,
+                matcherSummary: {
+                    exactUrl: wait.exactUrl,
+                    urlContains: wait.urlContains,
+                    urlRegex: wait.urlRegex,
+                },
+                lastObserved: lastPage,
+            }),
+        },
+        error: {
+            code: 'url_wait_timeout',
+            message: 'Timed out waiting for the page URL to match the requested condition.',
+        },
+    };
+}
+function pageReadyStateMatches(readyState, expectedState) {
+    if (readyState !== 'loading' && readyState !== 'interactive' && readyState !== 'complete') {
+        return false;
+    }
+    if (expectedState === 'domcontentloaded') {
+        return readyState === 'interactive' || readyState === 'complete';
+    }
+    return readyState === 'complete';
+}
+async function waitForLoadStateCondition(sessionId, wait, capturePageState) {
+    const timeoutMs = resolveTimeoutMs(wait.timeoutMs, 5_000, MAX_NETWORK_POLL_TIMEOUT_MS);
+    const pollIntervalMs = resolveDurationMs(wait.pollIntervalMs, 100, 5_000);
+    const expectedState = wait.state ?? 'load';
+    const startedAt = Date.now();
+    const deadline = startedAt + timeoutMs;
+    let attempts = 0;
+    let lastPage;
+    while (Date.now() <= deadline) {
+        attempts += 1;
+        const capture = await capturePageState(sessionId, {
+            includeButtons: false,
+            includeLinks: false,
+            includeInputs: false,
+            includeModals: false,
+            maxItems: 1,
+            maxTextLength: 40,
+        });
+        lastPage = {
+            url: capture.payload.url,
+            title: capture.payload.title,
+            readyState: capture.payload.readyState,
+            language: capture.payload.language,
+            viewport: capture.payload.viewport,
+        };
+        const urlMatches = matchesUrlPredicates(typeof capture.payload.url === 'string' ? capture.payload.url : undefined, {
+            exactUrl: wait.exactUrl,
+            urlContains: wait.urlContains,
+            urlRegex: wait.urlRegex,
+        });
+        if (urlMatches && pageReadyStateMatches(capture.payload.readyState, expectedState)) {
+            return {
+                waitKind: 'load_state',
+                matched: true,
+                waitedMs: Date.now() - startedAt,
+                attempts,
+                timeoutMs,
+                pollIntervalMs,
+                evidence: {
+                    state: expectedState,
+                    page: lastPage,
+                },
+            };
+        }
+        await sleep(pollIntervalMs);
+    }
+    return {
+        waitKind: 'load_state',
+        matched: false,
+        waitedMs: Date.now() - startedAt,
+        attempts,
+        timeoutMs,
+        pollIntervalMs,
+        evidence: {
+            state: expectedState,
+            page: lastPage,
+            expected: wait,
+            timeoutDiagnostics: buildWaitTimeoutDiagnostics({
+                waitKind: 'load_state',
+                timeoutMs,
+                waitedMs: Date.now() - startedAt,
+                attempts,
+                pollIntervalMs,
+                matcherSummary: {
+                    state: expectedState,
+                    exactUrl: wait.exactUrl,
+                    urlContains: wait.urlContains,
+                    urlRegex: wait.urlRegex,
+                },
+                lastObserved: lastPage,
+            }),
+        },
+        error: {
+            code: 'load_state_wait_timeout',
+            message: `Timed out waiting for page load state "${expectedState}".`,
+        },
+    };
+}
+async function waitForSelectorStateCondition(sessionId, wait, captureClient) {
+    const timeoutMs = resolveTimeoutMs(wait.timeoutMs, 5_000, MAX_NETWORK_POLL_TIMEOUT_MS);
+    const pollIntervalMs = resolveDurationMs(wait.pollIntervalMs, 100, 5_000);
+    const expectedState = wait.state ?? 'visible';
+    const startedAt = Date.now();
+    const deadline = startedAt + timeoutMs;
+    let attempts = 0;
+    let lastState;
+    while (Date.now() <= deadline) {
+        attempts += 1;
+        lastState = await captureSelectorState(captureClient, sessionId, wait.selector, wait.frameId);
+        if (selectorStateMatches(lastState, expectedState)) {
+            return {
+                waitKind: 'selector_state',
+                matched: true,
+                waitedMs: Date.now() - startedAt,
+                attempts,
+                timeoutMs,
+                pollIntervalMs,
+                evidence: {
+                    selector: wait.selector,
+                    state: expectedState,
+                    selectorState: lastState,
+                },
+            };
+        }
+        await sleep(pollIntervalMs);
+    }
+    return {
+        waitKind: 'selector_state',
+        matched: false,
+        waitedMs: Date.now() - startedAt,
+        attempts,
+        timeoutMs,
+        pollIntervalMs,
+        evidence: {
+            selector: wait.selector,
+            state: expectedState,
+            selectorState: lastState,
+            timeoutDiagnostics: buildWaitTimeoutDiagnostics({
+                waitKind: 'selector_state',
+                timeoutMs,
+                waitedMs: Date.now() - startedAt,
+                attempts,
+                pollIntervalMs,
+                matcherSummary: {
+                    selector: wait.selector,
+                    state: expectedState,
+                    frameId: wait.frameId,
+                },
+                lastObserved: lastState,
+            }),
+        },
+        error: {
+            code: 'selector_state_wait_timeout',
+            message: `Timed out waiting for selector "${wait.selector}" to become ${expectedState}.`,
+        },
+    };
 }
-function describeWorkflowTargetCandidate(item) {
+async function waitForConsoleCondition(sessionId, wait, captureClient) {
+    const timeoutMs = resolveTimeoutMs(wait.timeoutMs, 5_000, MAX_NETWORK_POLL_TIMEOUT_MS);
+    const pollIntervalMs = resolveDurationMs(wait.pollIntervalMs, 100, 5_000);
+    const levels = resolveLiveConsoleLevels(wait.levels);
+    const contains = normalizeOptionalString(wait.contains);
+    const sinceTs = resolveAutomationWaitSinceTs(wait.sinceTs);
+    const includeRuntimeErrors = wait.includeRuntimeErrors !== false;
+    const startedAt = Date.now();
+    const deadline = startedAt + timeoutMs;
+    let attempts = 0;
+    let lastLogs = [];
+    while (Date.now() <= deadline) {
+        attempts += 1;
+        const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_GET_LIVE_CONSOLE_LOGS', {
+            levels,
+            contains,
+            sinceTs,
+            includeRuntimeErrors,
+            limit: 10,
+        }, 3_000);
+        const payload = ensureCaptureSuccess(capture, sessionId);
+        lastLogs = asRecordArray(payload.logs);
+        if (lastLogs.length > 0) {
+            return {
+                waitKind: 'console',
+                matched: true,
+                waitedMs: Date.now() - startedAt,
+                attempts,
+                timeoutMs,
+                pollIntervalMs,
+                evidence: {
+                    filters: { levels, contains, sinceTs, includeRuntimeErrors },
+                    logs: lastLogs.slice(0, 5).map((log) => mapLiveConsoleLogRecord(log, 'compact')),
+                },
+            };
+        }
+        await sleep(pollIntervalMs);
+    }
     return {
-        text: candidateTextForWorkflowTarget(item) || undefined,
-        testId: typeof item.testId === 'string' ? item.testId : undefined,
-        selector: typeof item.selector === 'string' ? item.selector : undefined,
-        tagName: typeof item.tagName === 'string' ? item.tagName : undefined,
-        type: typeof item.type === 'string' ? item.type : undefined,
-        disabled: typeof item.disabled === 'boolean' ? item.disabled : undefined,
-        selected: typeof item.selected === 'boolean' ? item.selected : undefined,
+        waitKind: 'console',
+        matched: false,
+        waitedMs: Date.now() - startedAt,
+        attempts,
+        timeoutMs,
+        pollIntervalMs,
+        evidence: {
+            filters: { levels, contains, sinceTs, includeRuntimeErrors },
+            sampledLogs: lastLogs.slice(0, 5).map((log) => mapLiveConsoleLogRecord(log, 'compact')),
+            timeoutDiagnostics: buildWaitTimeoutDiagnostics({
+                waitKind: 'console',
+                timeoutMs,
+                waitedMs: Date.now() - startedAt,
+                attempts,
+                pollIntervalMs,
+                matcherSummary: { levels, contains, sinceTs, includeRuntimeErrors },
+                lastObserved: lastLogs[0],
+                candidateCount: lastLogs.length,
+                sampledCandidates: lastLogs.slice(0, 5).map((log) => mapLiveConsoleLogRecord(log, 'compact')),
+            }),
+        },
+        error: {
+            code: 'console_wait_timeout',
+            message: 'Timed out waiting for a matching live console log.',
+        },
+    };
+}
+async function waitForDialogCondition(sessionId, wait, captureClient) {
+    const timeoutMs = resolveTimeoutMs(wait.timeoutMs, 5_000, MAX_NETWORK_POLL_TIMEOUT_MS);
+    const startedAt = Date.now();
+    const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_WAIT_FOR_DIALOG', {
+        type: wait.type,
+        messageContains: wait.messageContains,
+        urlContains: wait.urlContains,
+        action: wait.action,
+        promptText: wait.promptText,
+        tabId: wait.tabId,
+        timeoutMs,
+    }, timeoutMs + 2_000);
+    const payload = ensureCaptureSuccess(capture, sessionId);
+    const matched = payload.matched === true;
+    return {
+        waitKind: 'dialog',
+        matched,
+        waitedMs: Date.now() - startedAt,
+        attempts: 1,
+        timeoutMs,
+        pollIntervalMs: timeoutMs,
+        evidence: {
+            filters: {
+                type: wait.type,
+                messageContains: wait.messageContains,
+                urlContains: wait.urlContains,
+                action: wait.action,
+                tabId: wait.tabId,
+            },
+            dialog: matched ? payload : undefined,
+            expected: matched ? undefined : payload.expected ?? wait,
+            timeoutDiagnostics: matched
+                ? undefined
+                : buildWaitTimeoutDiagnostics({
+                    waitKind: 'dialog',
+                    timeoutMs,
+                    waitedMs: Date.now() - startedAt,
+                    attempts: 1,
+                    pollIntervalMs: timeoutMs,
+                    matcherSummary: {
+                        type: wait.type,
+                        messageContains: wait.messageContains,
+                        urlContains: wait.urlContains,
+                        action: wait.action,
+                        tabId: wait.tabId,
+                    },
+                    lastObserved: payload.lastObserved,
+                    candidateCount: typeof payload.observedCount === 'number' ? payload.observedCount : undefined,
+                }),
+        },
+        error: matched
+            ? undefined
+            : {
+                code: 'dialog_wait_timeout',
+                message: 'Timed out waiting for a matching JavaScript dialog.',
+            },
+    };
+}
+async function waitForStableLayoutCondition(sessionId, wait, captureClient) {
+    const timeoutMs = resolveTimeoutMs(wait.timeoutMs, 5_000, MAX_NETWORK_POLL_TIMEOUT_MS);
+    const stableMs = wait.stableMs;
+    const pollIntervalMs = resolveDurationMs(wait.pollIntervalMs, 100, 5_000);
+    const startedAt = Date.now();
+    const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_WAIT_FOR_STABLE_LAYOUT', {
+        selector: wait.selector,
+        stableMs,
+        tabId: wait.tabId,
+        timeoutMs,
+        pollIntervalMs,
+    }, timeoutMs + 2_000);
+    const payload = ensureCaptureSuccess(capture, sessionId);
+    const matched = payload.matched === true;
+    return {
+        waitKind: 'stable_layout',
+        matched,
+        waitedMs: Date.now() - startedAt,
+        attempts: 1,
+        timeoutMs,
+        pollIntervalMs,
+        evidence: {
+            filters: {
+                selector: wait.selector,
+                stableMs,
+                tabId: wait.tabId,
+            },
+            layout: payload,
+            timeoutDiagnostics: matched
+                ? undefined
+                : buildWaitTimeoutDiagnostics({
+                    waitKind: 'stable_layout',
+                    timeoutMs,
+                    waitedMs: Date.now() - startedAt,
+                    attempts: typeof payload.attempts === 'number' ? payload.attempts : 1,
+                    pollIntervalMs,
+                    matcherSummary: {
+                        selector: wait.selector,
+                        stableMs,
+                        tabId: wait.tabId,
+                    },
+                    lastObserved: payload.snapshot,
+                }),
+        },
+        error: matched
+            ? undefined
+            : {
+                code: 'stable_layout_wait_timeout',
+                message: 'Timed out waiting for layout to stay stable.',
+            },
+    };
+}
+function mapNavigationWaitEvent(row) {
+    const payload = readJsonPayload(row.payload_json);
+    return {
+        eventId: row.event_id,
+        sessionId: row.session_id,
+        timestamp: row.ts,
+        tabId: row.tab_id ?? undefined,
+        origin: row.origin ?? undefined,
+        url: resolveLastUrl(payload),
+        from: typeof payload.from === 'string' ? payload.from : undefined,
+        trigger: typeof payload.trigger === 'string' ? payload.trigger : undefined,
+        payload,
+    };
+}
+function navigationEventMatches(row, wait) {
+    const payload = readJsonPayload(row.payload_json);
+    const toUrl = resolveLastUrl(payload);
+    const fromUrl = typeof payload.from === 'string' ? payload.from : undefined;
+    const trigger = typeof payload.trigger === 'string' ? payload.trigger : undefined;
+    if (!matchesUrlPredicates(toUrl, {
+        exactUrl: wait.exactUrl,
+        urlContains: wait.urlContains,
+        urlRegex: wait.urlRegex,
+    })) {
+        return false;
+    }
+    if (wait.fromUrlContains || wait.fromUrlRegex) {
+        if (!matchesUrlPredicates(fromUrl, {
+            urlContains: wait.fromUrlContains,
+            urlRegex: wait.fromUrlRegex,
+            regexFieldName: 'fromUrlRegex',
+        })) {
+            return false;
+        }
+    }
+    if (wait.trigger && trigger !== wait.trigger) {
+        return false;
+    }
+    return true;
+}
+function queryNavigationWaitCandidates(db, options) {
+    const where = ['session_id = ?', "type = 'nav'", 'ts >= ?'];
+    const params = [options.sessionId, options.sinceTs];
+    if (options.tabId !== undefined) {
+        where.push('tab_id = ?');
+        params.push(options.tabId);
+    }
+    return db.prepare(`SELECT event_id, session_id, ts, type, payload_json, tab_id, origin
+     FROM events
+     WHERE ${where.join(' AND ')}
+     ORDER BY ts ASC
+     LIMIT 200`).all(...params);
+}
+async function waitForNavigationCondition(sessionId, wait, db) {
+    const timeoutMs = resolveTimeoutMs(wait.timeoutMs, 5_000, MAX_NETWORK_POLL_TIMEOUT_MS);
+    const pollIntervalMs = resolveDurationMs(wait.pollIntervalMs, 100, 5_000);
+    const sinceTs = resolveAutomationWaitSinceTs(wait.sinceTs);
+    const tabId = resolveOptionalTabId(wait.tabId);
+    const startedAt = Date.now();
+    const deadline = startedAt + timeoutMs;
+    let attempts = 0;
+    let lastEvents = [];
+    while (Date.now() <= deadline) {
+        attempts += 1;
+        lastEvents = queryNavigationWaitCandidates(db, { sessionId, sinceTs, tabId });
+        const matched = lastEvents.find((row) => navigationEventMatches(row, wait));
+        if (matched) {
+            return {
+                waitKind: 'navigation',
+                matched: true,
+                waitedMs: Date.now() - startedAt,
+                attempts,
+                timeoutMs,
+                pollIntervalMs,
+                evidence: {
+                    filters: {
+                        urlContains: wait.urlContains,
+                        urlRegex: wait.urlRegex,
+                        exactUrl: wait.exactUrl,
+                        fromUrlContains: wait.fromUrlContains,
+                        fromUrlRegex: wait.fromUrlRegex,
+                        trigger: wait.trigger,
+                        sinceTs,
+                        tabId,
+                    },
+                    navigation: mapNavigationWaitEvent(matched),
+                },
+            };
+        }
+        await sleep(pollIntervalMs);
+    }
+    return {
+        waitKind: 'navigation',
+        matched: false,
+        waitedMs: Date.now() - startedAt,
+        attempts,
+        timeoutMs,
+        pollIntervalMs,
+        evidence: {
+            filters: {
+                urlContains: wait.urlContains,
+                urlRegex: wait.urlRegex,
+                exactUrl: wait.exactUrl,
+                fromUrlContains: wait.fromUrlContains,
+                fromUrlRegex: wait.fromUrlRegex,
+                trigger: wait.trigger,
+                sinceTs,
+                tabId,
+            },
+            sampledEvents: lastEvents.slice(0, 5).map((row) => mapNavigationWaitEvent(row)),
+            timeoutDiagnostics: buildWaitTimeoutDiagnostics({
+                waitKind: 'navigation',
+                timeoutMs,
+                waitedMs: Date.now() - startedAt,
+                attempts,
+                pollIntervalMs,
+                matcherSummary: {
+                    urlContains: wait.urlContains,
+                    urlRegex: wait.urlRegex,
+                    exactUrl: wait.exactUrl,
+                    fromUrlContains: wait.fromUrlContains,
+                    fromUrlRegex: wait.fromUrlRegex,
+                    trigger: wait.trigger,
+                    sinceTs,
+                    tabId,
+                },
+                lastObserved: lastEvents.length > 0 ? mapNavigationWaitEvent(lastEvents[lastEvents.length - 1]) : undefined,
+                candidateCount: lastEvents.length,
+                sampledCandidates: lastEvents.slice(0, 5).map((row) => mapNavigationWaitEvent(row)),
+            }),
+        },
+        error: {
+            code: 'navigation_wait_timeout',
+            message: 'Timed out waiting for a matching navigation event.',
+        },
+    };
+}
+async function waitForNavigationLifecycleCondition(sessionId, wait, captureClient) {
+    const timeoutMs = resolveTimeoutMs(wait.timeoutMs, 5_000, MAX_NETWORK_POLL_TIMEOUT_MS);
+    const startedAt = Date.now();
+    const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_WAIT_FOR_NAVIGATION_LIFECYCLE', {
+        state: wait.state,
+        urlContains: wait.urlContains,
+        urlRegex: wait.urlRegex,
+        exactUrl: wait.exactUrl,
+        tabId: wait.tabId,
+        timeoutMs,
+    }, timeoutMs + 2_000);
+    const payload = ensureCaptureSuccess(capture, sessionId);
+    const matched = payload.matched === true;
+    return {
+        waitKind: 'navigation_lifecycle',
+        matched,
+        waitedMs: Date.now() - startedAt,
+        attempts: 1,
+        timeoutMs,
+        pollIntervalMs: timeoutMs,
+        evidence: {
+            filters: {
+                state: wait.state,
+                urlContains: wait.urlContains,
+                urlRegex: wait.urlRegex,
+                exactUrl: wait.exactUrl,
+                tabId: wait.tabId,
+            },
+            lifecycle: matched ? payload : undefined,
+            expected: matched ? undefined : payload.expected ?? wait,
+            timeoutDiagnostics: matched
+                ? undefined
+                : buildWaitTimeoutDiagnostics({
+                    waitKind: 'navigation_lifecycle',
+                    timeoutMs,
+                    waitedMs: Date.now() - startedAt,
+                    attempts: 1,
+                    pollIntervalMs: timeoutMs,
+                    matcherSummary: {
+                        state: wait.state,
+                        urlContains: wait.urlContains,
+                        urlRegex: wait.urlRegex,
+                        exactUrl: wait.exactUrl,
+                        tabId: wait.tabId,
+                    },
+                    lastObserved: payload.lastObserved,
+                    candidateCount: typeof payload.observedEventCount === 'number' ? payload.observedEventCount : undefined,
+                }),
+        },
+        error: matched
+            ? undefined
+            : {
+                code: 'navigation_lifecycle_wait_timeout',
+                message: 'Timed out waiting for a matching navigation lifecycle event.',
+            },
+    };
+}
+async function waitForDownloadCondition(sessionId, wait, captureClient) {
+    const timeoutMs = resolveTimeoutMs(wait.timeoutMs, 5_000, MAX_NETWORK_POLL_TIMEOUT_MS);
+    const startedAt = Date.now();
+    const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_WAIT_FOR_DOWNLOAD', {
+        urlContains: wait.urlContains,
+        urlRegex: wait.urlRegex,
+        exactUrl: wait.exactUrl,
+        filenameContains: wait.filenameContains,
+        filenameRegex: wait.filenameRegex,
+        state: wait.state,
+        tabId: wait.tabId,
+        timeoutMs,
+    }, timeoutMs + 2_000);
+    const payload = ensureCaptureSuccess(capture, sessionId);
+    const matched = payload.matched === true;
+    return {
+        waitKind: 'download',
+        matched,
+        waitedMs: Date.now() - startedAt,
+        attempts: 1,
+        timeoutMs,
+        pollIntervalMs: timeoutMs,
+        evidence: {
+            filters: {
+                urlContains: wait.urlContains,
+                urlRegex: wait.urlRegex,
+                exactUrl: wait.exactUrl,
+                filenameContains: wait.filenameContains,
+                filenameRegex: wait.filenameRegex,
+                state: wait.state,
+                tabId: wait.tabId,
+            },
+            download: matched ? payload : undefined,
+            expected: matched ? undefined : payload.expected ?? wait,
+            timeoutDiagnostics: matched
+                ? undefined
+                : buildWaitTimeoutDiagnostics({
+                    waitKind: 'download',
+                    timeoutMs,
+                    waitedMs: Date.now() - startedAt,
+                    attempts: 1,
+                    pollIntervalMs: timeoutMs,
+                    matcherSummary: {
+                        urlContains: wait.urlContains,
+                        urlRegex: wait.urlRegex,
+                        exactUrl: wait.exactUrl,
+                        filenameContains: wait.filenameContains,
+                        filenameRegex: wait.filenameRegex,
+                        state: wait.state,
+                        tabId: wait.tabId,
+                    },
+                    lastObserved: payload.lastObserved ?? payload.lastMatchedDownload,
+                    candidateCount: typeof payload.observedEventCount === 'number' ? payload.observedEventCount : undefined,
+                }),
+        },
+        error: matched
+            ? undefined
+            : {
+                code: 'download_wait_timeout',
+                message: 'Timed out waiting for a matching download.',
+            },
+    };
+}
+async function waitForPopupCondition(sessionId, wait, captureClient) {
+    const timeoutMs = resolveTimeoutMs(wait.timeoutMs, 5_000, MAX_NETWORK_POLL_TIMEOUT_MS);
+    const startedAt = Date.now();
+    const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_WAIT_FOR_POPUP', {
+        urlContains: wait.urlContains,
+        urlRegex: wait.urlRegex,
+        exactUrl: wait.exactUrl,
+        openerTabId: wait.openerTabId,
+        timeoutMs,
+    }, timeoutMs + 2_000);
+    const payload = ensureCaptureSuccess(capture, sessionId);
+    const matched = payload.matched === true;
+    return {
+        waitKind: 'popup',
+        matched,
+        waitedMs: Date.now() - startedAt,
+        attempts: 1,
+        timeoutMs,
+        pollIntervalMs: timeoutMs,
+        evidence: {
+            filters: {
+                urlContains: wait.urlContains,
+                urlRegex: wait.urlRegex,
+                exactUrl: wait.exactUrl,
+                openerTabId: wait.openerTabId,
+            },
+            popup: matched ? payload : undefined,
+            expected: matched ? undefined : payload.expected ?? wait,
+            timeoutDiagnostics: matched
+                ? undefined
+                : buildWaitTimeoutDiagnostics({
+                    waitKind: 'popup',
+                    timeoutMs,
+                    waitedMs: Date.now() - startedAt,
+                    attempts: 1,
+                    pollIntervalMs: timeoutMs,
+                    matcherSummary: {
+                        urlContains: wait.urlContains,
+                        urlRegex: wait.urlRegex,
+                        exactUrl: wait.exactUrl,
+                        openerTabId: wait.openerTabId,
+                    },
+                    lastObserved: payload.lastObserved,
+                    candidateCount: typeof payload.observedPopupCount === 'number' ? payload.observedPopupCount : undefined,
+                    sampledCandidates: Array.isArray(payload.pendingTabIds) ? payload.pendingTabIds : undefined,
+                }),
+        },
+        error: matched
+            ? undefined
+            : {
+                code: 'popup_wait_timeout',
+                message: 'Timed out waiting for a matching popup tab.',
+            },
+    };
+}
+function normalizeNetworkWaitFilters(wait) {
+    const responseWait = wait.waitKind === 'response' ? wait : undefined;
+    return {
+        urlContains: normalizeOptionalString(wait.urlContains),
+        urlRegex: normalizeOptionalString(wait.urlRegex),
+        exactUrl: normalizeOptionalString(wait.exactUrl),
+        method: normalizeHttpMethod(wait.method),
+        traceId: normalizeOptionalString(wait.traceId),
+        initiator: normalizeOptionalString(wait.initiator),
+        requestContentType: normalizeOptionalString(wait.requestContentType),
+        responseContentType: normalizeOptionalString(responseWait?.responseContentType),
+        statusIn: responseWait ? normalizeStatusIn(responseWait.statusIn) : [],
+        statusGte: responseWait?.statusGte,
+        statusLt: responseWait?.statusLt,
+        errorType: normalizeOptionalString(responseWait?.errorType),
+        sinceTs: resolveAutomationWaitSinceTs(wait.sinceTs),
+        tabId: resolveOptionalTabId(wait.tabId),
+        includeBodies: wait.includeBodies === true,
+    };
+}
+function queryNetworkWaitCandidates(db, sessionId, filters) {
+    const where = ['session_id = ?', 'ts_start >= ?'];
+    const params = [sessionId, filters.sinceTs];
+    if (filters.exactUrl) {
+        where.push('url = ?');
+        params.push(filters.exactUrl);
+    }
+    else if (filters.urlContains) {
+        where.push('url LIKE ?');
+        params.push(`%${filters.urlContains}%`);
+    }
+    if (filters.method) {
+        where.push('method = ?');
+        params.push(filters.method);
+    }
+    if (filters.traceId) {
+        where.push('trace_id = ?');
+        params.push(filters.traceId);
+    }
+    if (filters.initiator) {
+        where.push('initiator = ?');
+        params.push(filters.initiator);
+    }
+    if (filters.requestContentType) {
+        where.push('request_content_type LIKE ?');
+        params.push(`%${filters.requestContentType}%`);
+    }
+    if (filters.responseContentType) {
+        where.push('response_content_type LIKE ?');
+        params.push(`%${filters.responseContentType}%`);
+    }
+    const statusIn = Array.isArray(filters.statusIn) ? filters.statusIn : [];
+    if (statusIn.length > 0) {
+        where.push(`status IN (${statusIn.map(() => '?').join(', ')})`);
+        params.push(...statusIn);
+    }
+    if (typeof filters.statusGte === 'number') {
+        where.push('status >= ?');
+        params.push(filters.statusGte);
+    }
+    if (typeof filters.statusLt === 'number') {
+        where.push('status < ?');
+        params.push(filters.statusLt);
+    }
+    if (filters.tabId !== undefined) {
+        where.push('tab_id = ?');
+        params.push(filters.tabId);
+    }
+    return db.prepare(`SELECT ${NETWORK_CALL_SELECT_COLUMNS}
+     FROM network
+     WHERE ${where.join(' AND ')}
+     ORDER BY ts_start ASC
+     LIMIT 200`).all(...params);
+}
+function networkCallMatchesFilters(row, filters) {
+    if (!matchesUrlPredicates(row.url, {
+        exactUrl: typeof filters.exactUrl === 'string' ? filters.exactUrl : undefined,
+        urlContains: typeof filters.urlContains === 'string' ? filters.urlContains : undefined,
+        urlRegex: typeof filters.urlRegex === 'string' ? filters.urlRegex : undefined,
+    })) {
+        return false;
+    }
+    if (typeof filters.errorType === 'string' && classifyNetworkFailure(row.status, row.error_class) !== filters.errorType) {
+        return false;
+    }
+    return true;
+}
+async function waitForNetworkMatchCondition(sessionId, wait, db) {
+    const timeoutMs = resolveTimeoutMs(wait.timeoutMs, DEFAULT_NETWORK_POLL_TIMEOUT_MS, MAX_NETWORK_POLL_TIMEOUT_MS);
+    const pollIntervalMs = resolveDurationMs(wait.pollIntervalMs, DEFAULT_NETWORK_POLL_INTERVAL_MS, 5_000);
+    const filters = normalizeNetworkWaitFilters(wait);
+    const startedAt = Date.now();
+    const deadline = startedAt + timeoutMs;
+    let attempts = 0;
+    let lastCalls = [];
+    while (Date.now() <= deadline) {
+        attempts += 1;
+        lastCalls = queryNetworkWaitCandidates(db, sessionId, filters);
+        const matched = lastCalls.find((row) => networkCallMatchesFilters(row, filters));
+        if (matched) {
+            return {
+                waitKind: wait.waitKind,
+                matched: true,
+                waitedMs: Date.now() - startedAt,
+                attempts,
+                timeoutMs,
+                pollIntervalMs,
+                evidence: {
+                    filters,
+                    call: mapNetworkCallRecord(matched, filters.includeBodies === true),
+                },
+            };
+        }
+        await sleep(pollIntervalMs);
+    }
+    return {
+        waitKind: wait.waitKind,
+        matched: false,
+        waitedMs: Date.now() - startedAt,
+        attempts,
+        timeoutMs,
+        pollIntervalMs,
+        evidence: {
+            filters,
+            sampledCalls: lastCalls.slice(0, 5).map((row) => mapNetworkCallRecord(row, false)),
+            timeoutDiagnostics: buildWaitTimeoutDiagnostics({
+                waitKind: wait.waitKind,
+                timeoutMs,
+                waitedMs: Date.now() - startedAt,
+                attempts,
+                pollIntervalMs,
+                matcherSummary: filters,
+                lastObserved: lastCalls.length > 0 ? mapNetworkCallRecord(lastCalls[lastCalls.length - 1], false) : undefined,
+                candidateCount: lastCalls.length,
+                sampledCandidates: lastCalls.slice(0, 5).map((row) => mapNetworkCallRecord(row, false)),
+            }),
+        },
+        error: {
+            code: wait.waitKind === 'request' ? 'request_wait_timeout' : 'response_wait_timeout',
+            message: `Timed out waiting for a matching ${wait.waitKind}.`,
+        },
+    };
+}
+function queryRecentNetworkActivity(db, options) {
+    const where = ['session_id = ?', 'ts_start >= ?'];
+    const params = [options.sessionId, options.sinceTs];
+    if (options.urlContains) {
+        where.push('url LIKE ?');
+        params.push(`%${options.urlContains}%`);
+    }
+    if (options.method) {
+        where.push('method = ?');
+        params.push(options.method);
+    }
+    if (options.tabId !== undefined) {
+        where.push('tab_id = ?');
+        params.push(options.tabId);
+    }
+    return db.prepare(`SELECT ${NETWORK_CALL_SELECT_COLUMNS}
+     FROM network
+     WHERE ${where.join(' AND ')}
+     ORDER BY ts_start DESC
+     LIMIT 10`).all(...params);
+}
+async function waitForNetworkQuietCondition(sessionId, wait, db) {
+    const timeoutMs = resolveTimeoutMs(wait.timeoutMs, DEFAULT_NETWORK_POLL_TIMEOUT_MS, MAX_NETWORK_POLL_TIMEOUT_MS);
+    const pollIntervalMs = resolveDurationMs(wait.pollIntervalMs, DEFAULT_NETWORK_POLL_INTERVAL_MS, 5_000);
+    const quietMs = resolveDurationMs(wait.quietMs, 500, 10_000);
+    const urlContains = normalizeOptionalString(wait.urlContains);
+    const method = normalizeHttpMethod(wait.method);
+    const tabId = resolveOptionalTabId(wait.tabId);
+    const startedAt = Date.now();
+    const deadline = startedAt + timeoutMs;
+    let attempts = 0;
+    let lastActivityAt = startedAt;
+    let lastCalls = [];
+    while (Date.now() <= deadline) {
+        attempts += 1;
+        const rows = queryRecentNetworkActivity(db, {
+            sessionId,
+            sinceTs: lastActivityAt + 1,
+            urlContains,
+            method,
+            tabId,
+        });
+        if (rows.length > 0) {
+            lastCalls = rows;
+            lastActivityAt = Math.max(...rows.map((row) => row.ts_start), Date.now());
+        }
+        if (Date.now() - lastActivityAt >= quietMs) {
+            return {
+                waitKind: 'network_quiet',
+                matched: true,
+                waitedMs: Date.now() - startedAt,
+                attempts,
+                timeoutMs,
+                pollIntervalMs,
+                evidence: {
+                    quietMs,
+                    filters: { urlContains, method, tabId },
+                    lastActivityAt,
+                    sampledCalls: lastCalls.slice(0, 5).map((row) => mapNetworkCallRecord(row, false)),
+                },
+            };
+        }
+        await sleep(pollIntervalMs);
+    }
+    return {
+        waitKind: 'network_quiet',
+        matched: false,
+        waitedMs: Date.now() - startedAt,
+        attempts,
+        timeoutMs,
+        pollIntervalMs,
+        evidence: {
+            quietMs,
+            filters: { urlContains, method, tabId },
+            lastActivityAt,
+            sampledCalls: lastCalls.slice(0, 5).map((row) => mapNetworkCallRecord(row, false)),
+            timeoutDiagnostics: buildWaitTimeoutDiagnostics({
+                waitKind: 'network_quiet',
+                timeoutMs,
+                waitedMs: Date.now() - startedAt,
+                attempts,
+                pollIntervalMs,
+                matcherSummary: { quietMs, urlContains, method, tabId },
+                lastObserved: lastCalls.length > 0 ? mapNetworkCallRecord(lastCalls[0], false) : undefined,
+                candidateCount: lastCalls.length,
+                sampledCandidates: lastCalls.slice(0, 5).map((row) => mapNetworkCallRecord(row, false)),
+            }),
+        },
+        error: {
+            code: 'network_quiet_timeout',
+            message: `Timed out waiting for ${quietMs}ms of quiet network activity.`,
+        },
     };
 }
-function pickWorkflowTargetItems(payload, scope) {
-    if (scope) {
-        return pickPageStateScopeItems(payload, scope);
-    }
-    return [
-        ...pickPageStateScopeItems(payload, 'buttons'),
-        ...pickPageStateScopeItems(payload, 'inputs'),
-        ...pickPageStateScopeItems(payload, 'modals'),
-        ...pickPageStateScopeItems(payload, 'focused'),
-    ];
-}
-function matchesWorkflowActionTarget(item, target) {
-    return (equalsNormalized(item.testId, target.testId)
-        && includesNormalized(item.text, target.textContains)
-        && includesNormalized(item.label, target.labelContains)
-        && includesNormalized(item.title, target.titleContains)
-        && equalsNormalized(item.tagName, target.tagName)
-        && equalsNormalized(item.type, target.type)
-        && equalsOptionalBoolean(item.disabled, target.disabled)
-        && equalsOptionalBoolean(item.selected, target.selected)
-        && equalsOptionalBoolean(item.pressed, target.pressed)
-        && equalsOptionalBoolean(item.expanded, target.expanded)
-        && equalsOptionalBoolean(item.readOnly, target.readOnly)
-        && equalsOptionalBoolean(item.required, target.requiredField)
-        && (typeof item.elementRef === 'string' || typeof item.selector === 'string'));
-}
-function summarizeWorkflowTargetMatcher(target) {
-    return {
-        scope: target.scope,
-        selector: target.selector,
-        elementRef: target.elementRef,
-        testId: target.testId,
-        textContains: target.textContains,
-        labelContains: target.labelContains,
-        titleContains: target.titleContains,
-        tagName: target.tagName,
-        type: target.type,
-        disabled: target.disabled,
-        selected: target.selected,
-        pressed: target.pressed,
-        expanded: target.expanded,
-        readOnly: target.readOnly,
-        requiredField: target.requiredField,
-    };
+async function runAutomationWait(options) {
+    switch (options.wait.waitKind) {
+        case 'url':
+            return waitForUrlCondition(options.sessionId, options.wait, options.capturePageState);
+        case 'navigation': {
+            const db = options.getDb?.();
+            if (!db) {
+                throw new Error('navigation waits require database access');
+            }
+            return waitForNavigationCondition(options.sessionId, options.wait, db);
+        }
+        case 'navigation_lifecycle':
+            return waitForNavigationLifecycleCondition(options.sessionId, options.wait, options.captureClient);
+        case 'load_state':
+            return waitForLoadStateCondition(options.sessionId, options.wait, options.capturePageState);
+        case 'selector_state':
+            return waitForSelectorStateCondition(options.sessionId, options.wait, options.captureClient);
+        case 'console':
+            return waitForConsoleCondition(options.sessionId, options.wait, options.captureClient);
+        case 'dialog':
+            return waitForDialogCondition(options.sessionId, options.wait, options.captureClient);
+        case 'stable_layout':
+            return waitForStableLayoutCondition(options.sessionId, options.wait, options.captureClient);
+        case 'download':
+            return waitForDownloadCondition(options.sessionId, options.wait, options.captureClient);
+        case 'popup':
+            return waitForPopupCondition(options.sessionId, options.wait, options.captureClient);
+        case 'network_quiet': {
+            const db = options.getDb?.();
+            if (!db) {
+                throw new Error('network_quiet waits require database access');
+            }
+            return waitForNetworkQuietCondition(options.sessionId, options.wait, db);
+        }
+        case 'request':
+        case 'response': {
+            const db = options.getDb?.();
+            if (!db) {
+                throw new Error(`${options.wait.waitKind} waits require database access`);
+            }
+            return waitForNetworkMatchCondition(options.sessionId, options.wait, db);
+        }
+    }
 }
-async function resolveWorkflowActionTarget(sessionId, target, capturePageState, existingCapture) {
-    if (!target) {
+function getSessionRow(db, sessionId) {
+    return db.prepare(`
+    SELECT
+      session_id,
+      created_at,
+      last_seen_at,
+      paused_at,
+      ended_at,
+      tab_id,
+      window_id,
+      url_start,
+      url_last,
+      user_agent,
+      viewport_w,
+      viewport_h,
+      dpr,
+      safe_mode,
+      pinned
+    FROM sessions
+    WHERE session_id = ?
+    LIMIT 1
+  `).get(sessionId);
+}
+function looksSensitiveText(value) {
+    return typeof value === 'string'
+        && /(password|passwd|pwd|token|secret|auth|session|email|card|cvv|cvc|ssn|iban|payment|billing)/i.test(value);
+}
+function isSensitivePageInput(input) {
+    const type = typeof input.type === 'string' ? input.type.toLowerCase() : '';
+    return type === 'password'
+        || looksSensitiveText(input.selector)
+        || looksSensitiveText(input.label)
+        || looksSensitiveText(input.name)
+        || looksSensitiveText(input.placeholder)
+        || looksSensitiveText(input.testId);
+}
+function collectAutomationPageRisks(payload) {
+    if (!payload) {
         return {
-            resolution: {
-                strategy: 'none',
-            },
+            sensitiveInputs: [],
+            frameCount: 0,
+            crossOriginFrameCount: 0,
         };
     }
-    if (target.elementRef || target.selector) {
-        return {
-            target: {
-                elementRef: target.elementRef,
-                selector: target.selector,
-                tabId: target.tabId,
-                frameId: target.frameId,
-                url: target.url,
-            },
-            resolution: {
-                strategy: target.elementRef ? 'elementRef' : 'selector',
-                matcher: summarizeWorkflowTargetMatcher(target),
-            },
+    const inputs = asRecordArray(payload.inputs);
+    const frames = asRecordArray(payload.frames);
+    const sensitiveInputs = inputs
+        .filter(isSensitivePageInput)
+        .slice(0, 8)
+        .map((input) => ({
+        selector: input.selector,
+        type: input.type,
+        label: input.label,
+        name: input.name,
+        placeholder: input.placeholder,
+        frameId: input.frameId,
+        frameUrl: input.frameUrl,
+    }));
+    const crossOriginFrames = frames
+        .filter((frame) => frame.sameOrigin === false || frame.accessible === false || frame.crossOrigin === true)
+        .slice(0, 8)
+        .map((frame) => ({
+        frameId: frame.frameId,
+        url: frame.url ?? frame.frameUrl,
+        title: frame.title ?? frame.frameTitle,
+        sameOrigin: frame.sameOrigin,
+        accessible: frame.accessible,
+    }));
+    return {
+        sensitiveInputs,
+        sensitiveInputCount: sensitiveInputs.length,
+        frameCount: frames.length,
+        crossOriginFrameCount: crossOriginFrames.length,
+        crossOriginFrames,
+    };
+}
+async function buildAutomationFlowPreflight(options) {
+    const blockers = [];
+    const warnings = [];
+    const includePageState = options.input.includePageState !== false;
+    const expectedUrlContains = normalizeOptionalString(options.input.expectedUrlContains);
+    const requireSensitiveAutomation = options.input.requireSensitiveAutomation === true;
+    const plannedActions = Array.isArray(options.input.plannedActions)
+        ? options.input.plannedActions.filter((entry) => typeof entry === 'string' && entry.trim().length > 0)
+        : [];
+    const db = options.getDb?.();
+    const session = db ? getSessionRow(db, options.sessionId) : undefined;
+    const sessionState = options.getSessionConnectionState?.(options.sessionId);
+    const hasLiveConnectionLookup = typeof options.getSessionConnectionState === 'function';
+    const scope = classifySessionUrl(session?.url_last ?? undefined);
+    const liveConnection = session
+        ? buildLiveConnectionRecord(session, scope, sessionState)
+        : {
+            connected: sessionState?.connected === true,
+            status: sessionState?.connected === true ? 'connected' : 'unknown',
+            recommendedForLiveCapture: false,
         };
+    if (!db) {
+        warnings.push({
+            code: 'DB_UNAVAILABLE',
+            severity: 'warning',
+            source: 'server',
+            message: 'Database access was not available; session history checks were skipped.',
+        });
     }
-    const capture = existingCapture ?? await capturePageState(sessionId, {
-        includeButtons: target.scope ? target.scope === 'buttons' : true,
-        includeInputs: target.scope ? target.scope === 'inputs' : true,
-        includeModals: target.scope ? target.scope === 'modals' : true,
-        maxItems: 100,
-        maxTextLength: 120,
-    });
-    const candidates = pickWorkflowTargetItems(capture.payload, target.scope)
-        .filter((item) => matchesWorkflowActionTarget(item, target));
-    if (candidates.length === 0) {
-        throw new WorkflowTargetResolutionError('workflow_target_not_found', 'No interactive element matched the workflow target.', {
-            matcher: summarizeWorkflowTargetMatcher(target),
-            searchedScope: target.scope ?? 'all-interactive',
-            sampledCandidates: pickWorkflowTargetItems(capture.payload, target.scope)
-                .slice(0, 5)
-                .map((item) => describeWorkflowTargetCandidate(item)),
+    if (!session) {
+        blockers.push({
+            code: 'SESSION_NOT_FOUND',
+            severity: 'error',
+            source: 'session',
+            message: `Session not found: ${options.sessionId}`,
+        });
+    }
+    else {
+        const status = getSessionStatus(session);
+        if (status === 'paused') {
+            blockers.push({
+                code: 'SESSION_PAUSED',
+                severity: 'error',
+                source: 'session',
+                message: 'Resume the session before running an automation flow.',
+            });
+        }
+        if (status === 'ended') {
+            blockers.push({
+                code: 'SESSION_ENDED',
+                severity: 'error',
+                source: 'session',
+                message: 'Start a new session before running an automation flow.',
+            });
+        }
+        if (scope.kind === 'likely_iframe_noise') {
+            blockers.push({
+                code: 'SESSION_SCOPE_NOISE',
+                severity: 'error',
+                source: 'session',
+                message: 'The selected session appears to be bound to iframe/ad traffic rather than the app surface.',
+            });
+        }
+        if (scope.kind === 'top_level_page' && scope.isLocalhost !== true) {
+            warnings.push({
+                code: 'PRODUCTION_OR_REMOTE_ORIGIN',
+                severity: 'warning',
+                source: 'session',
+                message: 'The current session URL is remote/production-like. Keep the flow scoped and avoid destructive actions.',
+                origin: scope.origin,
+            });
+        }
+        if (expectedUrlContains && !String(session.url_last ?? '').includes(expectedUrlContains)) {
+            blockers.push({
+                code: 'EXPECTED_URL_MISMATCH',
+                severity: 'error',
+                source: 'session',
+                message: `Current session URL does not include "${expectedUrlContains}".`,
+                currentUrl: session.url_last,
+            });
+        }
+    }
+    if (hasLiveConnectionLookup && (!sessionState || sessionState.connected !== true)) {
+        blockers.push({
+            code: LIVE_SESSION_DISCONNECTED_CODE,
+            severity: 'error',
+            source: 'connection',
+            message: 'The session is not currently connected to a live extension target.',
+            disconnectedAt: sessionState?.disconnectedAt,
+            disconnectReason: sessionState?.disconnectReason,
+        });
+    }
+    let pageCapture;
+    if (includePageState && blockers.length === 0) {
+        try {
+            pageCapture = await options.capturePageState(options.sessionId, {
+                includeButtons: true,
+                includeLinks: true,
+                includeInputs: true,
+                includeModals: true,
+                maxItems: resolveLimit(options.input.maxItems, 40),
+                maxTextLength: resolveDurationMs(options.input.maxTextLength, 80, 200),
+            });
+        }
+        catch (error) {
+            blockers.push({
+                code: isLiveSessionDisconnectedError(error) ? LIVE_SESSION_DISCONNECTED_CODE : 'PAGE_STATE_CAPTURE_FAILED',
+                severity: 'error',
+                source: 'page-state',
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+    const pageRisks = collectAutomationPageRisks(pageCapture?.payload);
+    const sensitiveInputs = Array.isArray(pageRisks.sensitiveInputs) ? pageRisks.sensitiveInputs : [];
+    const hasInputLikeAction = plannedActions.some((action) => ['input', 'type', 'clear', 'select_option', 'press_key'].includes(action));
+    if (sensitiveInputs.length > 0 && (requireSensitiveAutomation || hasInputLikeAction)) {
+        warnings.push({
+            code: 'SENSITIVE_FIELD_AUTOMATION_RISK',
+            severity: 'warning',
+            source: 'page-state',
+            message: 'Sensitive-looking fields are present. The extension sensitive-field opt-in may be required before input-like actions.',
+            count: sensitiveInputs.length,
+            sampledInputs: sensitiveInputs,
         });
     }
-    if (candidates.length > 1) {
-        throw new WorkflowTargetResolutionError('workflow_target_ambiguous', `Workflow target matched ${candidates.length} elements; refine the matcher.`, {
-            matcher: summarizeWorkflowTargetMatcher(target),
-            matchedCandidateCount: candidates.length,
-            sampledCandidates: candidates.slice(0, 5).map((item) => describeWorkflowTargetCandidate(item)),
+    if (typeof pageRisks.crossOriginFrameCount === 'number' && pageRisks.crossOriginFrameCount > 0) {
+        warnings.push({
+            code: 'CROSS_ORIGIN_FRAME_PRESENT',
+            severity: 'warning',
+            source: 'page-state',
+            message: 'Cross-origin or inaccessible frames are present. Automation inside those frames may be diagnostic-only.',
+            count: pageRisks.crossOriginFrameCount,
+            frames: pageRisks.crossOriginFrames,
         });
     }
-    const candidate = candidates[0];
+    const ready = blockers.length === 0;
     return {
-        target: {
-            elementRef: typeof candidate.elementRef === 'string' ? candidate.elementRef : undefined,
-            selector: typeof candidate.selector === 'string' ? candidate.selector : undefined,
-            tabId: target.tabId,
-            frameId: target.frameId,
-            url: target.url,
-        },
-        resolution: {
-            strategy: typeof candidate.elementRef === 'string' ? 'semantic_elementRef' : 'semantic_selector',
-            matcher: summarizeWorkflowTargetMatcher(target),
-            matchedCandidateCount: candidates.length,
-            matched: describeWorkflowTargetCandidate(candidate),
-        },
-        pageCapture: capture,
+        ready,
+        blockers,
+        warnings,
+        checks: {
+            sessionFound: Boolean(session),
+            liveConnected: sessionState?.connected === true || (hasLiveConnectionLookup ? false : undefined),
+            recommendedForLiveCapture: liveConnection.recommendedForLiveCapture,
+            expectedUrlMatched: expectedUrlContains ? blockers.every((blocker) => blocker.code !== 'EXPECTED_URL_MISMATCH') : undefined,
+            pageStateCaptured: pageCapture !== undefined,
+            remoteOrProductionLike: scope.kind === 'top_level_page' && scope.isLocalhost !== true,
+            sensitiveInputCount: sensitiveInputs.length,
+            crossOriginFrameCount: pageRisks.crossOriginFrameCount,
+        },
+        session: session
+            ? {
+                sessionId: session.session_id,
+                status: getSessionStatus(session),
+                tabId: session.tab_id ?? undefined,
+                windowId: session.window_id ?? undefined,
+                urlStart: session.url_start ?? undefined,
+                urlLast: session.url_last ?? undefined,
+                lastSeenAt: resolveSessionLastSeenAt(session, sessionState),
+                safeMode: session.safe_mode === 1,
+            }
+            : undefined,
+        scope,
+        liveConnection,
+        page: pageCapture
+            ? {
+                url: pageCapture.payload.url,
+                title: pageCapture.payload.title,
+                language: pageCapture.payload.language,
+                viewport: pageCapture.payload.viewport,
+                summary: pageCapture.payload.summary,
+            }
+            : undefined,
+        detectedRisks: pageRisks,
+        nextActions: ready
+            ? [{ code: 'RUN_FLOW', message: 'Run the automation flow with bounded waits and failure capture enabled.' }]
+            : blockers.map((blocker) => ({
+                code: String(blocker.code ?? 'FIX_BLOCKER'),
+                message: String(blocker.message ?? 'Resolve this preflight blocker before running the flow.'),
+            })),
     };
 }
 function createWorkflowStepId(step, index) {
@@ -3004,6 +5306,7 @@ async function captureWorkflowPageState(sessionId, capturePageState, mode) {
     const maxTextLength = mode === 'fast' ? 60 : 80;
     return capturePageState(sessionId, {
         includeButtons: true,
+        includeLinks: true,
         includeInputs: true,
         includeModals: true,
         maxItems,
@@ -3058,6 +5361,20 @@ function resolveWorkflowRecommendedAction(error) {
     if (error.code === 'page_state_not_matched' || error.code === 'page_state_assertion_failed') {
         return 'inspect_page_state';
     }
+    if (error.code === 'url_wait_timeout' || error.code === 'navigation_wait_timeout') {
+        return 'inspect_navigation_state';
+    }
+    if (error.code === 'selector_state_wait_timeout') {
+        return 'inspect_selector_state';
+    }
+    if (error.code === 'console_wait_timeout') {
+        return 'inspect_live_console_logs';
+    }
+    if (error.code === 'network_quiet_timeout'
+        || error.code === 'request_wait_timeout'
+        || error.code === 'response_wait_timeout') {
+        return 'inspect_network_calls';
+    }
     return undefined;
 }
 function resolveWorkflowFailureSelector(step, stepResultTarget) {
@@ -3156,6 +5473,66 @@ function normalizeCaptureError(sessionId, error) {
     }
     return fallback;
 }
+function isCaptureTimeoutMessage(message) {
+    const normalized = message.toLowerCase();
+    return normalized.includes('timed out') || normalized.includes('timeout');
+}
+function isRecoverableOverrideLiveCommandError(error) {
+    if (isLiveSessionDisconnectedError(error)) {
+        return true;
+    }
+    const message = error instanceof Error ? error.message : String(error);
+    return isCaptureTimeoutMessage(message);
+}
+function extractTimeoutMsFromMessage(message, fallback) {
+    const match = message.match(/(?:after|waiting)\s+(\d+)ms/i);
+    if (!match) {
+        return fallback;
+    }
+    const parsed = Number.parseInt(match[1] ?? '', 10);
+    return Number.isFinite(parsed) ? parsed : fallback;
+}
+function buildOverrideLiveCommandFailure(options) {
+    const originalMessage = options.error instanceof Error ? options.error.message : String(options.error);
+    const timeout = extractTimeoutMsFromMessage(originalMessage, options.timeoutMs);
+    const timedOut = isCaptureTimeoutMessage(originalMessage);
+    const disconnected = isLiveSessionDisconnectedError(options.error);
+    const sessionState = options.getSessionConnectionState?.(options.sessionId);
+    const code = disconnected
+        ? LIVE_SESSION_DISCONNECTED_CODE
+        : timedOut
+            ? OVERRIDE_LIVE_COMMAND_TIMEOUT_CODE
+            : OVERRIDE_LIVE_COMMAND_FAILED_CODE;
+    const message = timedOut
+        ? `${options.command} for session ${options.sessionId} timed out after ${timeout}ms before the live extension returned an override command result.`
+        : disconnected
+            ? `${options.command} for session ${options.sessionId} could not reach a connected live extension target.`
+            : `${options.command} for session ${options.sessionId} failed before returning an override command result.`;
+    return {
+        ok: false,
+        available: false,
+        code,
+        command: options.command,
+        timeoutMs: timeout,
+        timedOut,
+        disconnected,
+        message,
+        originalMessage,
+        sessionConnected: sessionState?.connected,
+        disconnectedAt: sessionState?.disconnectedAt,
+        disconnectReason: sessionState?.disconnectReason,
+    };
+}
+function createOverrideLiveCommandError(options) {
+    const failure = buildOverrideLiveCommandFailure(options);
+    const code = String(failure.code ?? OVERRIDE_LIVE_COMMAND_FAILED_CODE);
+    const message = `${code}: ${options.command} for session ${options.sessionId} ${failure.timedOut === true
+        ? `timed out after ${String(failure.timeoutMs)}ms`
+        : `failed`}. ${String(failure.message ?? '')} Original error: ${String(failure.originalMessage ?? 'unknown')}`;
+    const error = new Error(message);
+    Object.assign(error, { code, details: failure });
+    return error;
+}
 function isLiveSessionDisconnectedError(error) {
     return error instanceof LiveSessionDisconnectedError;
 }
@@ -3167,12 +5544,99 @@ async function executeLiveCapture(captureClient, sessionId, command, payload, ti
         throw normalizeCaptureError(sessionId, error);
     }
 }
+async function executeOverrideLiveCaptureWithDiagnostics(options) {
+    try {
+        const capture = await executeLiveCapture(options.captureClient, options.sessionId, options.command, options.payload, options.timeoutMs);
+        return { capture, payload: ensureCaptureSuccess(capture, options.sessionId) };
+    }
+    catch (error) {
+        throw createOverrideLiveCommandError({
+            sessionId: options.sessionId,
+            command: options.command,
+            timeoutMs: options.timeoutMs,
+            error,
+            getSessionConnectionState: options.getSessionConnectionState,
+        });
+    }
+}
 function ensureCaptureSuccess(result, sessionId) {
     if (!result.ok) {
         throw normalizeCaptureError(sessionId, new Error(result.error ?? 'Capture command failed'));
     }
     return result.payload ?? {};
 }
+async function refreshObservedAssetsForOverrideEnable(options) {
+    const { payload } = await executeOverrideLiveCaptureWithDiagnostics({
+        captureClient: options.captureClient,
+        sessionId: options.sessionId,
+        command: 'CAPTURE_OVERRIDE_OBSERVE_ASSETS',
+        payload: { tabId: options.tabId, includePerformance: true },
+        timeoutMs: 5_000,
+        getSessionConnectionState: options.getSessionConnectionState,
+    });
+    persistObservedOverrideAssets(options.db, {
+        ...payload,
+        sessionId: options.sessionId,
+        tabId: payload.tabId ?? options.tabId,
+    });
+    return {
+        tabId: typeof payload.tabId === 'number' ? payload.tabId : options.tabId,
+        pageUrl: typeof payload.pageUrl === 'string' ? payload.pageUrl : undefined,
+        assetCount: Array.isArray(payload.assets) ? payload.assets.length : 0,
+    };
+}
+function buildPersistedOverrideStatus(options) {
+    let profile = null;
+    let profileError;
+    try {
+        profile = resolveOverrideProfileRecord(options.profileId);
+    }
+    catch (error) {
+        profileError = error instanceof Error ? error.message : String(error);
+    }
+    const latestRun = listOverridePocRuns(options.db, options.sessionId, 1, 0).runs[0] ?? null;
+    const recentRequests = listOverridePocRequests(options.db, options.sessionId, 5, 0, latestRun?.runId).requests;
+    const recentPlans = listOverridePlanAudits(options.db, { sessionId: options.sessionId, limit: 5, offset: 0 }).plans;
+    let preflight;
+    if (profileError) {
+        preflight = {
+            ready: false,
+            profileId: null,
+            profile: null,
+            issues: [{
+                    code: 'OVERRIDE_CONFIG_UNAVAILABLE',
+                    severity: 'error',
+                    source: 'profile',
+                    message: profileError,
+                }],
+            checks: {
+                sessionFound: auditSessionExists(options.db, options.sessionId),
+                connected: options.getSessionConnectionState?.(options.sessionId)?.connected === true,
+            },
+            nextActions: [{
+                    code: 'FIX_OVERRIDE_CONFIG_PATH',
+                    message: 'Create a readable override-poc config or point OVERRIDE_POC_CONFIG_PATH at the intended config, then retry override status.',
+                }],
+        };
+    }
+    else {
+        preflight = buildOverridePreflight({
+            db: options.db,
+            sessionId: options.sessionId,
+            profileId: options.profileId,
+            getSessionConnectionState: options.getSessionConnectionState,
+        });
+    }
+    return {
+        profile,
+        profileError,
+        latestRun,
+        recentRequests,
+        recentPlans,
+        preflight,
+        diagnosis: diagnoseOverridePoc(options.db, options.sessionId, latestRun?.runId),
+    };
+}
 function auditSessionExists(db, sessionId) {
     const row = db.prepare('SELECT 1 FROM sessions WHERE session_id = ? LIMIT 1').get(sessionId);
     return row !== undefined;
@@ -3655,15 +6119,17 @@ export function createV1ToolHandlers(getDb, getSessionConnectionState) {
                 recommendedAction,
             };
         },
-        list_override_profiles: async () => {
+        list_override_profiles: async (input) => {
             const profiles = buildOverrideProfileRecords();
+            const responseProfile = resolveOverrideResponseProfile(input.responseProfile);
             return {
                 ...createBaseResponse(),
                 limitsApplied: {
                     maxResults: profiles.length,
                     truncated: false,
                 },
-                profiles,
+                responseProfile,
+                profiles: profiles.map((profile) => serializeOverrideProfile(profile, responseProfile)),
                 nextActions: profiles.length > 0
                     ? [{ code: 'VALIDATE_PROFILE', message: 'Run validate_override_profile before enabling overrides.' }]
                     : [{ code: 'CREATE_PROFILE', message: 'Run create_override_profile to generate a candidate profile.' }],
@@ -3701,6 +6167,8 @@ export function createV1ToolHandlers(getDb, getSessionConnectionState) {
             });
             const writeConfig = normalizeOptionalBooleanInput(input.writeConfig, 'writeConfig') ?? false;
             const overwrite = normalizeOptionalBooleanInput(input.overwrite, 'overwrite') ?? false;
+            const responseProfile = resolveOverrideResponseProfile(input.responseProfile);
+            const includeConfigJson = input.includeConfigJson === true || responseProfile === 'full';
             const write = {
                 written: false,
                 path: generated.suggestedConfigPath,
@@ -3749,21 +6217,31 @@ export function createV1ToolHandlers(getDb, getSessionConnectionState) {
                 warnings: generated.warnings,
                 nextActions,
                 write,
-                profile: generated.profile,
-                config: generated.config,
-                configJson: generated.configJson,
+                responseProfile,
+                profile: responseProfile === 'full' ? generated.profile : compactOverrideProfile(generated.profile),
+                config: responseProfile === 'full'
+                    ? generated.config
+                    : {
+                        enabled: generated.config.enabled,
+                        activeProfileId: generated.config.activeProfileId,
+                        profileCount: generated.config.profiles.length,
+                    },
+                configJson: includeConfigJson ? generated.configJson : undefined,
+                configJsonOmitted: !includeConfigJson,
             };
         },
         validate_override_profile: async (input) => {
             const profile = resolveOverrideProfileRecord(input.profileId);
             const issues = buildOverrideProfileIssues(profile);
+            const responseProfile = resolveOverrideResponseProfile(input.responseProfile);
             return {
                 ...createBaseResponse(),
                 profileId: profile.profileId,
                 valid: !issues.some((issue) => issue.severity === 'error'),
                 issues,
                 nextActions: buildOverrideProfileNextActions(profile, issues),
-                profile,
+                responseProfile,
+                profile: serializeOverrideProfile(profile, responseProfile),
             };
         },
         preflight_overrides: async (input) => {
@@ -3790,16 +6268,18 @@ export function createV1ToolHandlers(getDb, getSessionConnectionState) {
             }
             const assets = listObservedOverrideAssets(getDb(), {
                 sessionId,
-                limit: typeof input.limit === 'number' ? input.limit : undefined,
+                limit: typeof input.limit === 'number' ? input.limit : 50,
                 sinceTimestamp: typeof input.sinceTimestamp === 'number' ? input.sinceTimestamp : undefined,
             });
+            const responseProfile = resolveOverrideResponseProfile(input.responseProfile);
             return {
                 ...createBaseResponse(sessionId),
                 limitsApplied: {
                     maxResults: assets.length,
                     truncated: false,
                 },
-                assets,
+                responseProfile,
+                assets: responseProfile === 'full' ? assets : assets.map(compactObservedOverrideAsset),
             };
         },
         plan_override_response_patch: async (input) => {
@@ -5247,9 +7727,10 @@ export function createV1ToolHandlers(getDb, getSessionConnectionState) {
            r.status,
            r.started_at,
            r.completed_at,
-           r.stop_reason,
-           r.target_summary_json,
-           r.failure_json,
+            r.stop_reason,
+            r.target_summary_json,
+            r.diagnostics_json,
+            r.failure_json,
            r.redaction_json,
            r.created_at,
            r.updated_at,
@@ -5311,9 +7792,10 @@ export function createV1ToolHandlers(getDb, getSessionConnectionState) {
            r.status,
            r.started_at,
            r.completed_at,
-           r.stop_reason,
-           r.target_summary_json,
-           r.failure_json,
+            r.stop_reason,
+            r.target_summary_json,
+            r.diagnostics_json,
+            r.failure_json,
            r.redaction_json,
            r.created_at,
            r.updated_at,
@@ -5345,9 +7827,10 @@ export function createV1ToolHandlers(getDb, getSessionConnectionState) {
            started_at,
            finished_at,
            duration_ms,
-           tab_id,
-           target_summary_json,
-           redaction_json,
+            tab_id,
+            target_summary_json,
+            diagnostics_json,
+            redaction_json,
            failure_json,
            input_metadata_json,
            event_type,
@@ -5381,12 +7864,14 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
         const maxItems = resolveStructuredMaxItems(input.maxItems, 40);
         const maxTextLength = resolveStructuredTextLength(input.maxTextLength, 80);
         const includeButtons = input.includeButtons !== false;
+        const includeLinks = input.includeLinks !== false;
         const includeInputs = input.includeInputs !== false;
         const includeModals = input.includeModals !== false;
         const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_PAGE_STATE', {
             maxItems,
             maxTextLength,
             includeButtons,
+            includeLinks,
             includeInputs,
             includeModals,
         }, 4_000);
@@ -5405,8 +7890,14 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                 throw new Error('sessionId is required');
             }
             const tabId = resolveOptionalTabId(input.tabId);
-            const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_OVERRIDE_OBSERVE_ASSETS', { tabId, includePerformance: input.includePerformance !== false }, 5_000);
-            const payload = ensureCaptureSuccess(capture, sessionId);
+            const { capture, payload } = await executeOverrideLiveCaptureWithDiagnostics({
+                captureClient,
+                sessionId,
+                command: 'CAPTURE_OVERRIDE_OBSERVE_ASSETS',
+                payload: { tabId, includePerformance: input.includePerformance !== false },
+                timeoutMs: 5_000,
+                getSessionConnectionState,
+            });
             const assetCount = Array.isArray(payload.assets) ? payload.assets.length : 0;
             const persisted = getDb
                 ? persistObservedOverrideAssets(getDb(), { ...payload, sessionId, tabId: payload.tabId ?? tabId })
@@ -5436,23 +7927,31 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
             assertOverrideResponseRequestCaptureSafe({
                 requestMethod: input.requestMethod,
                 requestHeaders: input.requestHeaders,
+                ruleType: input.ruleType,
                 subject: 'Response body capture request',
             });
             const tabId = resolveOptionalTabId(input.tabId);
             const timeoutMs = resolveTimeoutMs(input.timeoutMs, 10_000, 60_000);
-            const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_OVERRIDE_RESPONSE_BODY', {
-                targetUrl,
-                tabId,
-                captureMode: normalizeOptionalString(input.captureMode),
-                triggerReload: typeof input.triggerReload === 'boolean' ? input.triggerReload : undefined,
-                matchMode: normalizeOptionalString(input.matchMode),
-                requestMethod: input.requestMethod,
-                requestHeaders: isRecord(input.requestHeaders) ? input.requestHeaders : undefined,
-                timeoutMs,
-                maxBodyBytes: input.maxBodyBytes,
-                includeBody: input.includeBody === true,
-            }, timeoutMs + 2_000);
-            const payload = ensureCaptureSuccess(capture, sessionId);
+            const { capture, payload } = await executeOverrideLiveCaptureWithDiagnostics({
+                captureClient,
+                sessionId,
+                command: 'CAPTURE_OVERRIDE_RESPONSE_BODY',
+                payload: {
+                    targetUrl,
+                    tabId,
+                    captureMode: normalizeOptionalString(input.captureMode),
+                    triggerReload: typeof input.triggerReload === 'boolean' ? input.triggerReload : undefined,
+                    matchMode: normalizeOptionalString(input.matchMode),
+                    ruleType: normalizeOptionalString(input.ruleType),
+                    requestMethod: input.requestMethod,
+                    requestHeaders: isRecord(input.requestHeaders) ? input.requestHeaders : undefined,
+                    timeoutMs,
+                    maxBodyBytes: input.maxBodyBytes,
+                    includeBody: input.includeBody === true,
+                },
+                timeoutMs: timeoutMs + 2_000,
+                getSessionConnectionState,
+            });
             return {
                 ...createBaseResponse(sessionId),
                 limitsApplied: {
@@ -5480,19 +7979,26 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                 }
                 const tabId = resolveOptionalTabId(input.tabId);
                 const timeoutMs = resolveTimeoutMs(input.timeoutMs, 10_000, 60_000);
-                const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_OVERRIDE_RESPONSE_BODY', {
-                    targetUrl,
-                    tabId,
-                    captureMode: normalizeOptionalString(input.captureMode),
-                    triggerReload: typeof input.triggerReload === 'boolean' ? input.triggerReload : undefined,
-                    matchMode: normalizeOptionalString(input.matchMode),
-                    requestMethod: input.requestMethod,
-                    requestHeaders: isRecord(input.requestHeaders) ? input.requestHeaders : undefined,
-                    timeoutMs,
-                    maxBodyBytes: input.maxBodyBytes,
-                    includeBody: true,
-                }, timeoutMs + 2_000);
-                const payload = ensureCaptureSuccess(capture, sessionId);
+                const { payload } = await executeOverrideLiveCaptureWithDiagnostics({
+                    captureClient,
+                    sessionId,
+                    command: 'CAPTURE_OVERRIDE_RESPONSE_BODY',
+                    payload: {
+                        targetUrl,
+                        tabId,
+                        captureMode: normalizeOptionalString(input.captureMode),
+                        triggerReload: typeof input.triggerReload === 'boolean' ? input.triggerReload : undefined,
+                        matchMode: normalizeOptionalString(input.matchMode),
+                        ruleType: normalizeOptionalString(input.ruleType),
+                        requestMethod: input.requestMethod,
+                        requestHeaders: isRecord(input.requestHeaders) ? input.requestHeaders : undefined,
+                        timeoutMs,
+                        maxBodyBytes: input.maxBodyBytes,
+                        includeBody: true,
+                    },
+                    timeoutMs: timeoutMs + 2_000,
+                    getSessionConnectionState,
+                });
                 if (payload.truncated === true) {
                     throw new Error('Captured response body was truncated; increase maxBodyBytes before planning a patch.');
                 }
@@ -5585,8 +8091,10 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
             let observedFromPersisted;
             if (!Array.isArray(observedAssets) && sessionId) {
                 const tabId = resolveOptionalTabId(input.tabId);
+                const command = 'CAPTURE_OVERRIDE_OBSERVE_ASSETS';
+                const timeoutMs = 5_000;
                 try {
-                    const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_OVERRIDE_OBSERVE_ASSETS', { tabId, includePerformance: true }, 5_000);
+                    const capture = await executeLiveCapture(captureClient, sessionId, command, { tabId, includePerformance: true }, timeoutMs);
                     observedFromLiveTab = ensureCaptureSuccess(capture, sessionId);
                     observedAssets = observedFromLiveTab.assets;
                     if (getDb) {
@@ -5594,11 +8102,22 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                     }
                 }
                 catch (error) {
-                    if (!getDb || !isLiveSessionDisconnectedError(error)) {
+                    if (getDb && isRecoverableOverrideLiveCommandError(error)) {
+                        observedAssets = listObservedOverrideAssets(getDb(), { sessionId });
+                        observedFromPersisted = { sessionId, assetCount: Array.isArray(observedAssets) ? observedAssets.length : 0 };
+                    }
+                    else if (isRecoverableOverrideLiveCommandError(error)) {
+                        throw createOverrideLiveCommandError({
+                            sessionId,
+                            command,
+                            timeoutMs,
+                            error,
+                            getSessionConnectionState,
+                        });
+                    }
+                    else {
                         throw error;
                     }
-                    observedAssets = listObservedOverrideAssets(getDb(), { sessionId });
-                    observedFromPersisted = { sessionId, assetCount: Array.isArray(observedAssets) ? observedAssets.length : 0 };
                 }
             }
             const mapping = await mapNextOverrideAssetsWithDrift({
@@ -5642,8 +8161,10 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
             let observedFromPersisted;
             if (!Array.isArray(observedAssets) && sessionId) {
                 const tabId = resolveOptionalTabId(input.tabId);
+                const command = 'CAPTURE_OVERRIDE_OBSERVE_ASSETS';
+                const timeoutMs = 5_000;
                 try {
-                    const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_OVERRIDE_OBSERVE_ASSETS', { tabId, includePerformance: true }, 5_000);
+                    const capture = await executeLiveCapture(captureClient, sessionId, command, { tabId, includePerformance: true }, timeoutMs);
                     observedFromLiveTab = ensureCaptureSuccess(capture, sessionId);
                     observedAssets = observedFromLiveTab.assets;
                     if (getDb) {
@@ -5651,11 +8172,22 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                     }
                 }
                 catch (error) {
-                    if (!getDb || !isLiveSessionDisconnectedError(error)) {
+                    if (getDb && isRecoverableOverrideLiveCommandError(error)) {
+                        observedAssets = listObservedOverrideAssets(getDb(), { sessionId });
+                        observedFromPersisted = { sessionId, assetCount: Array.isArray(observedAssets) ? observedAssets.length : 0 };
+                    }
+                    else if (isRecoverableOverrideLiveCommandError(error)) {
+                        throw createOverrideLiveCommandError({
+                            sessionId,
+                            command,
+                            timeoutMs,
+                            error,
+                            getSessionConnectionState,
+                        });
+                    }
+                    else {
                         throw error;
                     }
-                    observedAssets = listObservedOverrideAssets(getDb(), { sessionId });
-                    observedFromPersisted = { sessionId, assetCount: Array.isArray(observedAssets) ? observedAssets.length : 0 };
                 }
             }
             const plan = await planNextSourceOverride({
@@ -5716,14 +8248,58 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
             if (!sessionId) {
                 throw new Error('sessionId is required');
             }
-            const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_OVERRIDE_POC_GET_STATUS', {}, 3_000);
-            const payload = ensureCaptureSuccess(capture, sessionId);
+            const command = 'CAPTURE_OVERRIDE_POC_GET_STATUS';
+            const timeoutMs = 3_000;
+            let capture;
+            let payload;
+            try {
+                capture = await executeLiveCapture(captureClient, sessionId, command, {}, timeoutMs);
+                payload = ensureCaptureSuccess(capture, sessionId);
+            }
+            catch (error) {
+                if (!getDb || !isRecoverableOverrideLiveCommandError(error)) {
+                    throw error;
+                }
+                const persisted = buildPersistedOverrideStatus({
+                    db: getDb(),
+                    sessionId,
+                    profileId: input.profileId,
+                    getSessionConnectionState,
+                });
+                const liveStatus = buildOverrideLiveCommandFailure({
+                    sessionId,
+                    command,
+                    timeoutMs,
+                    error,
+                    getSessionConnectionState,
+                });
+                return {
+                    ...createBaseResponse(sessionId),
+                    limitsApplied: {
+                        maxResults: 1,
+                        truncated: false,
+                    },
+                    statusSource: 'persisted-audit',
+                    liveStatus,
+                    ...persisted,
+                    nextActions: [
+                        { code: 'RECONNECT_OR_RETRY_OVERRIDE_STATUS', message: 'Reconnect or rebind the top-level session, then retry get_override_status for live debugger state.' },
+                        { code: 'DIAGNOSE_OVERRIDES', message: 'Run diagnose_overrides to inspect persisted run and readiness signals while live status is unavailable.' },
+                    ],
+                };
+            }
             return {
                 ...createBaseResponse(sessionId),
                 limitsApplied: {
                     maxResults: 1,
                     truncated: capture.truncated ?? false,
                 },
+                statusSource: 'live',
+                liveStatus: {
+                    available: true,
+                    command,
+                    timeoutMs,
+                },
                 preflight: getDb
                     ? buildOverridePreflight({
                         db: getDb(),
@@ -5763,7 +8339,8 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
             if (!sessionId) {
                 throw new Error('sessionId is required');
             }
-            const preflight = getDb
+            const tabId = resolveOptionalTabId(input.tabId);
+            let preflight = getDb
                 ? buildOverridePreflight({
                     db: getDb(),
                     sessionId,
@@ -5771,20 +8348,58 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                     getSessionConnectionState,
                 })
                 : null;
+            let observedBeforeEnable;
+            let observedAssetRefreshError;
+            const initialBlockingCodes = getBlockingPreflightCodes(preflight);
+            const initialProfile = isRecord(preflight?.profile) ? preflight.profile : {};
+            const initialExperimentalBypass = canBypassPreflightForExperimentalRsc(initialProfile, initialBlockingCodes);
+            if (preflight && getDb && !initialExperimentalBypass && shouldRefreshObservedAssetsForEnable(preflight)) {
+                try {
+                    observedBeforeEnable = await refreshObservedAssetsForOverrideEnable({
+                        captureClient,
+                        db: getDb(),
+                        sessionId,
+                        tabId,
+                        getSessionConnectionState,
+                    });
+                    preflight = buildOverridePreflight({
+                        db: getDb(),
+                        sessionId,
+                        profileId: input.profileId,
+                        getSessionConnectionState,
+                    });
+                }
+                catch (error) {
+                    observedAssetRefreshError = error instanceof Error ? error.message : String(error);
+                }
+            }
             if (preflight && preflight.ready !== true) {
-                const blockingCodes = Array.isArray(preflight.issues)
-                    ? preflight.issues
-                        .filter((issue) => isRecord(issue) && issue.severity === 'error')
-                        .map((issue) => String(issue.code ?? 'UNKNOWN'))
-                    : [];
+                const blockingCodes = getBlockingPreflightCodes(preflight);
                 const profile = isRecord(preflight.profile) ? preflight.profile : {};
                 if (!canBypassPreflightForExperimentalRsc(profile, blockingCodes)) {
-                    throw new Error(`Override preflight failed: ${blockingCodes.join(', ') || 'UNKNOWN'}`);
+                    const refreshSuffix = observedAssetRefreshError
+                        ? `; observed asset refresh failed: ${observedAssetRefreshError}`
+                        : '';
+                    throw new Error(`Override preflight failed: ${blockingCodes.join(', ') || 'UNKNOWN'}${refreshSuffix}`);
                 }
             }
-            const tabId = resolveOptionalTabId(input.tabId);
-            const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_OVERRIDE_POC_ENABLE', { tabId }, 8_000);
-            const payload = ensureCaptureSuccess(capture, sessionId);
+            const command = 'CAPTURE_OVERRIDE_POC_ENABLE';
+            const timeoutMs = 8_000;
+            let capture;
+            let payload;
+            try {
+                capture = await executeLiveCapture(captureClient, sessionId, command, { tabId }, timeoutMs);
+                payload = ensureCaptureSuccess(capture, sessionId);
+            }
+            catch (error) {
+                throw createOverrideLiveCommandError({
+                    sessionId,
+                    command,
+                    timeoutMs,
+                    error,
+                    getSessionConnectionState,
+                });
+            }
             return {
                 ...createBaseResponse(sessionId),
                 limitsApplied: {
@@ -5792,6 +8407,7 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                     truncated: capture.truncated ?? false,
                 },
                 preflight,
+                observedBeforeEnable,
                 ...payload,
                 nextActions: [{ code: 'RELOAD_OR_INTERACT', message: 'Reload or interact with the tab so configured asset requests occur under the active override.' }],
             };
@@ -5801,14 +8417,64 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
             if (!sessionId) {
                 throw new Error('sessionId is required');
             }
-            const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_OVERRIDE_POC_DISABLE', {}, 5_000);
-            const payload = ensureCaptureSuccess(capture, sessionId);
+            const command = 'CAPTURE_OVERRIDE_POC_DISABLE';
+            const timeoutMs = 5_000;
+            let capture;
+            let payload;
+            try {
+                capture = await executeLiveCapture(captureClient, sessionId, command, {}, timeoutMs);
+                payload = ensureCaptureSuccess(capture, sessionId);
+            }
+            catch (error) {
+                if (!getDb || !isRecoverableOverrideLiveCommandError(error)) {
+                    throw createOverrideLiveCommandError({
+                        sessionId,
+                        command,
+                        timeoutMs,
+                        error,
+                        getSessionConnectionState,
+                    });
+                }
+                const persisted = buildPersistedOverrideStatus({
+                    db: getDb(),
+                    sessionId,
+                    profileId: input.profileId,
+                    getSessionConnectionState,
+                });
+                const disableAttempt = buildOverrideLiveCommandFailure({
+                    sessionId,
+                    command,
+                    timeoutMs,
+                    error,
+                    getSessionConnectionState,
+                });
+                return {
+                    ...createBaseResponse(sessionId),
+                    limitsApplied: {
+                        maxResults: 1,
+                        truncated: false,
+                    },
+                    statusSource: 'persisted-audit',
+                    disableAttempt,
+                    ...persisted,
+                    nextActions: [
+                        { code: 'RECONNECT_OR_RETRY_DISABLE', message: 'Reconnect or rebind the top-level session, then retry disable_overrides to confirm debugger detachment.' },
+                        { code: 'GET_OVERRIDE_STATUS', message: 'Run get_override_status after reconnecting to verify whether the override is still active.' },
+                    ],
+                };
+            }
             return {
                 ...createBaseResponse(sessionId),
                 limitsApplied: {
                     maxResults: 1,
                     truncated: capture.truncated ?? false,
                 },
+                statusSource: 'live',
+                disableAttempt: {
+                    ok: true,
+                    command,
+                    timeoutMs,
+                },
                 ...payload,
                 nextActions: [{ code: 'VERIFY_DISABLED', message: 'Run get_override_status if you need to confirm the debugger override is inactive.' }],
             };
@@ -5880,7 +8546,10 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                 throw new Error('selector is required');
             }
             const properties = asStringArray(input.properties, 64);
-            const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_COMPUTED_STYLES', { selector, properties }, 3_000);
+            const frameId = typeof input.frameId === 'number' && Number.isFinite(input.frameId)
+                ? Math.max(0, Math.floor(input.frameId))
+                : 0;
+            const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_COMPUTED_STYLES', { selector, frameId, properties }, 3_000);
             return {
                 ...createBaseResponse(sessionId),
                 limitsApplied: {
@@ -5896,7 +8565,10 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                 throw new Error('sessionId is required');
             }
             const selector = typeof input.selector === 'string' ? input.selector : undefined;
-            const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_LAYOUT_METRICS', { selector }, 3_000);
+            const frameId = typeof input.frameId === 'number' && Number.isFinite(input.frameId)
+                ? Math.max(0, Math.floor(input.frameId))
+                : 0;
+            const capture = await executeLiveCapture(captureClient, sessionId, 'CAPTURE_LAYOUT_METRICS', { selector, frameId }, 3_000);
             return {
                 ...createBaseResponse(sessionId),
                 limitsApplied: {
@@ -5927,6 +8599,7 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
             const normalizedInput = {
                 ...input,
                 includeButtons: kinds.includes('buttons'),
+                includeLinks: kinds.includes('links'),
                 includeInputs: kinds.includes('inputs'),
                 includeModals: kinds.includes('modals'),
             };
@@ -6007,6 +8680,247 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                 ...waited,
             };
         },
+        preflight_automation_flow: async (input) => {
+            const sessionId = getSessionId(input);
+            if (!sessionId) {
+                throw new Error('sessionId is required');
+            }
+            const preflight = await buildAutomationFlowPreflight({
+                sessionId,
+                input,
+                capturePageState,
+                getDb,
+                getSessionConnectionState,
+            });
+            return {
+                ...createBaseResponse(sessionId),
+                limitsApplied: {
+                    maxResults: 1,
+                    truncated: false,
+                },
+                ...preflight,
+            };
+        },
+        wait_for_url: async (input) => {
+            const sessionId = getSessionId(input);
+            if (!sessionId) {
+                throw new Error('sessionId is required');
+            }
+            const wait = AutomationWaitUrlSchema.parse({ ...input, waitKind: 'url' });
+            const waited = await waitForUrlCondition(sessionId, wait, capturePageState);
+            return {
+                ...createBaseResponse(sessionId),
+                limitsApplied: {
+                    maxResults: 1,
+                    truncated: false,
+                },
+                ...waited,
+            };
+        },
+        wait_for_navigation: async (input) => {
+            const sessionId = getSessionId(input);
+            if (!sessionId) {
+                throw new Error('sessionId is required');
+            }
+            if (!getDb) {
+                throw new Error('wait_for_navigation requires database access');
+            }
+            const wait = AutomationWaitNavigationSchema.parse({ ...input, waitKind: 'navigation' });
+            const waited = await waitForNavigationCondition(sessionId, wait, getDb());
+            return {
+                ...createBaseResponse(sessionId),
+                limitsApplied: {
+                    maxResults: 10,
+                    truncated: false,
+                },
+                ...waited,
+            };
+        },
+        wait_for_navigation_lifecycle: async (input) => {
+            const sessionId = getSessionId(input);
+            if (!sessionId) {
+                throw new Error('sessionId is required');
+            }
+            const wait = AutomationWaitNavigationLifecycleSchema.parse({ ...input, waitKind: 'navigation_lifecycle' });
+            const waited = await waitForNavigationLifecycleCondition(sessionId, wait, captureClient);
+            return {
+                ...createBaseResponse(sessionId),
+                limitsApplied: {
+                    maxResults: 1,
+                    truncated: false,
+                },
+                ...waited,
+            };
+        },
+        wait_for_load_state: async (input) => {
+            const sessionId = getSessionId(input);
+            if (!sessionId) {
+                throw new Error('sessionId is required');
+            }
+            const wait = AutomationWaitLoadStateSchema.parse({ ...input, waitKind: 'load_state' });
+            const waited = await waitForLoadStateCondition(sessionId, wait, capturePageState);
+            return {
+                ...createBaseResponse(sessionId),
+                limitsApplied: {
+                    maxResults: 1,
+                    truncated: false,
+                },
+                ...waited,
+            };
+        },
+        wait_for_selector_state: async (input) => {
+            const sessionId = getSessionId(input);
+            if (!sessionId) {
+                throw new Error('sessionId is required');
+            }
+            const wait = AutomationWaitSelectorStateSchema.parse({ ...input, waitKind: 'selector_state' });
+            const waited = await waitForSelectorStateCondition(sessionId, wait, captureClient);
+            return {
+                ...createBaseResponse(sessionId),
+                limitsApplied: {
+                    maxResults: 1,
+                    truncated: false,
+                },
+                ...waited,
+            };
+        },
+        wait_for_request: async (input) => {
+            const sessionId = getSessionId(input);
+            if (!sessionId) {
+                throw new Error('sessionId is required');
+            }
+            if (!getDb) {
+                throw new Error('wait_for_request requires database access');
+            }
+            const wait = AutomationWaitRequestSchema.parse({ ...input, waitKind: 'request' });
+            const waited = await waitForNetworkMatchCondition(sessionId, wait, getDb());
+            return {
+                ...createBaseResponse(sessionId),
+                limitsApplied: {
+                    maxResults: 10,
+                    truncated: false,
+                },
+                ...waited,
+            };
+        },
+        wait_for_response: async (input) => {
+            const sessionId = getSessionId(input);
+            if (!sessionId) {
+                throw new Error('sessionId is required');
+            }
+            if (!getDb) {
+                throw new Error('wait_for_response requires database access');
+            }
+            const wait = AutomationWaitResponseSchema.parse({ ...input, waitKind: 'response' });
+            const waited = await waitForNetworkMatchCondition(sessionId, wait, getDb());
+            return {
+                ...createBaseResponse(sessionId),
+                limitsApplied: {
+                    maxResults: 10,
+                    truncated: false,
+                },
+                ...waited,
+            };
+        },
+        wait_for_console: async (input) => {
+            const sessionId = getSessionId(input);
+            if (!sessionId) {
+                throw new Error('sessionId is required');
+            }
+            const wait = AutomationWaitConsoleSchema.parse({ ...input, waitKind: 'console' });
+            const waited = await waitForConsoleCondition(sessionId, wait, captureClient);
+            return {
+                ...createBaseResponse(sessionId),
+                limitsApplied: {
+                    maxResults: 10,
+                    truncated: false,
+                },
+                ...waited,
+            };
+        },
+        wait_for_dialog: async (input) => {
+            const sessionId = getSessionId(input);
+            if (!sessionId) {
+                throw new Error('sessionId is required');
+            }
+            const wait = AutomationWaitDialogSchema.parse({ ...input, waitKind: 'dialog' });
+            const waited = await waitForDialogCondition(sessionId, wait, captureClient);
+            return {
+                ...createBaseResponse(sessionId),
+                limitsApplied: {
+                    maxResults: 1,
+                    truncated: false,
+                },
+                ...waited,
+            };
+        },
+        wait_for_stable_layout: async (input) => {
+            const sessionId = getSessionId(input);
+            if (!sessionId) {
+                throw new Error('sessionId is required');
+            }
+            const wait = AutomationWaitStableLayoutSchema.parse({ ...input, waitKind: 'stable_layout' });
+            const waited = await waitForStableLayoutCondition(sessionId, wait, captureClient);
+            return {
+                ...createBaseResponse(sessionId),
+                limitsApplied: {
+                    maxResults: 1,
+                    truncated: false,
+                },
+                ...waited,
+            };
+        },
+        wait_for_download: async (input) => {
+            const sessionId = getSessionId(input);
+            if (!sessionId) {
+                throw new Error('sessionId is required');
+            }
+            const wait = AutomationWaitDownloadSchema.parse({ ...input, waitKind: 'download' });
+            const waited = await waitForDownloadCondition(sessionId, wait, captureClient);
+            return {
+                ...createBaseResponse(sessionId),
+                limitsApplied: {
+                    maxResults: 1,
+                    truncated: false,
+                },
+                ...waited,
+            };
+        },
+        wait_for_popup: async (input) => {
+            const sessionId = getSessionId(input);
+            if (!sessionId) {
+                throw new Error('sessionId is required');
+            }
+            const wait = AutomationWaitPopupSchema.parse({ ...input, waitKind: 'popup' });
+            const waited = await waitForPopupCondition(sessionId, wait, captureClient);
+            return {
+                ...createBaseResponse(sessionId),
+                limitsApplied: {
+                    maxResults: 1,
+                    truncated: false,
+                },
+                ...waited,
+            };
+        },
+        wait_for_network_quiet: async (input) => {
+            const sessionId = getSessionId(input);
+            if (!sessionId) {
+                throw new Error('sessionId is required');
+            }
+            if (!getDb) {
+                throw new Error('wait_for_network_quiet requires database access');
+            }
+            const wait = AutomationWaitNetworkQuietSchema.parse({ ...input, waitKind: 'network_quiet' });
+            const waited = await waitForNetworkQuietCondition(sessionId, wait, getDb());
+            return {
+                ...createBaseResponse(sessionId),
+                limitsApplied: {
+                    maxResults: 10,
+                    truncated: false,
+                },
+                ...waited,
+            };
+        },
         run_ui_steps: async (input) => {
             const request = RunUIStepsSchema.parse(input);
             const workflowTraceId = createUIWorkflowTraceId();
@@ -6034,7 +8948,16 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                     const previousCapture = lastPageCapture;
                     try {
                         if (step.kind === 'action') {
-                            const resolvedTarget = await resolveWorkflowActionTarget(request.sessionId, step.target, workflowCapturePageState, request.mode === 'fast' ? lastPageCapture : undefined);
+                            const resolvedTarget = step.target?.locator
+                                ? {
+                                    target: step.target,
+                                    resolution: {
+                                        strategy: 'native_locator_pending',
+                                        matcher: summarizeWorkflowTargetMatcher(step.target),
+                                    },
+                                    pageCapture: undefined,
+                                }
+                                : await resolveWorkflowActionTarget(request.sessionId, step.target, workflowCapturePageState, request.mode === 'fast' ? lastPageCapture : undefined);
                             const liveRequest = LiveUIActionRequestSchema.parse({
                                 action: step.action,
                                 target: resolvedTarget.target,
@@ -6045,6 +8968,12 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                             const payload = ensureCaptureSuccess(capture, request.sessionId);
                             const actionResult = payload;
                             const failed = actionResult.status === 'failed' || actionResult.status === 'rejected';
+                            const actionResultPayload = typeof actionResult.result === 'object' && actionResult.result !== null
+                                ? actionResult.result
+                                : undefined;
+                            const nativeLocatorResolution = typeof actionResultPayload?.locatorResolution === 'object' && actionResultPayload.locatorResolution !== null
+                                ? actionResultPayload.locatorResolution
+                                : undefined;
                             let currentCapture = resolvedTarget.pageCapture ?? lastPageCapture;
                             if (!failed && request.mode === 'fast') {
                                 await sleep(75);
@@ -6059,7 +8988,7 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                                 action: step.action,
                                 traceId: actionResult.traceId,
                                 target: {
-                                    resolution: resolvedTarget.resolution,
+                                    resolution: nativeLocatorResolution ?? resolvedTarget.resolution,
                                     actionTarget: typeof actionResult.target === 'object' && actionResult.target !== null
                                         ? actionResult.target
                                         : undefined,
@@ -6072,6 +9001,14 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                                     : undefined,
                                 pageChangeSummary: createPageChangeSummary(previousCapture, currentCapture),
                             };
+                            if (failed && getDb && finalStepResult.traceId) {
+                                mergeAutomationDiagnosticsEvidence(getDb(), {
+                                    sessionId: request.sessionId,
+                                    traceId: finalStepResult.traceId,
+                                    failureEvidence: finalStepResult.failureEvidence,
+                                    cdpFailure: actionResult.failureReason,
+                                });
+                            }
                         }
                         else if (step.kind === 'waitFor') {
                             const waitInput = {
@@ -6099,6 +9036,48 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                                 pageChangeSummary: createPageChangeSummary(previousCapture, waited.lastCapture),
                             };
                         }
+                        else if (step.kind === 'wait') {
+                            const waitSpec = AutomationWaitSpecSchema.parse({
+                                ...step.wait,
+                                timeoutMs: step.wait.timeoutMs ?? request.defaultTimeoutMs,
+                                pollIntervalMs: step.wait.pollIntervalMs ?? request.defaultPollIntervalMs,
+                            });
+                            const waited = await runAutomationWait({
+                                sessionId: request.sessionId,
+                                wait: waitSpec,
+                                capturePageState: workflowCapturePageState,
+                                captureClient,
+                                getDb,
+                            });
+                            if (waited.waitKind === 'url' || waited.waitKind === 'navigation' || waited.waitKind === 'load_state') {
+                                lastPageCapture = await workflowCapturePageState(request.sessionId, {
+                                    includeButtons: true,
+                                    includeLinks: true,
+                                    includeInputs: true,
+                                    includeModals: true,
+                                    maxItems: request.mode === 'fast' ? 12 : 20,
+                                    maxTextLength: request.mode === 'fast' ? 60 : 80,
+                                }).catch(() => lastPageCapture);
+                            }
+                            finalStepResult = {
+                                id: stepId,
+                                kind: step.kind,
+                                status: waited.matched ? 'succeeded' : 'failed',
+                                durationMs: Math.max(0, Date.now() - startedAt),
+                                wait: {
+                                    ...waitSpec,
+                                    waitKind: waited.waitKind,
+                                    matched: waited.matched,
+                                    timeoutMs: waited.timeoutMs,
+                                    pollIntervalMs: waited.pollIntervalMs,
+                                },
+                                waitedMs: waited.waitedMs,
+                                attempts: waited.attempts,
+                                error: waited.error,
+                                pageChangeSummary: createPageChangeSummary(previousCapture, lastPageCapture),
+                                target: waited.evidence,
+                            };
+                        }
                         else {
                             const capture = request.mode === 'fast' && lastPageCapture
                                 ? lastPageCapture
@@ -6133,7 +9112,8 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                             target: step.kind === 'action' && workflowError
                                 ? workflowError.details
                                 : undefined,
-                            matcher: step.kind === 'action' ? undefined : step.matcher,
+                            matcher: step.kind === 'assert' || step.kind === 'waitFor' ? step.matcher : undefined,
+                            wait: step.kind === 'wait' ? step.wait : undefined,
                             error: normalizeWorkflowError(error),
                         };
                     }
@@ -6156,6 +9136,14 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                     if (evidence) {
                         failureCaptureCount += 1;
                         finalStepResult.failureEvidence = evidence;
+                        if (getDb && finalStepResult.traceId) {
+                            mergeAutomationDiagnosticsEvidence(getDb(), {
+                                sessionId: request.sessionId,
+                                traceId: finalStepResult.traceId,
+                                failureEvidence: evidence,
+                                cdpFailure: finalStepResult.error,
+                            });
+                        }
                     }
                 }
                 stepResults.push(finalStepResult);
@@ -6175,7 +9163,8 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                         status: 'skipped',
                         durationMs: 0,
                         action: step.kind === 'action' ? step.action : undefined,
-                        matcher: step.kind === 'action' ? undefined : step.matcher,
+                        matcher: step.kind === 'assert' || step.kind === 'waitFor' ? step.matcher : undefined,
+                        wait: step.kind === 'wait' ? step.wait : undefined,
                         pageChangeSummary: undefined,
                         error: {
                             code: 'workflow_stopped_early',
@@ -6375,7 +9364,62 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
             const actionInput = { ...input };
             delete actionInput.sessionId;
             delete actionInput.captureOnFailure;
-            const request = LiveUIActionRequestSchema.parse(actionInput);
+            let request = LiveUIActionRequestSchema.parse(actionInput);
+            let targetResolution;
+            try {
+                if (request.target?.locator) {
+                    targetResolution = {
+                        strategy: 'native_locator_pending',
+                        matcher: summarizeWorkflowTargetMatcher(request.target),
+                    };
+                }
+                else if (hasSemanticActionTargetMatcher(request.target)) {
+                    const resolvedTarget = await resolveWorkflowActionTarget(sessionId, request.target, capturePageState);
+                    targetResolution = resolvedTarget.resolution;
+                    request = LiveUIActionRequestSchema.parse({
+                        ...request,
+                        target: resolvedTarget.target,
+                    });
+                }
+            }
+            catch (error) {
+                if (error instanceof WorkflowTargetResolutionError) {
+                    const traceId = request.traceId ?? `uiaction-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
+                    return {
+                        ...createBaseResponse(sessionId),
+                        limitsApplied: {
+                            maxResults: 1,
+                            truncated: false,
+                        },
+                        action: request.action,
+                        status: 'rejected',
+                        traceId,
+                        startedAt: Date.now(),
+                        finishedAt: Date.now(),
+                        durationMs: 0,
+                        target: {
+                            matched: false,
+                        },
+                        tabContext: {
+                            frameId: 0,
+                        },
+                        failureDetails: {
+                            code: error.code,
+                            message: error.message,
+                        },
+                        targetResolution: {
+                            ...error.details,
+                            strategy: 'semantic_failed',
+                        },
+                        supportedScopes: {
+                            executionScope: 'top-document-v1',
+                            topDocumentOnly: false,
+                            opensNewBrowserSession: false,
+                        },
+                    };
+                }
+                throw error;
+            }
             const failureCaptureOptions = resolveFailureEvidenceCaptureOptions(input);
             const capture = await executeLiveCapture(captureClient, sessionId, 'EXECUTE_UI_ACTION', request, 5_000);
             const payload = ensureCaptureSuccess(capture, sessionId);
@@ -6400,6 +9444,24 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
             const target = typeof actionResult.target === 'object' && actionResult.target !== null
                 ? actionResult.target
                 : {};
+            const actionResultRecord = actionResult;
+            const nativeResult = typeof actionResultRecord.result === 'object' && actionResultRecord.result !== null
+                ? actionResultRecord.result
+                : undefined;
+            const nativeLocatorResolution = typeof nativeResult?.locatorResolution === 'object' && nativeResult.locatorResolution !== null
+                ? nativeResult.locatorResolution
+                : undefined;
+            if (nativeLocatorResolution) {
+                targetResolution = nativeLocatorResolution;
+            }
+            if (failed && getDb && actionResult.traceId) {
+                mergeAutomationDiagnosticsEvidence(getDb(), {
+                    sessionId,
+                    traceId: actionResult.traceId,
+                    failureEvidence,
+                    cdpFailure: actionResult.failureReason,
+                });
+            }
             return {
                 ...createBaseResponse(sessionId),
                 limitsApplied: {
@@ -6418,6 +9480,7 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                     : undefined,
                 actionResult,
                 target,
+                targetResolution,
                 tabContext: {
                     tabId: typeof target.tabId === 'number' ? target.tabId : undefined,
                     frameId: typeof target.frameId === 'number' ? target.frameId : 0,
@@ -6428,7 +9491,7 @@ export function createV2ToolHandlers(captureClient, getDb, getSessionConnectionS
                 postActionState,
                 supportedScopes: {
                     executionScope: actionResult.executionScope,
-                    topDocumentOnly: true,
+                    topDocumentOnly: false,
                     opensNewBrowserSession: false,
                 },
             };
@@ -6480,13 +9543,37 @@ export function createToolRegistry(overrides = {}) {
         };
     });
 }
-export async function routeToolCall(tools, toolName, input) {
+export async function routeToolCall(tools, toolName, input, options = {}) {
     const tool = tools.find((candidate) => candidate.name === toolName);
     if (!tool) {
         throw new Error(`Unknown tool: ${toolName}`);
     }
-    const response = await tool.handler(isRecord(input) ? input : {});
-    return attachResponseBytes(response);
+    const normalizedInput = isRecord(input) ? input : {};
+    const guardCall = options.loopGuard?.prepareCall(toolName, normalizedInput);
+    const beforeCall = guardCall ? await options.loopGuard?.beforeCall(guardCall) : undefined;
+    if (beforeCall?.blocked) {
+        return attachResponseBytes(beforeCall.response);
+    }
+    const startedAt = Date.now();
+    try {
+        const response = await tool.handler(normalizedInput);
+        const guarded = guardCall
+            ? await options.loopGuard?.afterCall(guardCall, {
+                response,
+                durationMs: Date.now() - startedAt,
+            })
+            : undefined;
+        return attachResponseBytes((guarded?.response ?? response));
+    }
+    catch (error) {
+        if (guardCall) {
+            await options.loopGuard?.afterCall(guardCall, {
+                error,
+                durationMs: Date.now() - startedAt,
+            });
+        }
+        throw error;
+    }
 }
 export function createMCPServer(overrides = {}, options = {}) {
     const logger = options.logger ?? createDefaultMcpLogger();
@@ -6498,6 +9585,17 @@ export function createMCPServer(overrides = {}, options = {}) {
         ...v2Handlers,
         ...overrides,
     });
+    const loopGuard = options.loopGuard === false
+        ? undefined
+        : options.loopGuard ?? createToolLoopGuard({
+            getDb: () => getConnection().db,
+            onEvent: (event) => {
+                logger.info({
+                    component: 'mcp',
+                    ...event,
+                }, `[MCPServer][MCP] ${event.event}`);
+            },
+        });
     const server = new Server({
         name: 'browser-debug-mcp-bridge',
         version: '1.0.0',
@@ -6521,7 +9619,7 @@ export function createMCPServer(overrides = {}, options = {}) {
         const startedAt = Date.now();
         logger.info({ component: 'mcp', event: 'tool_call_started', toolName }, '[MCPServer][MCP] Tool call started');
         try {
-            const response = await routeToolCall(tools, toolName, request.params.arguments);
+            const response = await routeToolCall(tools, toolName, request.params.arguments, { loopGuard });
             logger.info({
                 component: 'mcp',
                 event: 'tool_call_completed',