chrome-devtools-frontend 1.0.1636056 → 1.0.1640418

package/front_end/generated/protocol.ts

@@ -435,6 +435,49 @@ export namespace Accessibility {
   }
 }
 
+/**
+ * A domain for ad-related metrics and data.
+ */
+export namespace Ads {
+
+  /**
+   * Ad metrics for a page.
+   */
+  export interface AdMetrics {
+    /**
+     * The viewport ad density by area, represented as a percentage (an integer
+     * between 0 and 100).
+     */
+    viewportAdDensityByArea: integer;
+    /**
+     * The time-weighted average of the viewport ad density by area, measured
+     * across the duration of the page.
+     */
+    averageViewportAdDensityByArea: number;
+    /**
+     * The number of ads currently visible within the viewport.
+     */
+    viewportAdCount: integer;
+    /**
+     * The time-weighted average of the viewport ad count, measured across the
+     * duration of the page.
+     */
+    averageViewportAdCount: number;
+    /**
+     * The total ad CPU usage, in milliseconds.
+     */
+    totalAdCpuTime: number;
+    /**
+     * The total ad network bytes.
+     */
+    totalAdNetworkBytes: number;
+  }
+
+  export interface GetAdMetricsResponse extends ProtocolResponseWithError {
+    metrics: AdMetrics;
+  }
+}
+
 export namespace Animation {
 
   export const enum AnimationType {
@@ -1090,6 +1133,7 @@ export namespace Audits {
     WriteErrorNonSecureContext = 'WriteErrorNonSecureContext',
     WriteErrorNonStringIdField = 'WriteErrorNonStringIdField',
     WriteErrorNonStringInMatchDestList = 'WriteErrorNonStringInMatchDestList',
+    WriteErrorInvalidMatchDestList = 'WriteErrorInvalidMatchDestList',
     WriteErrorNonStringMatchField = 'WriteErrorNonStringMatchField',
     WriteErrorNonTokenTypeField = 'WriteErrorNonTokenTypeField',
     WriteErrorRequestAborted = 'WriteErrorRequestAborted',
@@ -1356,6 +1400,74 @@ export namespace Audits {
     NoReturningUserFromFetchedAccounts = 'NoReturningUserFromFetchedAccounts',
   }
 
+  export interface EmailVerificationRequestIssueDetails {
+    emailVerificationRequestIssueReason: EmailVerificationRequestIssueReason;
+  }
+
+  /**
+   * Represents the failure reason when an email verification request fails.
+   * Should be updated alongside EmailVerificationRequestResult in
+   * third_party/blink/public/mojom/devtools/inspector_issue.mojom.
+   */
+  export const enum EmailVerificationRequestIssueReason {
+    InvalidEmail = 'InvalidEmail',
+    DnsFetchFailed = 'DnsFetchFailed',
+    DnsInvalidRecord = 'DnsInvalidRecord',
+    WellKnownHttpNotFound = 'WellKnownHttpNotFound',
+    WellKnownNoResponse = 'WellKnownNoResponse',
+    WellKnownInvalidResponse = 'WellKnownInvalidResponse',
+    WellKnownListEmpty = 'WellKnownListEmpty',
+    WellKnownInvalidContentType = 'WellKnownInvalidContentType',
+    WellKnownMissingIssuanceEndpoint = 'WellKnownMissingIssuanceEndpoint',
+    WellKnownIssuanceEndpointCrossOrigin = 'WellKnownIssuanceEndpointCrossOrigin',
+    WellKnownUnsupportedSigningAlgorithm = 'WellKnownUnsupportedSigningAlgorithm',
+    TokenHttpNotFound = 'TokenHttpNotFound',
+    TokenNoResponse = 'TokenNoResponse',
+    TokenInvalidResponse = 'TokenInvalidResponse',
+    TokenInvalidContentType = 'TokenInvalidContentType',
+    TokenMalformedSdJwt = 'TokenMalformedSdJwt',
+    TokenInvalidSdJwt = 'TokenInvalidSdJwt',
+    KeyBindingSigningFailed = 'KeyBindingSigningFailed',
+    RpOriginIsOpaque = 'RpOriginIsOpaque',
+    WellKnownMissingAccountsEndpoint = 'WellKnownMissingAccountsEndpoint',
+    UserLoggedOut = 'UserLoggedOut',
+    WellKnownAccountsEndpointCrossOrigin = 'WellKnownAccountsEndpointCrossOrigin',
+    AccountsHttpNotFound = 'AccountsHttpNotFound',
+    AccountsNoResponse = 'AccountsNoResponse',
+    AccountsInvalidResponse = 'AccountsInvalidResponse',
+    AccountsInvalidContentType = 'AccountsInvalidContentType',
+    AccountsEmptyList = 'AccountsEmptyList',
+    EmailVerificationWellKnownHttpNotFound = 'EmailVerificationWellKnownHttpNotFound',
+    EmailVerificationWellKnownNoResponse = 'EmailVerificationWellKnownNoResponse',
+    EmailVerificationWellKnownInvalidResponse = 'EmailVerificationWellKnownInvalidResponse',
+    EmailVerificationWellKnownInvalidContentType = 'EmailVerificationWellKnownInvalidContentType',
+    JwksHttpNotFound = 'JwksHttpNotFound',
+    JwksInvalidResponse = 'JwksInvalidResponse',
+    TokenVerificationSdJwtUnsupportedHeaderAlg = 'TokenVerificationSdJwtUnsupportedHeaderAlg',
+    TokenVerificationSdJwtMissingIss = 'TokenVerificationSdJwtMissingIss',
+    TokenVerificationSdJwtMissingIat = 'TokenVerificationSdJwtMissingIat',
+    TokenVerificationSdJwtMissingCnf = 'TokenVerificationSdJwtMissingCnf',
+    TokenVerificationSdJwtMissingEmail = 'TokenVerificationSdJwtMissingEmail',
+    TokenVerificationSdJwtInvalidIssuedAt = 'TokenVerificationSdJwtInvalidIssuedAt',
+    TokenVerificationSdJwtInvalidIssuer = 'TokenVerificationSdJwtInvalidIssuer',
+    TokenVerificationSdJwtJwksMissingKeys = 'TokenVerificationSdJwtJwksMissingKeys',
+    TokenVerificationSdJwtSignatureFailed = 'TokenVerificationSdJwtSignatureFailed',
+    TokenVerificationSdJwtInvalidEmailVerified = 'TokenVerificationSdJwtInvalidEmailVerified',
+    TokenVerificationSdJwtInvalidEmail = 'TokenVerificationSdJwtInvalidEmail',
+    TokenVerificationSdJwtInvalidHolderKey = 'TokenVerificationSdJwtInvalidHolderKey',
+    TokenVerificationKbInvalidTyp = 'TokenVerificationKbInvalidTyp',
+    TokenVerificationKbMissingAud = 'TokenVerificationKbMissingAud',
+    TokenVerificationKbMissingNonce = 'TokenVerificationKbMissingNonce',
+    TokenVerificationKbMissingIat = 'TokenVerificationKbMissingIat',
+    TokenVerificationKbMissingSdHash = 'TokenVerificationKbMissingSdHash',
+    TokenVerificationKbInvalidIssuedAt = 'TokenVerificationKbInvalidIssuedAt',
+    TokenVerificationKbInvalidAudience = 'TokenVerificationKbInvalidAudience',
+    TokenVerificationKbInvalidNonce = 'TokenVerificationKbInvalidNonce',
+    TokenVerificationKbInvalidSdHash = 'TokenVerificationKbInvalidSdHash',
+    TokenVerificationKbMissingCnf = 'TokenVerificationKbMissingCnf',
+    TokenVerificationKbSignatureFailed = 'TokenVerificationKbSignatureFailed',
+  }
+
   /**
    * This issue tracks client hints related issues. It's used to deprecate old
    * features, encourage the use of new ones, and provide general guidance.
@@ -1596,6 +1708,7 @@ export namespace Audits {
     PermissionElementIssue = 'PermissionElementIssue',
     PerformanceIssue = 'PerformanceIssue',
     SelectivePermissionsInterventionIssue = 'SelectivePermissionsInterventionIssue',
+    EmailVerificationRequestIssue = 'EmailVerificationRequestIssue',
   }
 
   /**
@@ -1636,6 +1749,7 @@ export namespace Audits {
     permissionElementIssueDetails?: PermissionElementIssueDetails;
     performanceIssueDetails?: PerformanceIssueDetails;
     selectivePermissionsInterventionIssueDetails?: SelectivePermissionsInterventionIssueDetails;
+    emailVerificationRequestIssueDetails?: EmailVerificationRequestIssueDetails;
   }
 
   /**
@@ -4665,6 +4779,7 @@ export namespace DOM {
     Picker = 'picker',
     PermissionIcon = 'permission-icon',
     OverscrollAreaParent = 'overscroll-area-parent',
+    Skeleton = 'skeleton',
   }
 
   /**
@@ -11900,6 +12015,7 @@ export namespace Network {
     InvalidFederatedSessionProviderFailedToRestoreKey = 'InvalidFederatedSessionProviderFailedToRestoreKey',
     FailedToUnwrapKey = 'FailedToUnwrapKey',
     SessionDeletedDuringRefresh = 'SessionDeletedDuringRefresh',
+    CrossOriginRegistrationSiteNotIncluded = 'CrossOriginRegistrationSiteNotIncluded',
   }
 
   /**
@@ -17109,6 +17225,7 @@ export namespace Preload {
     PrefetchIneligibleRetryAfter = 'PrefetchIneligibleRetryAfter',
     PrefetchIsPrivacyDecoy = 'PrefetchIsPrivacyDecoy',
     PrefetchIsStale = 'PrefetchIsStale',
+    PrefetchNotEligibleBlockedByConnectionAllowlist = 'PrefetchNotEligibleBlockedByConnectionAllowlist',
     PrefetchNotEligibleBrowserContextOffTheRecord = 'PrefetchNotEligibleBrowserContextOffTheRecord',
     PrefetchNotEligibleDataSaverEnabled = 'PrefetchNotEligibleDataSaverEnabled',
     PrefetchNotEligibleExistingProxy = 'PrefetchNotEligibleExistingProxy',
@@ -17130,6 +17247,7 @@ export namespace Preload {
     PrefetchResponseUsed = 'PrefetchResponseUsed',
     PrefetchSuccessfulButNotUsed = 'PrefetchSuccessfulButNotUsed',
     PrefetchNotUsedProbeFailed = 'PrefetchNotUsedProbeFailed',
+    PrefetchCancelledOnUserNavigation = 'PrefetchCancelledOnUserNavigation',
   }
 
   /**
@@ -19430,8 +19548,8 @@ export namespace Target {
     targetId: TargetID;
     /**
      * The id of the panel we want DevTools to open initially. Currently
-     * supported panels are elements, console, network, sources, resources
-     * and performance.
+     * supported panels are elements, console, network, sources, resources,
+     * timeline, chrome-recorder, heap-profiler, lighthouse, and security.
      */
     panelId?: string;
   }

package/front_end/global_typings/global_defs.d.ts

@@ -12,6 +12,19 @@ declare module '*.css.js' {
   export default styles;
 }
 
+declare module '*.skill.js' {
+  // Duplicated from front_end/models/ai_assistance/skills/Skill.ts
+  // to avoid importing from the source tree in a global declaration file,
+  // which was causing build artifacts to be generated in the source tree.
+  interface Skill {
+    name: 'styling';
+    description: string;
+    allowedTools: string[];
+    instructions: string;
+  }
+  export const skill: Skill;
+}
+
 // TODO: remove once URLPattern types are available in TypeScript (see https://github.com/microsoft/TypeScript-DOM-lib-generator/issues/1199).
 declare class URLPattern {
   constructor(input: string);

package/front_end/models/ai_assistance/AiAgent2.ts

@@ -0,0 +1,116 @@
+// Copyright 2026 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import * as Host from '../../core/host/host.js';
+
+import {
+  type AgentOptions,
+  AiAgent,
+  type ContextResponse,
+  type ConversationContext,
+  type RequestOptions,
+  ResponseType
+} from './agents/AiAgent.js';
+import {debugLog} from './debug.js';
+import type {Skill, SkillName} from './skills/Skill.js';
+import {SKILLS} from './skills/SkillRegistry.js';
+
+export class AiAgent2 extends AiAgent<unknown> {
+  // TODO: The static preamble is a placeholder and will eventually live server-side.
+  readonly preamble = 'You are a unified AI assistant in Chrome DevTools. You can learn skills to help the user.';
+  readonly clientFeature = Host.AidaClient.ClientFeature.CHROME_STYLING_AGENT;  // Placeholder
+  readonly userTier = 'TESTERS';
+
+  #skillsInjected = false;
+
+  get options(): RequestOptions {
+    return {};
+  }
+
+  readonly #activeSkills = new Set<SkillName>();
+
+  constructor(opts: AgentOptions) {
+    super(opts);
+    const skillsList = Object.keys(SKILLS).join(', ');
+    this.declareFunction<{skills: SkillName[]}>('learnSkills', {
+      description: `Load skills to help with the task. Available skills: ${skillsList}.`,
+      parameters: {
+        type: Host.AidaClient.ParametersTypes.OBJECT,
+        description: 'Parameters for learning skills',
+        properties: {
+          skills: {
+            type: Host.AidaClient.ParametersTypes.ARRAY,
+            items: {
+              type: Host.AidaClient.ParametersTypes.STRING,
+              description: 'Skill name',
+            },
+            description: 'List of skill names to load',
+          },
+        },
+        required: ['skills'],
+      },
+      displayInfoFromArgs: args => {
+        return {
+          title: `Learning skills: ${args.skills.join(', ')}`,
+        };
+      },
+      handler: async args => {
+        const result = await this.learnSkill(args.skills);
+        return {result};
+      },
+    });
+  }
+
+  override async enhanceQuery(query: string): Promise<string> {
+    if (this.#skillsInjected) {
+      return query;
+    }
+    this.#skillsInjected = true;
+    const skillsManifest = Object.entries(SKILLS).map(([name, skill]) => `- ${name}: ${skill.description}`).join('\n');
+    return `Available skills:
+${skillsManifest}
+
+You must call \`learnSkills\` to load a skill before you can use it.
+
+User query: ${query}`;
+  }
+
+  async *
+      handleContextDetails(_select: ConversationContext<unknown>|null): AsyncGenerator<ContextResponse, void, void> {
+    yield {
+      type: ResponseType.CONTEXT,
+      details: [{
+        title: 'Status',
+        text: 'Minimal agent initialized.',
+      }],
+    };
+  }
+
+  async learnSkill(names: SkillName[]): Promise<string> {
+    let response = '';
+    for (const name of names) {
+      debugLog(`AiAgent2: Attempting to load skill ${name}`);
+      if (this.#activeSkills.has(name)) {
+        debugLog(`AiAgent2: Skill ${name} is already loaded`);
+        response += `Skill ${name} is already loaded.\n`;
+        continue;
+      }
+
+      const skillObj: Skill = SKILLS[name];
+      if (skillObj) {
+        this.#activeSkills.add(name);
+        debugLog(`AiAgent2: Skill ${name} loaded successfully`);
+        response += `Skill ${name} loaded. Instructions:\n${skillObj.instructions}\n`;
+      } else {
+        debugLog(`AiAgent2: Failed to load skill ${name}`);
+        response += `Failed to load skill ${name}. Valid skills are: ${Object.keys(SKILLS).join(', ')}.\n`;
+      }
+    }
+    return response.trim();
+  }
+
+  get activeSkills(): Set<SkillName> {
+    return this.#activeSkills;
+  }
+}

package/front_end/models/ai_assistance/AiConversation.ts

@@ -13,6 +13,7 @@ import type * as NetworkTimeCalculator from '../network_time_calculator/network_
 
 import {AccessibilityAgent, AccessibilityContext} from './agents/AccessibilityAgent.js';
 import {
+  type AgentOptions,
   type AiAgent,
   type AllowedOriginResult,
   type ContextDetail,
@@ -23,13 +24,13 @@ import {
   ResponseType,
   type UserQuery
 } from './agents/AiAgent.js';
-import {BreakpointDebuggerAgent} from './agents/BreakpointDebuggerAgent.js';
 import {ContextSelectionAgent} from './agents/ContextSelectionAgent.js';
 import {FileAgent, FileContext} from './agents/FileAgent.js';
 import {NetworkAgent, RequestContext} from './agents/NetworkAgent.js';
 import {PerformanceAgent, PerformanceTraceContext} from './agents/PerformanceAgent.js';
 import {StorageAgent, StorageContext} from './agents/StorageAgent.js';
 import {NodeContext, StylingAgent} from './agents/StylingAgent.js';
+import {AiAgent2} from './AiAgent2.js';
 import {AiHistoryStorage, ConversationType, type SerializedConversation} from './AiHistoryStorage.js';
 import type {ChangeManager} from './ChangeManager.js';
 
@@ -357,42 +358,27 @@ export class AiConversation {
       allowedOrigin: this.allowedOrigin,
       history,
     };
+
+    this.#agent = Root.Runtime.hostConfig.devToolsAiV2Architecture?.enabled ? new AiAgent2(options) :
+                                                                              this.#createV1Agent(type, options);
+  }
+
+  #createV1Agent(type: ConversationType, options: AgentOptions): AiAgent<unknown> {
     switch (type) {
-      case ConversationType.STYLING: {
-        this.#agent = new StylingAgent(options);
-        break;
-      }
-      case ConversationType.NETWORK: {
-        this.#agent = new NetworkAgent(options);
-        break;
-      }
-      case ConversationType.FILE: {
-        this.#agent = new FileAgent(options);
-        break;
-      }
-      case ConversationType.PERFORMANCE: {
-        this.#agent = new PerformanceAgent(options);
-        break;
-      }
-      case ConversationType.BREAKPOINT: {
-        const breakpointAgentEnabled = Greendev.Prototypes.instance().isEnabled('breakpointDebuggerAgent');
-        if (breakpointAgentEnabled) {
-          this.#agent = new BreakpointDebuggerAgent(options);
-        }
-        break;
-      }
-      case ConversationType.ACCESSIBILITY: {
-        this.#agent = new AccessibilityAgent(options);
-        break;
-      }
-      case ConversationType.STORAGE: {
-        this.#agent = new StorageAgent(options);
-        break;
-      }
-      case ConversationType.NONE: {
-        this.#agent = new ContextSelectionAgent(options);
-        break;
-      }
+      case ConversationType.STYLING:
+        return new StylingAgent(options);
+      case ConversationType.NETWORK:
+        return new NetworkAgent(options);
+      case ConversationType.FILE:
+        return new FileAgent(options);
+      case ConversationType.PERFORMANCE:
+        return new PerformanceAgent(options);
+      case ConversationType.ACCESSIBILITY:
+        return new AccessibilityAgent(options);
+      case ConversationType.STORAGE:
+        return new StorageAgent(options);
+      case ConversationType.NONE:
+        return new ContextSelectionAgent(options);
       default:
         Platform.assertNever(type, 'Unknown conversation type');
     }

package/front_end/models/ai_assistance/AiHistoryStorage.ts

@@ -13,7 +13,6 @@ export const enum ConversationType {
   FILE = 'drjones-file',
   NETWORK = 'drjones-network-request',
   PERFORMANCE = 'drjones-performance-full',
-  BREAKPOINT = 'breakpoint',
   ACCESSIBILITY = 'accessibility',
   STORAGE = 'storage',
 }

package/front_end/models/ai_assistance/AiOrigins.ts

@@ -0,0 +1,46 @@
+// Copyright 2026 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import * as Common from '../../core/common/common.js';
+import type * as Platform from '../../core/platform/platform.js';
+
+/**
+ * Returns true if the origin is considered opaque and should be blocked from
+ * AI assistance to prevent potential data leakage.
+ *
+ * @see https://crbug.com/513732588
+ */
+export function isOpaqueOrigin(origin: string): boolean {
+  /**
+   * Origins starting with 'about' (like about:blank or about:srcdoc) are
+   * considered opaque. 'about://' is the sentinel used by DevTools
+   * ParsedURL.securityOrigin() for these.
+   */
+  return origin === 'null' || origin === 'data:' || origin.startsWith('about') || origin.startsWith('detached');
+}
+
+/**
+ * Extracts the origin from a context URL or identifier.
+ * Handles special cases like "detached" nodes and trace identifiers.
+ */
+export function extractContextOrigin(contextURL: string): string {
+  if (isOpaqueOrigin(contextURL)) {
+    return contextURL;
+  }
+  if (contextURL.startsWith('trace-')) {
+    return contextURL;
+  }
+  return Common.ParsedURL.ParsedURL.extractOrigin(contextURL as Platform.DevToolsPath.UrlString);
+}
+
+/**
+ * Determines if two origins are equivalent and safe to be used together.
+ * Opaque origins are never equivalent to anything, not even themselves.
+ */
+export function areOriginsEquivalent(origin1: string, origin2: string): boolean {
+  if (isOpaqueOrigin(origin1) || isOpaqueOrigin(origin2)) {
+    return false;
+  }
+  return origin1 === origin2;
+}

package/front_end/models/ai_assistance/AiUtils.ts

@@ -62,3 +62,12 @@ export function isGeminiBranding(): boolean {
 export function getIconName(): string {
   return isGeminiBranding() ? 'spark' : 'smart-assistant';
 }
+
+export function isSameOrigin(url1: Platform.DevToolsPath.UrlString, url2: Platform.DevToolsPath.UrlString): boolean {
+  if (url1.startsWith('data:') || url2.startsWith('data:')) {
+    return url1 === url2;
+  }
+  const origin1 = Common.ParsedURL.ParsedURL.extractOrigin(url1);
+  const origin2 = Common.ParsedURL.ParsedURL.extractOrigin(url2);
+  return origin1 !== '' && origin1 === origin2;
+}

package/front_end/models/ai_assistance/README.md

@@ -22,6 +22,22 @@ When the user begins a conversation with the AI, we want to include information
 
 To deal with the work to take an object that is the AI agent's context and turn it into a text representation that can be sent to the AI, we use _formatters_. These are typically classes with `static` methods that can take in objects and return their text representation that we want to pass to the AI.
 
+## Future Architecture (V2) - WIP
+
+We are currently working on migrating the DevTools AI Assistance from a siloed multi-agent architecture to a unified, skill-based single-agent architecture (`AIAgent2`).
+
+In this new architecture:
+- A single agent (`AIAgent2`) handles multiple domains.
+- Capabilities are defined as **Skills** in Markdown files.
+- The agent can dynamically load skills as needed via a `learnSkill` tool.
+
+This work is currently in progress and behind a feature flag.
+
+### Skills Build System
+
+To support dynamic loading of skills, we generate JavaScript files from Markdown files containing skill definitions.
+We use a nested `BUILD.gn` file in the `skills/` subdirectory specifically for this purpose. This ensures that GN's `target_gen_dir` points to `gen/front_end/models/ai_assistance/skills/`, placing the generated `.skill.js` files in the same relative structure as their source `.md` files. This allows TypeScript files in the `skills/` directory (like `map.ts`) to import the generated files using relative paths (e.g., `./styling.skill.js`) seamlessly.
+
 ## Performance specific documentation
 
 ### `TimelineUtils.AIContext.AgentFocus`

package/front_end/models/ai_assistance/StorageItem.ts

@@ -2,35 +2,39 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-interface StorageItemOriginOnly {
-  origin: string;
-  storageKey?: string;
-  storageType?: never;
-  key?: never;
+export class StorageItem {
+  constructor(
+      /**
+       * The origin of the top-level primary page target being inspected.
+       * Used to restrict AI agent tools from accessing unauthorized pages.
+       */
+      readonly primaryTargetOrigin: string,
+      /**
+       * The origin of the selected storage or cookie item (if any).
+       * If no item is selected, this is the same as primaryTargetOrigin.
+       */
+      readonly origin: string,
+  ) {
+  }
 }
 
-interface StorageItemWithKey {
-  origin: string;
-  storageKey?: string;
-  storageType: 'cookie'|'localStorage'|'sessionStorage';
-  key: string;
+export class DOMStorageItem extends StorageItem {
+  constructor(
+      primaryTargetOrigin: string,
+      origin: string,
+      /** The storage key partition identifier used by the browser storage engine. */
+      readonly storageKey: string,
+      /** The sub-category of DOM storage: 'localStorage' or 'sessionStorage'. */
+      readonly type: string,
+      /** The optional specific key of the selected item in this storage partition. */
+      readonly key?: string,
+  ) {
+    super(primaryTargetOrigin, origin);
+  }
 }
 
-export type StorageItemData = StorageItemOriginOnly|StorageItemWithKey;
-
-// The StorageItem is used as context for the Ai Assistance.
-// If the user selects a row in e.g. the cookies table, the storageType and key
-// will be populated.
-export class StorageItem {
-  readonly origin: string;
-  readonly storageKey?: string;
-  readonly storageType?: 'cookie'|'localStorage'|'sessionStorage';
-  readonly key?: string;
-
-  constructor(data: StorageItemData) {
-    this.origin = data.origin;
-    this.storageKey = data.storageKey;
-    this.storageType = data.storageType;
-    this.key = data.key;
+export class CookieItem extends StorageItem {
+  constructor(primaryTargetOrigin: string, origin: string, readonly name?: string) {
+    super(primaryTargetOrigin, origin);
   }
 }

package/front_end/models/ai_assistance/agents/AccessibilityAgent.ts

@@ -4,9 +4,11 @@
 
 import * as Host from '../../../core/host/host.js';
 import * as i18n from '../../../core/i18n/i18n.js';
+import type * as Platform from '../../../core/platform/platform.js';
 import * as Root from '../../../core/root/root.js';
 import * as SDK from '../../../core/sdk/sdk.js';
 import type * as LHModel from '../../lighthouse/lighthouse.js';
+import {isSameOrigin} from '../AiUtils.js';
 import {ChangeManager} from '../ChangeManager.js';
 import {LighthouseFormatter} from '../data_formatters/LighthouseFormatter.js';
 import {debugLog} from '../debug.js';
@@ -91,8 +93,8 @@ export class AccessibilityContext extends ConversationContext<LHModel.ReporterTy
     return this.#lh.finalUrl ?? this.#lh.finalDisplayedUrl;
   }
 
-  override getOrigin(): string {
-    return new URL(this.#url()).origin;
+  override getURL(): string {
+    return this.#url();
   }
 
   override getItem(): LHModel.ReporterTypes.ReportJSON {
@@ -222,9 +224,14 @@ export class AccessibilityAgent extends AiAgent<LHModel.ReporterTypes.ReportJSON
       return null;
     }
 
-    const resourceTreeModel = target.model(SDK.ResourceTreeModel.ResourceTreeModel);
-    const mainFrameId = resourceTreeModel?.mainFrame?.id;
-    if (node.frameId() !== mainFrameId) {
+    const mainDocument = domModel.existingDocument();
+    if (!mainDocument) {
+      return null;
+    }
+    const mainDocumentURL = mainDocument.documentURL;
+    const nodeDocumentURL = node.ownerDocument?.documentURL ?? '' as Platform.DevToolsPath.UrlString;
+
+    if (!isSameOrigin(mainDocumentURL, nodeDocumentURL)) {
       return null;
     }