[Cleanup] Update type location and naming

Things coming from Aida should stay on the layer.
Other things should not reference it if not directly using it.

Bug: none
Change-Id: I96d5cb06c2ed5fcc8fdcb9d9596ba85fec8d7dcc
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6023185
Auto-Submit: Nikolay Vitkov <[email protected]>
Reviewed-by: Ergün Erdoğmuş <[email protected]>
Commit-Queue: Ergün Erdoğmuş <[email protected]>

Author: Lightning00Blade

front_end/core/host/AidaClient.ts

@@ -21,7 +21,7 @@ export const enum Rating {
   NEGATIVE = 'NEGATIVE',
 }
 
-export interface Chunk {
+export interface HistoryChunk {
   text: string;
   entity: Entity;
 }
@@ -65,10 +65,10 @@ export interface AidaRequest {
   input: string;
   preamble?: string;
   // eslint-disable-next-line @typescript-eslint/naming-convention
-  chat_history?: Chunk[];
+  chat_history?: HistoryChunk[];
   client: string;
   options?: {
-    temperature?: Number,
+    temperature?: number,
     // eslint-disable-next-line @typescript-eslint/naming-convention
     model_id?: string,
   };

front_end/panels/freestyler/AiAgent.test.ts

@@ -23,7 +23,7 @@ class AiAgentMock extends AiAgent<unknown> {
   clientFeature: Host.AidaClient.ClientFeature = 0;
   userTier: undefined;
 
-  options: Freestyler.AidaRequestOptions = {
+  options: Freestyler.RequestOptions = {
     temperature: 1,
     modelId: 'test model',
   };

front_end/panels/freestyler/AiAgent.ts

@@ -87,16 +87,11 @@ export interface UserQuery {
 export type ResponseData = AnswerResponse|ErrorResponse|ActionResponse|SideEffectResponse|ThoughtResponse|TitleResponse|
     QueryResponse|ContextResponse|UserQuery;
 
-export interface AidaBuildRequestOptions {
+export interface BuildRequestOptions {
   input: string;
 }
 
-export interface HistoryChunk {
-  text: string;
-  entity: Host.AidaClient.Entity;
-}
-
-export interface AidaRequestOptions {
+export interface RequestOptions {
   temperature?: number;
   modelId?: string;
 }
@@ -156,7 +151,7 @@ export abstract class AiAgent<T> {
   #aidaClient: Host.AidaClient.AidaClient;
   #serverSideLoggingEnabled: boolean;
   abstract readonly preamble: string;
-  abstract readonly options: AidaRequestOptions;
+  abstract readonly options: RequestOptions;
   abstract readonly clientFeature: Host.AidaClient.ClientFeature;
   abstract readonly userTier: string|undefined;
   abstract handleContextDetails(select: ConversationContext<T>|null): AsyncGenerator<ContextResponse, void, void>;
@@ -178,7 +173,7 @@ export abstract class AiAgent<T> {
     this.#serverSideLoggingEnabled = opts.serverSideLoggingEnabled ?? false;
   }
 
-  get chatHistoryForTesting(): Array<HistoryChunk> {
+  get chatHistoryForTesting(): Array<Host.AidaClient.HistoryChunk> {
     return this.#chatHistoryForAida;
   }
 
@@ -250,7 +245,7 @@ export abstract class AiAgent<T> {
     return {response, rpcId};
   }
 
-  buildRequest(opts: AidaBuildRequestOptions): Host.AidaClient.AidaRequest {
+  buildRequest(opts: BuildRequestOptions): Host.AidaClient.AidaRequest {
     const history = this.#chatHistoryForAida;
     const request: Host.AidaClient.AidaRequest = {
       input: opts.input,
@@ -317,8 +312,8 @@ STOP`;
     return text;
   }
 
-  get #chatHistoryForAida(): HistoryChunk[] {
-    const history: Array<HistoryChunk> = [];
+  get #chatHistoryForAida(): Host.AidaClient.HistoryChunk[] {
+    const history: Array<Host.AidaClient.HistoryChunk> = [];
     let response: {
       title?: string,
       thought?: string,

front_end/panels/freestyler/DrJonesFileAgent.ts

@@ -12,11 +12,11 @@ import * as PanelUtils from '../utils/utils.js';
 import {
   AgentType,
   AiAgent,
-  type AidaRequestOptions,
   type ContextDetail,
   type ContextResponse,
   ConversationContext,
   type ParsedResponse,
+  type RequestOptions,
   ResponseType,
 } from './AiAgent.js';
 
@@ -108,7 +108,7 @@ export class DrJonesFileAgent extends AiAgent<Workspace.UISourceCode.UISourceCod
     const config = Common.Settings.Settings.instance().getHostConfig();
     return config.devToolsAiAssistanceFileAgent?.userTier;
   }
-  get options(): AidaRequestOptions {
+  get options(): RequestOptions {
     const config = Common.Settings.Settings.instance().getHostConfig();
     const temperature = config.devToolsAiAssistanceFileAgent?.temperature;
     const modelId = config.devToolsAiAssistanceFileAgent?.modelId;

front_end/panels/freestyler/DrJonesNetworkAgent.ts

@@ -13,11 +13,11 @@ import * as PanelUtils from '../utils/utils.js';
 import {
   AgentType,
   AiAgent,
-  type AidaRequestOptions,
   type ContextDetail,
   type ContextResponse,
   ConversationContext,
   type ParsedResponse,
+  type RequestOptions,
   ResponseType,
 } from './AiAgent.js';
 
@@ -136,7 +136,7 @@ export class DrJonesNetworkAgent extends AiAgent<SDK.NetworkRequest.NetworkReque
     const config = Common.Settings.Settings.instance().getHostConfig();
     return config.devToolsAiAssistanceNetworkAgent?.userTier;
   }
-  get options(): AidaRequestOptions {
+  get options(): RequestOptions {
     const config = Common.Settings.Settings.instance().getHostConfig();
     const temperature = config.devToolsAiAssistanceNetworkAgent?.temperature;
     const modelId = config.devToolsAiAssistanceNetworkAgent?.modelId;

front_end/panels/freestyler/DrJonesPerformanceAgent.ts

@@ -11,10 +11,10 @@ import * as PanelUtils from '../utils/utils.js';
 import {
   AgentType,
   AiAgent,
-  type AidaRequestOptions,
   type ContextResponse,
   ConversationContext,
   type ParsedResponse,
+  type RequestOptions,
   ResponseType,
 } from './AiAgent.js';
 
@@ -171,7 +171,7 @@ export class DrJonesPerformanceAgent extends AiAgent<TimelineUtils.AICallTree.AI
     const config = Common.Settings.Settings.instance().getHostConfig();
     return config.devToolsAiAssistancePerformanceAgent?.userTier;
   }
-  get options(): AidaRequestOptions {
+  get options(): RequestOptions {
     const config = Common.Settings.Settings.instance().getHostConfig();
     const temperature = config.devToolsAiAssistancePerformanceAgent?.temperature;
     const modelId = config.devToolsAiAssistancePerformanceAgent?.modelId;

front_end/panels/freestyler/FreestylerAgent.ts

@@ -15,12 +15,12 @@ import {
   type ActionResponse,
   AgentType,
   AiAgent,
-  type AidaRequestOptions,
   type ContextResponse,
   ConversationContext,
   debugLog,
   isDebugMode,
   type ParsedResponse,
+  type RequestOptions,
   ResponseType,
   type SideEffectResponse,
 } from './AiAgent.js';
@@ -262,7 +262,7 @@ export class FreestylerAgent extends AiAgent<SDK.DOMModel.DOMNode> {
     return config.devToolsFreestyler?.executionMode ?? Root.Runtime.HostConfigFreestylerExecutionMode.ALL_SCRIPTS;
   }
 
-  get options(): AidaRequestOptions {
+  get options(): RequestOptions {
     const config = Common.Settings.Settings.instance().getHostConfig();
     const temperature = config.devToolsFreestyler?.temperature;
     const modelId = config.devToolsFreestyler?.modelId;