chrome-devtools-frontend 1.0.1545096 → 1.0.1547571

package/front_end/models/ai_assistance/ConversationHandler.ts

@@ -17,16 +17,14 @@ import {
   type ResponseData,
   ResponseType
 } from './agents/AiAgent.js';
-import {FileAgent} from './agents/FileAgent.js';
 import {NetworkAgent, RequestContext} from './agents/NetworkAgent.js';
-import {PerformanceAgent, type PerformanceTraceContext} from './agents/PerformanceAgent.js';
+import type {PerformanceTraceContext} from './agents/PerformanceAgent.js';
 import {NodeContext, StylingAgent} from './agents/StylingAgent.js';
+import {AiConversation} from './AiConversation.js';
 import {
-  Conversation,
   ConversationType,
 } from './AiHistoryStorage.js';
 import {getDisabledReasons} from './AiUtils.js';
-import type {ChangeManager} from './ChangeManager.js';
 
 interface ExternalStylingRequestParameters {
   conversationType: ConversationType.STYLING;
@@ -42,8 +40,7 @@ interface ExternalNetworkRequestParameters {
 
 export interface ExternalPerformanceAIConversationData {
   conversationHandler: ConversationHandler;
-  conversation: Conversation;
-  agent: AiAgent<unknown>;
+  conversation: AiConversation;
   selected: PerformanceTraceContext;
 }
 
@@ -122,9 +119,7 @@ export class ConversationHandler extends Common.ObjectWrapper.ObjectWrapper<Even
       aidaClient: Host.AidaClient.AidaClient, aidaAvailability?: Host.AidaClient.AidaAccessPreconditions) {
     super();
     this.#aidaClient = aidaClient;
-    if (aidaAvailability) {
-      this.#aidaAvailability = aidaAvailability;
-    }
+    this.#aidaAvailability = aidaAvailability;
     this.#aiAssistanceEnabledSetting = this.#getAiAssistanceEnabledSetting();
   }
 
@@ -144,6 +139,10 @@ export class ConversationHandler extends Common.ObjectWrapper.ObjectWrapper<Even
     conversationHandlerInstance = undefined;
   }
 
+  get aidaClient(): Host.AidaClient.AidaClient {
+    return this.#aidaClient;
+  }
+
   #getAiAssistanceEnabledSetting(): Common.Settings.Setting<boolean>|undefined {
     try {
       return Common.Settings.moduleSetting('ai-assistance-enabled') as Common.Settings.Setting<boolean>;
@@ -207,8 +206,9 @@ export class ConversationHandler extends Common.ObjectWrapper.ObjectWrapper<Even
 
   async *
       handleConversationWithHistory(
-          items: AsyncIterable<ResponseData, void, void>, conversation: Conversation|undefined):
-          AsyncGenerator<ResponseData, void, void> {
+          items: AsyncIterable<ResponseData, void, void>,
+          conversation: AiConversation|undefined,
+          ): AsyncGenerator<ResponseData, void, void> {
     for await (const data of items) {
       // We don't want to save partial responses to the conversation history.
       if (data.type !== ResponseType.ANSWER || data.complete) {
@@ -225,27 +225,27 @@ export class ConversationHandler extends Common.ObjectWrapper.ObjectWrapper<Even
     selected: NodeContext|PerformanceTraceContext|RequestContext|null,
   }): AsyncGenerator<ExternalRequestResponse, ExternalRequestResponse> {
     const {conversationType, aiAgent, prompt, selected} = opts;
-    const conversation = new Conversation(
+    const conversation = new AiConversation(
         conversationType,
         [],
         aiAgent.id,
         /* isReadOnly */ true,
+        this.#aidaClient,
+        undefined,
         /* isExternal */ true,
     );
-    return yield* this.#doExternalConversation({conversation, aiAgent, prompt, selected});
+    return yield* this.#doExternalConversation({conversation, prompt, selected});
   }
 
   async * #doExternalConversation(opts: {
-    conversation: Conversation,
-    aiAgent: AiAgent<unknown>,
+    conversation: AiConversation,
     prompt: string,
     selected: NodeContext|PerformanceTraceContext|RequestContext|null,
   }): AsyncGenerator<ExternalRequestResponse, ExternalRequestResponse> {
-    const {conversation, aiAgent, prompt, selected} = opts;
-    const generator = aiAgent.run(prompt, {selected});
-    const generatorWithHistory = this.handleConversationWithHistory(generator, conversation);
+    const {conversation, prompt, selected} = opts;
+    const generator = conversation.run(prompt, {selected});
     const devToolsLogs: object[] = [];
-    for await (const data of generatorWithHistory) {
+    for await (const data of generator) {
       if (data.type !== ResponseType.ANSWER || data.complete) {
         devToolsLogs.push(data);
       }
@@ -274,7 +274,10 @@ export class ConversationHandler extends Common.ObjectWrapper.ObjectWrapper<Even
 
   async #handleExternalStylingConversation(prompt: string, selector = 'body'):
       Promise<AsyncGenerator<ExternalRequestResponse, ExternalRequestResponse>> {
-    const stylingAgent = this.createAgent(ConversationType.STYLING);
+    const stylingAgent = new StylingAgent({
+      aidaClient: this.#aidaClient,
+      serverSideLoggingEnabled: isAiAssistanceServerSideLoggingEnabled(),
+    });
     const node = await inspectElementBySelector(selector);
     if (node) {
       await node.setAsInspectedNode();
@@ -292,7 +295,6 @@ export class ConversationHandler extends Common.ObjectWrapper.ObjectWrapper<Even
       Promise<AsyncGenerator<ExternalRequestResponse, ExternalRequestResponse>> {
     return this.#doExternalConversation({
       conversation: data.conversation,
-      aiAgent: data.agent,
       prompt,
       selected: data.selected,
     });
@@ -300,7 +302,10 @@ export class ConversationHandler extends Common.ObjectWrapper.ObjectWrapper<Even
 
   async #handleExternalNetworkConversation(prompt: string, requestUrl: string):
       Promise<AsyncGenerator<ExternalRequestResponse, ExternalRequestResponse>> {
-    const networkAgent = this.createAgent(ConversationType.NETWORK);
+    const networkAgent = new NetworkAgent({
+      aidaClient: this.#aidaClient,
+      serverSideLoggingEnabled: isAiAssistanceServerSideLoggingEnabled(),
+    });
     const request = await inspectNetworkRequestByUrl(requestUrl);
     if (!request) {
       return this.#generateErrorResponse(`Can't find request with the given selector ${requestUrl}`);
@@ -316,36 +321,6 @@ export class ConversationHandler extends Common.ObjectWrapper.ObjectWrapper<Even
       selected: new RequestContext(request, calculator),
     });
   }
-
-  createAgent(conversationType: ConversationType, changeManager?: ChangeManager): AiAgent<unknown> {
-    const options = {
-      aidaClient: this.#aidaClient,
-      serverSideLoggingEnabled: isAiAssistanceServerSideLoggingEnabled(),
-    };
-    let agent: AiAgent<unknown>;
-    switch (conversationType) {
-      case ConversationType.STYLING: {
-        agent = new StylingAgent({
-          ...options,
-          changeManager,
-        });
-        break;
-      }
-      case ConversationType.NETWORK: {
-        agent = new NetworkAgent(options);
-        break;
-      }
-      case ConversationType.FILE: {
-        agent = new FileAgent(options);
-        break;
-      }
-      case ConversationType.PERFORMANCE: {
-        agent = new PerformanceAgent(options);
-        break;
-      }
-    }
-    return agent;
-  }
 }
 
 export const enum ConversationHandlerEvents {

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

@@ -486,11 +486,14 @@ export abstract class AiAgent<T> {
   }
 
   async *
-      run(initialQuery: string, options: {
-        selected: ConversationContext<T>|null,
-        signal?: AbortSignal,
-      },
-          multimodalInput?: MultimodalInput): AsyncGenerator<ResponseData, void, void> {
+      run(
+          initialQuery: string,
+          options: {
+            selected: ConversationContext<T>|null,
+            signal?: AbortSignal,
+          },
+          multimodalInput?: MultimodalInput,
+          ): AsyncGenerator<ResponseData, void, void> {
     await options.selected?.refresh();
 
     if (options.selected) {
@@ -682,9 +685,7 @@ export abstract class AiAgent<T> {
 
       yield {
         type: ResponseType.SIDE_EFFECT,
-        confirm: (result: boolean) => {
-          sideEffectConfirmationPromiseWithResolvers.resolve(result);
-        },
+        confirm: sideEffectConfirmationPromiseWithResolvers.resolve,
       };
 
       const approvedRun = await sideEffectConfirmationPromiseWithResolvers.promise;

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

@@ -492,7 +492,7 @@ export class PerformanceAgent extends AiAgent<AgentFocus> {
       this.#addFacts(options.selected);
     }
 
-    return yield* super.run(initialQuery, options);
+    yield* super.run(initialQuery, options);
   }
 
   #createFactForTraceSummary(): void {
@@ -870,7 +870,11 @@ export class PerformanceAgent extends AiAgent<AgentFocus> {
         }
 
         const tree = AICallTree.fromEvent(event, parsedTrace);
-        const callTree = tree ? this.#formatter.formatCallTree(tree) : 'No call tree found';
+        if (!tree) {
+          return {error: 'No call tree found'};
+        }
+
+        const callTree = this.#formatter.formatCallTree(tree);
 
         const key = `getDetailedCallTree(${args.eventKey})`;
         this.#cacheFunctionResult(focus, key, callTree);

package/front_end/models/ai_assistance/agents/StylingAgent.snapshot.txt

@@ -119,7 +119,7 @@ Content:
   "metadata": {
     "disable_user_content_logging": false,
     "string_session_id": "sessionId",
-    "user_tier": 2,
+    "user_tier": 3,
     "client_version": "unit_test+function_calling"
   },
   "functionality_type": 5,

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

@@ -276,12 +276,6 @@ export class StylingAgent extends AiAgent<SDK.DOMModel.DOMNode> {
     this.#createExtensionScope = opts.createExtensionScope ?? ((changes: ChangeManager) => {
                                    return new ExtensionScope(changes, this.id, this.context?.getItem() ?? null);
                                  });
-    SDK.TargetManager.TargetManager.instance().addModelListener(
-        SDK.ResourceTreeModel.ResourceTreeModel,
-        SDK.ResourceTreeModel.Events.PrimaryPageChanged,
-        this.onPrimaryPageChanged,
-        this,
-    );
 
     this.declareFunction<{
       elements: string[],
@@ -327,11 +321,8 @@ export class StylingAgent extends AiAgent<SDK.DOMModel.DOMNode> {
           action: `getStyles(${JSON.stringify(params.elements)}, ${JSON.stringify(params.styleProperties)})`,
         };
       },
-      handler: async (
-          params,
-          options,
-          ) => {
-        return await this.getStyles(params.elements, params.styleProperties, options);
+      handler: async params => {
+        return await this.getStyles(params.elements, params.styleProperties);
       },
     });
 
@@ -421,10 +412,6 @@ const data = {
     });
   }
 
-  onPrimaryPageChanged(): void {
-    void this.#changes.clear();
-  }
-
   async generateObservation(
       action: string,
       {
@@ -583,10 +570,7 @@ const data = {
     return this.context?.getItem() ?? null;
   }
 
-  async getStyles(elements: string[], properties: string[], _options?: {
-    signal?: AbortSignal,
-    approved?: boolean,
-  }): Promise<FunctionCallHandlerResult<unknown>> {
+  async getStyles(elements: string[], properties: string[]): Promise<FunctionCallHandlerResult<unknown>> {
     const result:
         Record<string, {computed: Record<string, string|undefined>, authored: Record<string, string|undefined>}> = {};
     for (const uid of elements) {

package/front_end/models/ai_assistance/ai_assistance.ts

@@ -10,6 +10,7 @@ import * as PatchAgent from './agents/PatchAgent.js';
 import * as PerformanceAgent from './agents/PerformanceAgent.js';
 import * as PerformanceAnnotationsAgent from './agents/PerformanceAnnotationsAgent.js';
 import * as StylingAgent from './agents/StylingAgent.js';
+import * as AiConversation from './AiConversation.js';
 import * as AiHistoryStorage from './AiHistoryStorage.js';
 import * as AiUtils from './AiUtils.js';
 import * as BuiltInAi from './BuiltInAi.js';
@@ -33,6 +34,7 @@ export {
   AiAgent,
   AICallTree,
   AIContext,
+  AiConversation,
   AiHistoryStorage,
   AIQueries,
   AiUtils,