chrome-devtools-frontend 1.0.1690531 → 1.0.1695017

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

@@ -2,7 +2,6 @@
 // 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 * as Host from '../../../core/host/host.js';
 import * as i18n from '../../../core/i18n/i18n.js';
 import * as Root from '../../../core/root/root.js';
@@ -12,12 +11,11 @@ import * as Logs from '../../logs/logs.js';
 import * as NetworkTimeCalculator from '../../network_time_calculator/network_time_calculator.js';
 import type * as Trace from '../../trace/trace.js';
 import * as Workspace from '../../workspace/workspace.js';
-import {isOpaqueOrigin} from '../AiOrigins.js';
 import {AccessibilityContext} from '../contexts/AccessibilityContext.js';
 import {DOMNodeContext} from '../contexts/DOMNodeContext.js';
 import {FileContext} from '../contexts/FileContext.js';
 import {PerformanceTraceContext} from '../contexts/PerformanceTraceContext.js';
-import {getRequestContextOrigin, RequestContext} from '../contexts/RequestContext.js';
+import {RequestContext} from '../contexts/RequestContext.js';
 import {StorageContext} from '../contexts/StorageContext.js';
 import {formatBytesToKb, seconds} from '../data_formatters/UnitFormatters.js';
 import {debugLog} from '../debug.js';
@@ -149,16 +147,16 @@ export class ContextSelectionAgent extends AiAgent<never> {
           };
         }
         const origin = allowedOriginResult.origin;
-        if (origin && isOpaqueOrigin(origin)) {
+        if (origin?.isOpaque()) {
           return {
             error: 'No requests recorded by DevTools',
           };
         }
 
+        const allowedSecurityOrigin = origin ?? null;
         let hasCrossOriginRequest = false;
         const requestsToShow: NetworkRequest[] = [];
         for (const request of this.#networkLog.requests()) {
-          const requestOrigin = getRequestContextOrigin(request);
           /**
            * NOTE: this origin check does not ensure that all the requests are
            * from the same origin as the target page. Instead, it ensures that
@@ -167,7 +165,7 @@ export class ContextSelectionAgent extends AiAgent<never> {
            * during the loading of the target page, and do not leak URLs from
            * other pages.
            */
-          if (origin && requestOrigin !== origin) {
+          if (allowedSecurityOrigin && !request.initiatorSecurityOrigin().isSameOriginWith(allowedSecurityOrigin)) {
             hasCrossOriginRequest = true;
             continue;
           }
@@ -185,7 +183,7 @@ export class ContextSelectionAgent extends AiAgent<never> {
         if (requests.length === 0) {
           return {
             error: hasCrossOriginRequest ?
-                `No requests showing with origin ${origin}. Tell the user to start a new chat` :
+                `No requests showing with origin ${origin?.siteId() ?? ''}. Tell the user to start a new chat` :
                 'No requests recorded by DevTools',
           };
         }
@@ -232,18 +230,18 @@ export class ContextSelectionAgent extends AiAgent<never> {
           };
         }
         const origin = allowedOriginResult.origin;
-        if (origin && isOpaqueOrigin(origin)) {
+        if (origin?.isOpaque()) {
           return {
             error: 'No request found',
           };
         }
+        const allowedSecurityOrigin = origin ?? null;
         const request = this.#networkLog.requests().find(req => {
           if (req.requestId() !== id) {
             return false;
           }
 
-          const requestOrigin = getRequestContextOrigin(req);
-          return !origin || requestOrigin === origin;
+          return !allowedSecurityOrigin || req.initiatorSecurityOrigin().isSameOriginWith(allowedSecurityOrigin);
         });
 
         if (request) {
@@ -293,10 +291,9 @@ export class ContextSelectionAgent extends AiAgent<never> {
         const files: Array<{file: string, id: number | undefined}> = [];
         const uiSourceCodes: Workspace.UISourceCode.UISourceCode[] = [];
         for (const file of ContextSelectionAgent.getUISourceCodes(this.#workspace)) {
-          const fileUrl = file.url();
-          const fileOrigin = Common.ParsedURL.ParsedURL.extractOrigin(fileUrl);
+          const fileSecurityOrigin = FileContext.originForUISourceCode(file);
 
-          if (origin && fileOrigin !== origin) {
+          if (origin && !fileSecurityOrigin.isSameOriginWith(origin)) {
             continue;
           }
 
@@ -354,9 +351,8 @@ export class ContextSelectionAgent extends AiAgent<never> {
           if (ContextSelectionAgent.uiSourceCodeId.get(file) !== params.id) {
             return false;
           }
-          const fileUrl = file.url();
-          const fileOrigin = Common.ParsedURL.ParsedURL.extractOrigin(fileUrl);
-          return !origin || fileOrigin === origin;
+          const fileSecurityOrigin = FileContext.originForUISourceCode(file);
+          return !origin || fileSecurityOrigin.isSameOriginWith(origin);
         });
 
         if (!file) {
@@ -534,7 +530,7 @@ export class ContextSelectionAgent extends AiAgent<never> {
           }
 
           return {
-            context: new StorageContext(new StorageItem(origin, origin)),
+            context: new StorageContext(new StorageItem(origin.siteId(), origin.siteId())),
             description: 'User selected page storage',
           };
         },

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

@@ -12,7 +12,6 @@ import * as TextUtils from '../../../core/text_utils/text_utils.js';
 import * as Tracing from '../../../services/tracing/tracing.js';
 import * as Logs from '../../logs/logs.js';
 import * as Trace from '../../trace/trace.js';
-import {canResourceContentsBeReadForTrace} from '../AiOrigins.js';
 import type {MainThreadSectionLabel, PerformanceTraceContext} from '../contexts/PerformanceTraceContext.js';
 import {
   PerformanceInsightFormatter,
@@ -1053,6 +1052,10 @@ export class PerformanceAgent extends AiAgent<AgentFocus> {
           return {error: 'Missing arg: column'};
         }
 
+        if (!context.canAccessResource(args.scriptUrl)) {
+          return {error: 'Resource not found'};
+        }
+
         if (!this.#formatter) {
           throw new Error('missing formatter');
         }
@@ -1115,8 +1118,7 @@ export class PerformanceAgent extends AiAgent<AgentFocus> {
         }
 
         const url = args.url;
-        const allowedOrigin = context.getOrigin();
-        if (!canResourceContentsBeReadForTrace(url, allowedOrigin)) {
+        if (!context.canAccessResource(url)) {
           return {error: 'Resource not found'};
         }
 

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

@@ -71,16 +71,19 @@ export function isSamePageOrigin(target: SDK.Target.Target|null, context?: Conve
   if (!target || !context) {
     return false;
   }
-  const pageOrigin = Common.ParsedURL.ParsedURL.extractOrigin(target.inspectedURL());
-  return pageOrigin !== '' && context.isOriginAllowed(pageOrigin);
+  const inspectedURL = target.inspectedURL();
+  if (!inspectedURL) {
+    return false;
+  }
+  const pageOrigin = SDK.SecurityOrigin.SecurityOrigin.create(inspectedURL);
+  return !pageOrigin.isOpaque() && context.isOriginAllowed(pageOrigin);
 }
 
 const MAX_TARGET_ORIGINS = 100;
 
 function resolveTargetOrigins(context?: ConversationContext<StorageItem>, origins?: string[]): string[] {
   const primaryOrigin = context?.getOrigin();
-  const primaryString =
-      primaryOrigin instanceof SDK.SecurityOrigin.SecurityOrigin ? primaryOrigin.siteId() : primaryOrigin;
+  const primaryString = primaryOrigin?.siteId();
   const rawList = (origins && origins.length > 0) ? origins : (primaryString ? [primaryString] : []);
   const uniqueOrigins = Array.from(new Set(rawList));
   return uniqueOrigins.slice(0, MAX_TARGET_ORIGINS);
@@ -145,19 +148,21 @@ export class StorageAgent extends AiAgent<StorageItem> {
           return {error: 'No origin available or not allowed.'};
         }
 
-        const origins = new Set<string>();
+        const origins: SDK.SecurityOrigin.SecurityOrigin[] = [];
         for (const frame of SDK.ResourceTreeModel.ResourceTreeModel.frames(this.targetManager)) {
           if (!isSamePageOrigin(frame.resourceTreeModel().target().outermostTarget(), this.context)) {
             continue;
           }
-          const origin = frame.securityOrigin;
-          if (!origin || origins.has(origin)) {
+          const origin = frame.securityOrigin();
+          if (origin.isOpaque()) {
             continue;
           }
-          origins.add(origin);
+          if (!origins.some(existing => existing.isSameOriginWith(origin))) {
+            origins.push(origin);
+          }
         }
 
-        return {result: {origins: Array.from(origins)}};
+        return {result: {origins: origins.map(o => o.siteId())}};
       },
     });
 
@@ -679,8 +684,9 @@ export async function getCookiesForDomain(target: SDK.Target.Target,
 export function findFrameForOrigin(
     context: ConversationContext<StorageItem>|undefined, origin: string,
     targetManager: SDK.TargetManager.TargetManager): SDK.ResourceTreeModel.ResourceTreeFrame|null {
+  const parsedOrigin = SDK.SecurityOrigin.SecurityOrigin.create(origin);
   for (const frame of SDK.ResourceTreeModel.ResourceTreeModel.frames(targetManager)) {
-    if (frame.securityOrigin === origin) {
+    if (frame.securityOrigin().isSameOriginWith(parsedOrigin)) {
       const target = frame.resourceTreeModel().target();
       if (isSamePageOrigin(target.outermostTarget(), context)) {
         return frame;

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

@@ -4,7 +4,7 @@
 
 import * as Host from '../../../core/host/host.js';
 import * as Root from '../../../core/root/root.js';
-import * as SDK from '../../../core/sdk/sdk.js';
+import type * as SDK from '../../../core/sdk/sdk.js';
 import {ChangeManager} from '../ChangeManager.js';
 import {ExtensionScope} from '../ExtensionScope.js';
 import {AI_ASSISTANCE_CSS_CLASS_NAME} from '../injected.js';
@@ -155,8 +155,7 @@ export class StylingAgent extends AiAgent<SDK.DOMModel.DOMNode> {
         return await getStylesTool.handler(args, {
           getTarget: () => this.targetManager.primaryPageTarget() ?? context.getItem().domModel().target(),
           getEstablishedOrigin: () => {
-            const origin = context.getOrigin();
-            return origin instanceof SDK.SecurityOrigin.SecurityOrigin ? origin.siteId() : origin;
+            return context.getOrigin();
           },
         });
       },
@@ -177,11 +176,11 @@ export class StylingAgent extends AiAgent<SDK.DOMModel.DOMNode> {
             createExtensionScope: this.#createExtensionScope.bind(this),
             execJs: this.#execJs,
             getExecutionContextNode: () => this.context?.getItem() ?? null,
+            getEstablishedOrigin: () => this.context?.getOrigin(),
           },
           options,
           ),
     });
-
   }
 
   override preambleFeatures(): string[] {

package/front_end/models/ai_assistance/ai_assistance.ts

@@ -12,7 +12,6 @@ import * as StylingAgent from './agents/StylingAgent.js';
 import * as AiAgent2 from './AiAgent2.js';
 import * as AiConversation from './AiConversation.js';
 import * as AiHistoryStorage from './AiHistoryStorage.js';
-import * as AiOrigins from './AiOrigins.js';
 import * as AiSetting from './AiSetting.js';
 import * as AiUtils from './AiUtils.js';
 import * as BuiltInAi from './BuiltInAi.js';
@@ -80,7 +79,6 @@ export {
   AIContext,
   AiConversation,
   AiHistoryStorage,
-  AiOrigins,
   AIQueries,
   AiSetting,
   AiUtils,

package/front_end/models/ai_assistance/contexts/AccessibilityContext.ts

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import * as SDK from '../../../core/sdk/sdk.js';
 import type * as LHModel from '../../lighthouse/lighthouse.js';
 import {
   type AiWidget,
@@ -23,8 +24,16 @@ export class AccessibilityContext extends ConversationContext<LHModel.ReporterTy
     return this.#lh.finalUrl ?? this.#lh.finalDisplayedUrl;
   }
 
-  override getURL(): string {
-    return this.#url();
+  /**
+   * Returns the security origin of the audited page from the Lighthouse report.
+   *
+   * Derives the origin from the report URL (`finalUrl` or `finalDisplayedUrl`).
+   * If the report does not contain a valid URL, returns a unique opaque origin.
+   *
+   * @returns The security origin of the audited page.
+   */
+  override getOrigin(): SDK.SecurityOrigin.SecurityOrigin {
+    return SDK.SecurityOrigin.SecurityOrigin.create(this.#url());
   }
 
   override getItem(): LHModel.ReporterTypes.ReportJSON {

package/front_end/models/ai_assistance/contexts/DOMNodeContext.ts

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import * as i18n from '../../../core/i18n/i18n.js';
-import type * as SDK from '../../../core/sdk/sdk.js';
+import * as SDK from '../../../core/sdk/sdk.js';
 import {
   type ContextDetail,
   ConversationContext,
@@ -21,19 +21,31 @@ const lockedString = i18n.i18n.lockedString;
 
 export class DOMNodeContext extends ConversationContext<SDK.DOMModel.DOMNode> {
   #node: SDK.DOMModel.DOMNode;
+  #opaqueOrigin?: SDK.SecurityOrigin.SecurityOrigin;
 
   constructor(node: SDK.DOMModel.DOMNode) {
     super();
     this.#node = node;
   }
 
-  override getURL(): string {
+  /**
+   * Returns the security origin of the node's owner document.
+   *
+   * If the node is detached from a document, returns a unique opaque origin to
+   * prevent unauthorized cross-origin access in AI conversations.
+   *
+   * @returns The security origin of the owner document, or a unique opaque origin.
+   */
+  override getOrigin(): SDK.SecurityOrigin.SecurityOrigin {
     const ownerDocument = this.#node.ownerDocument;
     if (!ownerDocument) {
-      // The node is detached from a document.
-      return 'detached';
+      // Detached nodes have no security document; isolate them with a unique opaque origin.
+      if (!this.#opaqueOrigin) {
+        this.#opaqueOrigin = SDK.SecurityOrigin.SecurityOrigin.createUniqueOpaque();
+      }
+      return this.#opaqueOrigin;
     }
-    return ownerDocument.documentURL;
+    return SDK.SecurityOrigin.SecurityOrigin.create(ownerDocument.documentURL);
   }
 
   getItem(): SDK.DOMModel.DOMNode {

package/front_end/models/ai_assistance/contexts/FileContext.ts

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import type * as SDK from '../../../core/sdk/sdk.js';
+import * as SDK from '../../../core/sdk/sdk.js';
 import type * as Bindings from '../../bindings/bindings.js';
 import type * as Workspace from '../../workspace/workspace.js';
 import {type ContextDetail, ConversationContext} from '../agents/AiAgent.js';
@@ -19,13 +19,20 @@ export class FileContext extends ConversationContext<Workspace.UISourceCode.UISo
     this.#debuggerWorkspaceBinding = debuggerWorkspaceBinding;
   }
 
-  override getOrigin(): string|SDK.SecurityOrigin.SecurityOrigin {
-    const fallbackOrigin = super.getOrigin();
-    return this.#file.project()?.securityOrigin?.() ?? fallbackOrigin;
+  /**
+   * Resolves the security origin of a given UISourceCode.
+   * Prefers the project security origin, falling back to the origin of the file URL.
+   */
+  static originForUISourceCode(file: Workspace.UISourceCode.UISourceCode): SDK.SecurityOrigin.SecurityOrigin {
+    return file.project()?.securityOrigin?.() ?? SDK.SecurityOrigin.SecurityOrigin.create(file.url());
   }
 
-  override getURL(): string {
-    return this.#file.url();
+  /**
+   * Returns the security origin of the project containing the file, falling
+   * back to the origin derived from the file URL.
+   */
+  override getOrigin(): SDK.SecurityOrigin.SecurityOrigin {
+    return FileContext.originForUISourceCode(this.#file);
   }
 
   override getItem(): Workspace.UISourceCode.UISourceCode {

package/front_end/models/ai_assistance/contexts/PerformanceTraceContext.ts

@@ -2,7 +2,6 @@
 // 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';
 import * as SDK from '../../../core/sdk/sdk.js';
 import * as Tracing from '../../../services/tracing/tracing.js';
@@ -15,7 +14,6 @@ import {
   ConversationContext,
   type ConversationSuggestions,
 } from '../agents/AiAgent.js';
-import {extractContextOrigin} from '../AiOrigins.js';
 import {
   PerformanceInsightFormatter,
 } from '../data_formatters/PerformanceInsightFormatter.js';
@@ -88,6 +86,7 @@ export class PerformanceTraceContext extends ConversationContext<AgentFocus> {
   readonly #targetManager: SDK.TargetManager.TargetManager;
   readonly #freshRecordingTracker: Tracing.FreshRecording.Tracker;
   readonly #debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding;
+  #origin?: SDK.SecurityOrigin.SecurityOrigin;
 
   constructor(focus: AgentFocus,
               // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
@@ -128,36 +127,64 @@ export class PerformanceTraceContext extends ConversationContext<AgentFocus> {
     return formatter;
   }
 
-  override getURL(): string {
-    const url = this.#focus.parsedTrace.data.Meta.mainFrameURL;
-    try {
-      new URL(url);
-      return url;
-    } catch {
-      const {min, max} = this.#focus.parsedTrace.data.Meta.traceBounds;
-      return `trace-${min}-${max}`;
+  /**
+   * Returns whether this trace was imported rather than recorded live in the current session.
+   */
+  isImported(): boolean {
+    return !this.#freshRecordingTracker.recordingIsFresh(this.#focus.parsedTrace);
+  }
+
+  /**
+   * Checks whether the AI can access the resource at the specified URL.
+   *
+   * Access requires the resource origin to match the trace origin.
+   * Always rejects `file://` URLs to prevent local file leaks (b/523743289).
+   *
+   * @param url The URL of the resource to access.
+   * @returns `true` if the resource is same-origin with the trace and not a `file://` URL; otherwise `false`.
+   */
+  canAccessResource(url: string): boolean {
+    const traceOrigin = this.getOrigin();
+    const targetOrigin = SDK.SecurityOrigin.SecurityOrigin.create(url);
+
+    // We explicitly block all file:// URLs even if same-origin (b/523743289).
+    // Allowing local file access in trace AI risks leaking local system files
+    // (such as /etc/passwd) via prompt injection across filesystem edge cases.
+    if (traceOrigin.isFile() || targetOrigin.isFile()) {
+      return false;
     }
+
+    return traceOrigin.isSameOriginWith(targetOrigin);
   }
 
   /**
-   * Returns the origin for a performance trace in the AI context.
+   * Returns the security origin for the performance trace.
+   *
+   * Live traces use the origin of the main frame URL.
    *
-   * To prevent cross-origin prompt injection attacks, imported traces
-   * are isolated from live pages. We assign them a virtual origin
-   * (`imported-trace://${domain}`) so they do not share the origin of live pages
-   * (e.g., `https://${domain}`). This forces a conversation reset when transitioning
-   * between imported trace data and live pages.
+   * Imported traces use a custom scheme (`imported-trace://${host}`) to isolate
+   * them from live pages (such as `https://${host}`). This isolation prevents
+   * cross-origin prompt injection and requires a new conversation when switching
+   * between imported traces and live pages.
+   *
+   * If an imported trace origin does not contain a host, this method returns a
+   * unique opaque origin.
+   *
+   * @returns The security origin for the trace.
    */
-  override getOrigin(): string {
-    const parsedTrace = this.#focus.parsedTrace;
-    const url = this.getURL();
-    const origin = extractContextOrigin(url);
-    const isFresh = this.#freshRecordingTracker.recordingIsFresh(parsedTrace);
-    if (!isFresh) {
-      const parsed = Common.ParsedURL.ParsedURL.fromString(origin as Platform.DevToolsPath.UrlString);
-      return `imported-trace://${parsed ? parsed.domain() : origin}`;
+  override getOrigin(): SDK.SecurityOrigin.SecurityOrigin {
+    if (!this.#origin) {
+      if (this.isImported()) {
+        this.#origin = SDK.SecurityOrigin.SecurityOrigin.createForImportedTrace(
+            this.#focus.parsedTrace.data.Meta.mainFrameURL,
+        );
+      } else {
+        this.#origin = SDK.SecurityOrigin.SecurityOrigin.create(
+            this.#focus.parsedTrace.data.Meta.mainFrameURL,
+        );
+      }
     }
-    return origin;
+    return this.#origin;
   }
 
   override getItem(): AgentFocus {

package/front_end/models/ai_assistance/contexts/RequestContext.ts

@@ -2,17 +2,16 @@
 // 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 * as i18n from '../../../core/i18n/i18n.js';
-import type * as Platform from '../../../core/platform/platform.js';
 import type * as SDK from '../../../core/sdk/sdk.js';
 import type * as NetworkTimeCalculator from '../../network_time_calculator/network_time_calculator.js';
 import {
   type ContextDetail,
   ConversationContext,
 } from '../agents/AiAgent.js';
-import {extractContextOrigin} from '../AiOrigins.js';
-import {NetworkRequestFormatter} from '../data_formatters/NetworkRequestFormatter.js';
+import {
+  NetworkRequestFormatter,
+} from '../data_formatters/NetworkRequestFormatter.js';
 
 const UIStringsNotTranslate = {
   request: 'Request',
@@ -24,24 +23,6 @@ const UIStringsNotTranslate = {
 
 const lockedString = i18n.i18n.lockedString;
 
-/**
- * Returns the origin for a network request in the AI context.
- *
- * To prevent cross-origin prompt injection attacks, HAR-imported requests
- * are isolated from live pages. We assign them a virtual origin
- * (`imported-har://${domain}`) so they do not share the origin of live pages
- * (e.g., `https://${domain}`). This forces a conversation reset when transitioning
- * between imported HAR data and live pages.
- */
-export function getRequestContextOrigin(request: SDK.NetworkRequest.NetworkRequest): string {
-  const origin = extractContextOrigin(request.documentURL);
-  if (request.isImportedHar()) {
-    const parsed = Common.ParsedURL.ParsedURL.fromString(origin as Platform.DevToolsPath.UrlString);
-    return `imported-har://${parsed ? parsed.domain() : origin}`;
-  }
-  return origin;
-}
-
 export class RequestContext extends ConversationContext<SDK.NetworkRequest.NetworkRequest> {
   #request: SDK.NetworkRequest.NetworkRequest;
   #calculator: NetworkTimeCalculator.NetworkTransferTimeCalculator;
@@ -56,17 +37,14 @@ export class RequestContext extends ConversationContext<SDK.NetworkRequest.Netwo
   }
 
   /**
-   * Note: this is not the literal origin of the network request. This URL
-   * is used to determine when we should force the user to start a new AI
-   * conversation when the context changes. We allow a single AI conversation to
-   * inspect all network requests that were made for that given target URL.
+   * Returns the security origin of the document that initiated the request.
+   *
+   * Network requests to third-party endpoints share the origin of the page
+   * that initiated them. This permits the AI to inspect third-party subresources
+   * without triggering a cross-origin conversation reset.
    */
-  override getURL(): string {
-    return this.#request.documentURL;
-  }
-
-  override getOrigin(): string {
-    return getRequestContextOrigin(this.#request);
+  override getOrigin(): SDK.SecurityOrigin.SecurityOrigin {
+    return this.#request.initiatorSecurityOrigin();
   }
 
   override getItem(): SDK.NetworkRequest.NetworkRequest {
@@ -77,13 +55,19 @@ export class RequestContext extends ConversationContext<SDK.NetworkRequest.Netwo
     return this.#request.name();
   }
 
+  #createFormatter(): NetworkRequestFormatter {
+    return new NetworkRequestFormatter(this.#request, this.#calculator, {
+      accessingSecurityOrigin: this.#request.initiatorSecurityOrigin(),
+    });
+  }
+
   override async getPromptDetails(): Promise<string|null> {
-    const formatter = new NetworkRequestFormatter(this.#request, this.#calculator);
+    const formatter = this.#createFormatter();
     return `# Selected network request\n${await formatter.formatNetworkRequest()}`;
   }
 
   override async getUserFacingDetails(): Promise<[ContextDetail, ...ContextDetail[]]|null> {
-    const formatter = new NetworkRequestFormatter(this.#request, this.#calculator);
+    const formatter = this.#createFormatter();
     const requestContextDetail: ContextDetail = {
       title: lockedString(UIStringsNotTranslate.request),
       text: lockedString(UIStringsNotTranslate.requestUrl) + ': ' + this.#request.url() + '\n\n' +

package/front_end/models/ai_assistance/contexts/StorageContext.ts

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import * as SDK from '../../../core/sdk/sdk.js';
 import {
   ConversationContext,
   type ConversationSuggestions,
@@ -16,8 +17,18 @@ export class StorageContext extends ConversationContext<StorageItem> {
     this.#item = item;
   }
 
-  override getURL(): string {
-    return this.#item.primaryTargetOrigin;
+  /**
+   * Returns the security origin of the primary inspected page target.
+   *
+   * The storage context binds to `primaryTargetOrigin` rather than the specific
+   * item origin (`this.#item.origin`). This allows generic storage views
+   * (which have an empty origin) and third-party storage items to be inspected
+   * within the current page conversation.
+   *
+   * @returns The security origin of the primary page target.
+   */
+  override getOrigin(): SDK.SecurityOrigin.SecurityOrigin {
+    return SDK.SecurityOrigin.SecurityOrigin.create(this.#item.primaryTargetOrigin);
   }
 
   override getItem(): StorageItem {
@@ -38,7 +49,7 @@ export class StorageContext extends ConversationContext<StorageItem> {
       const prefix = this.#item.type === 'localStorage' ? 'local storage' : 'session storage';
       return `${prefix}${this.#item.isGenericContext ? '' : `: ${this.#item.origin}`}`;
     }
-    return `Storage: ${this.getOrigin()}`;
+    return `Storage: ${this.getOrigin().siteId()}`;
   }
 
   /**

package/front_end/models/ai_assistance/data_formatters/FileFormatter.ts

@@ -4,10 +4,9 @@
 
 import * as Bindings from '../../bindings/bindings.js';
 import * as Logs from '../../logs/logs.js';
-import * as NetworkTimeCalculator from '../../network_time_calculator/network_time_calculator.js';
 import type * as Workspace from '../../workspace/workspace.js';
 
-import {NetworkRequestFormatter} from './NetworkRequestFormatter.js';
+import {formatRequestInitiatorChain} from './NetworkRequestFormatter.js';
 
 const MAX_FILE_SIZE = 10000;
 
@@ -75,10 +74,8 @@ export class FileFormatter {
     ];
     const resource = Bindings.ResourceUtils.resourceForURL(this.#file.url());
     if (resource?.request) {
-      const calculator = new NetworkTimeCalculator.NetworkTransferTimeCalculator();
-      calculator.updateBoundaries(resource.request);
       lines.push(`Request initiator chain:
-${new NetworkRequestFormatter(resource.request, calculator, this.#networkLog).formatRequestInitiatorChain()}`);
+${formatRequestInitiatorChain(resource.request, this.#networkLog)}`);
     }
     lines.push(`File content:
 ${this.#formatFileContent()}`);