chrome-devtools-frontend 1.0.1367881 → 1.0.1376716

package/front_end/panels/freestyler/FreestylerAgent.test.ts

@@ -39,24 +39,28 @@ describeWithEnvironment('FreestylerAgent', () => {
     };
   }
   describe('parseResponse', () => {
+    const agent = new FreestylerAgent({
+      aidaClient: {} as Host.AidaClient.AidaClient,
+    });
+
     it('parses a thought', async () => {
       const payload = 'some response';
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`THOUGHT: ${payload}`),
+          agent.parseResponse(`THOUGHT: ${payload}`),
           {
             title: undefined,
             thought: payload,
           },
       );
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`   THOUGHT: ${payload}`),
+          agent.parseResponse(`   THOUGHT: ${payload}`),
           {
             title: undefined,
             thought: payload,
           },
       );
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`Something\n   THOUGHT: ${payload}`),
+          agent.parseResponse(`Something\n   THOUGHT: ${payload}`),
           {
             title: undefined,
             thought: payload,
@@ -66,24 +70,24 @@ describeWithEnvironment('FreestylerAgent', () => {
     it('parses a answer', async () => {
       const payload = 'some response';
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`ANSWER: ${payload}`),
+          agent.parseResponse(`ANSWER: ${payload}`),
           {
             answer: payload,
-            suggestions: [],
+            suggestions: undefined,
           },
       );
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`   ANSWER: ${payload}`),
+          agent.parseResponse(`   ANSWER: ${payload}`),
           {
             answer: payload,
-            suggestions: [],
+            suggestions: undefined,
           },
       );
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`Something\n   ANSWER: ${payload}`),
+          agent.parseResponse(`Something\n   ANSWER: ${payload}`),
           {
             answer: payload,
-            suggestions: [],
+            suggestions: undefined,
           },
       );
     });
@@ -92,44 +96,44 @@ describeWithEnvironment('FreestylerAgent', () => {
 b
 c`;
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`ANSWER: ${payload}`),
+          agent.parseResponse(`ANSWER: ${payload}`),
           {
             answer: payload,
-            suggestions: [],
+            suggestions: undefined,
           },
       );
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`   ANSWER: ${payload}`),
+          agent.parseResponse(`   ANSWER: ${payload}`),
           {
             answer: payload,
-            suggestions: [],
+            suggestions: undefined,
           },
       );
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`Something\n   ANSWER: ${payload}`),
+          agent.parseResponse(`Something\n   ANSWER: ${payload}`),
           {
             answer: payload,
-            suggestions: [],
+            suggestions: undefined,
           },
       );
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`ANSWER: ${payload}\nTHOUGHT: thought`),
+          agent.parseResponse(`ANSWER: ${payload}\nTHOUGHT: thought`),
           {
             answer: payload,
-            suggestions: [],
+            suggestions: undefined,
           },
       );
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(
+          agent.parseResponse(
               `ANSWER: ${payload}\nOBSERVATION: observation`,
               ),
           {
             answer: payload,
-            suggestions: [],
+            suggestions: undefined,
           },
       );
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(
+          agent.parseResponse(
               `ANSWER: ${payload}\nACTION\naction\nSTOP`,
               ),
           {
@@ -144,7 +148,7 @@ c`;
   someKey: "value",
 }`;
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`ACTION\n${payload}\nSTOP`),
+          agent.parseResponse(`ACTION\n${payload}\nSTOP`),
           {
             action: payload,
             title: undefined,
@@ -152,7 +156,7 @@ c`;
           },
       );
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`ACTION\n${payload}`),
+          agent.parseResponse(`ACTION\n${payload}`),
           {
             action: payload,
             title: undefined,
@@ -160,7 +164,7 @@ c`;
           },
       );
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`ACTION\n\n${payload}\n\nSTOP`),
+          agent.parseResponse(`ACTION\n\n${payload}\n\nSTOP`),
           {
             action: payload,
             title: undefined,
@@ -169,7 +173,7 @@ c`;
       );
 
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`ACTION\n\n${payload}\n\nANSWER: answer`),
+          agent.parseResponse(`ACTION\n\n${payload}\n\nANSWER: answer`),
           {
             action: payload,
             title: undefined,
@@ -183,7 +187,7 @@ c`;
           styles
         };`;
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`ACTION\n${payload}STOP`),
+          agent.parseResponse(`ACTION\n${payload}STOP`),
           {
             action: payload,
             title: undefined,
@@ -195,7 +199,7 @@ c`;
       const payload = 'some response';
       const title = 'this is the title';
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`THOUGHT: ${payload}\nTITLE: ${title}`),
+          agent.parseResponse(`THOUGHT: ${payload}\nTITLE: ${title}`),
           {
             thought: payload,
             title,
@@ -208,7 +212,7 @@ c`;
   someKey: "value",
 }`;
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(
+          agent.parseResponse(
               `ACTION\n\`\`\`\n${payload}\n\`\`\`\nSTOP`,
               ),
           {
@@ -224,7 +228,7 @@ c`;
   someKey: "value",
 }`;
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(
+          agent.parseResponse(
               `ACTION\n\`\`\`\`\`\njs\n${payload}\n\`\`\`\`\`\nSTOP`,
               ),
           {
@@ -241,7 +245,7 @@ c`;
 }`;
       const thoughtPayload = 'thought';
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(
+          agent.parseResponse(
               `THOUGHT:${thoughtPayload}\nACTION\n${actionPayload}\nSTOP`,
               ),
           {
@@ -256,22 +260,22 @@ c`;
       const answerPayload = 'answer';
       const thoughtPayload = 'thought';
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(
+          agent.parseResponse(
               `THOUGHT:${thoughtPayload}\nANSWER:${answerPayload}`,
               ),
           {
             answer: answerPayload,
-            suggestions: [],
+            suggestions: undefined,
           },
       );
     });
 
     it('parses an answer and suggestions', async () => {
       const answerPayload = 'answer';
-      const suggestions = ['suggestion'];
+      const suggestions = ['suggestion'] as [string];
       const suggestionsText = JSON.stringify(suggestions);
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(
+          agent.parseResponse(
               `ANSWER:${answerPayload}\nSUGGESTIONS: ${suggestionsText}`,
               ),
           {
@@ -289,7 +293,7 @@ c`;
 }`;
       const title = 'title';
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(
+          agent.parseResponse(
               `THOUGHT: ${thoughtPayload}\nTITLE: ${title}\nACTION\n${actionPayload}\nSTOP\nANSWER:${answerPayload}`,
               ),
           {
@@ -307,7 +311,7 @@ c`;
           styles
         };`;
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(
+          agent.parseResponse(
               `ACTION\n${payload}STOP\nANSWER:${answerPayload}\nSUGGESTIONS: ${JSON.stringify(suggestions)}`),
           {
             action: payload,
@@ -322,7 +326,7 @@ c`;
           styles
         };`;
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`ACTION\n${payload}STOP\nOBSERVATION:{styles: {}}`),
+          agent.parseResponse(`ACTION\n${payload}STOP\nOBSERVATION:{styles: {}}`),
           {
             action: payload,
             thought: undefined,
@@ -337,7 +341,7 @@ c`;
         };`;
       const thoughtPayload = 'thought';
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`ACTION\n${payload}STOP\nTHOUGHT:${thoughtPayload}`),
+          agent.parseResponse(`ACTION\n${payload}STOP\nTHOUGHT:${thoughtPayload}`),
           {
             action: payload,
             thought: thoughtPayload,
@@ -348,19 +352,19 @@ c`;
 
     it('parses a response as an answer', async () => {
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(
+          agent.parseResponse(
               'This is also an answer',
               ),
           {
             answer: 'This is also an answer',
-            suggestions: [],
+            suggestions: undefined,
           },
       );
     });
 
     it('parses a response with no instruction tags as an answer and correctly parses suggestions', async () => {
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(
+          agent.parseResponse(
               'This is also an answer\nSUGGESTIONS: [\"suggestion\"]',
               ),
           {
@@ -373,7 +377,7 @@ c`;
     it('parses multi line thoughts', () => {
       const thoughtText = 'first line\nsecond line';
       assert.deepStrictEqual(
-          FreestylerAgent.parseResponse(`THOUGHT: ${thoughtText}`),
+          agent.parseResponse(`THOUGHT: ${thoughtText}`),
           {
             thought: thoughtText,
             title: undefined,
@@ -513,20 +517,16 @@ c`;
         serverSideLoggingEnabled: true,
       });
       sinon.stub(agent, 'preamble').value('preamble');
-      agent.chatHistoryForTesting = new Map([[
+      agent.chatNewHistoryForTesting = new Map([[
         0,
         [
           {
-            text: 'first',
-            entity: Host.AidaClient.Entity.UNKNOWN,
+            type: Freestyler.ResponseType.QUERYING,
+            query: 'question',
           },
           {
-            text: 'second',
-            entity: Host.AidaClient.Entity.SYSTEM,
-          },
-          {
-            text: 'third',
-            entity: Host.AidaClient.Entity.USER,
+            type: Freestyler.ResponseType.ANSWER,
+            text: 'answer',
           },
         ],
       ]]);
@@ -540,16 +540,12 @@ c`;
             preamble: 'preamble',
             chat_history: [
               {
-                entity: 0,
-                text: 'first',
+                entity: 1,
+                text: 'question',
               },
               {
                 entity: 2,
-                text: 'second',
-              },
-              {
-                entity: 1,
-                text: 'third',
+                text: 'ANSWER: answer',
               },
             ],
             metadata: {
@@ -620,7 +616,7 @@ c`;
         });
 
         promise.resolve(true);
-        await Array.fromAsync(agent.run('test', {selectedElement: element}));
+        await Array.fromAsync(agent.run('test', {selected: element}));
 
         sinon.assert.match(execJs.getCall(0).args[1], sinon.match({throwOnSideEffect: true}));
       });
@@ -659,7 +655,7 @@ c`;
 
         });
         promise.resolve(true);
-        await Array.fromAsync(agent.run('test', {selectedElement: element}));
+        await Array.fromAsync(agent.run('test', {selected: element}));
 
         assert.strictEqual(execJs.getCalls().length, 2);
         sinon.assert.match(execJs.getCall(1).args[1], sinon.match({throwOnSideEffect: false}));
@@ -698,7 +694,7 @@ c`;
 
         });
         promise.resolve(false);
-        const responses = await Array.fromAsync(agent.run('test', {selectedElement: element}));
+        const responses = await Array.fromAsync(agent.run('test', {selected: element}));
 
         const actionStep = responses.find(response => response.type === Freestyler.ResponseType.ACTION)!;
 
@@ -736,7 +732,7 @@ c`;
 
         });
 
-        const result = await Array.fromAsync(agent.run('test', {selectedElement: element}));
+        const result = await Array.fromAsync(agent.run('test', {selected: element}));
         const actionSteps = result.filter(step => {
           return step.type === Freestyler.ResponseType.ACTION;
         });
@@ -759,18 +755,18 @@ c`;
       const agent = new FreestylerAgent({
         aidaClient: mockAidaClient(generateAnswer),
         execJs,
-
       });
 
-      const responses = await Array.fromAsync(agent.run('test', {selectedElement: element}));
+      const responses = await Array.fromAsync(agent.run('test', {selected: element}));
       assert.deepStrictEqual(responses, [
         {
-          type: Freestyler.ResponseType.TITLE,
-          title: 'Analyzing the prompt',
+          type: Freestyler.ResponseType.USER_QUERY,
+          query: 'test',
         },
         {
-          type: Freestyler.ResponseType.THOUGHT,
-          contextDetails: [
+          type: Freestyler.ResponseType.CONTEXT,
+          title: 'Analyzing the prompt',
+          details: [
             {
               text: '* Its selector is `undefined`',
               title: 'Data used',
@@ -779,12 +775,13 @@ c`;
         },
         {
           type: Freestyler.ResponseType.QUERYING,
+          query: '# Inspected element\n\n* Its selector is `undefined`\n\n# User request\n\nQUERY: test',
         },
         {
           type: Freestyler.ResponseType.ANSWER,
           text: 'this is the answer',
+          suggestions: undefined,
           rpcId: undefined,
-          suggestions: [],
         },
       ]);
       sinon.assert.notCalled(execJs);
@@ -817,15 +814,16 @@ c`;
 
       });
 
-      const responses = await Array.fromAsync(agent.run('test', {selectedElement: element}));
+      const responses = await Array.fromAsync(agent.run('test', {selected: element}));
       assert.deepStrictEqual(responses, [
         {
-          type: Freestyler.ResponseType.TITLE,
-          title: 'Analyzing the prompt',
+          type: Freestyler.ResponseType.USER_QUERY,
+          query: 'test',
         },
         {
-          type: Freestyler.ResponseType.THOUGHT,
-          contextDetails: [
+          type: Freestyler.ResponseType.CONTEXT,
+          title: 'Analyzing the prompt',
+          details: [
             {
               text: '* Its selector is `undefined`',
               title: 'Data used',
@@ -834,12 +832,13 @@ c`;
         },
         {
           type: Freestyler.ResponseType.QUERYING,
+          query: '# Inspected element\n\n* Its selector is `undefined`\n\n# User request\n\nQUERY: test',
         },
         {
           type: Freestyler.ResponseType.ANSWER,
           text: 'this is the answer',
+          suggestions: undefined,
           rpcId: 123,
-          suggestions: [],
         },
       ]);
     });
@@ -865,15 +864,16 @@ c`;
 
       });
 
-      const responses = await Array.fromAsync(agent.run('test', {selectedElement: element}));
+      const responses = await Array.fromAsync(agent.run('test', {selected: element}));
       assert.deepStrictEqual(responses, [
         {
-          type: Freestyler.ResponseType.TITLE,
-          title: 'Analyzing the prompt',
+          type: Freestyler.ResponseType.USER_QUERY,
+          query: 'test',
         },
         {
-          type: Freestyler.ResponseType.THOUGHT,
-          contextDetails: [
+          type: Freestyler.ResponseType.CONTEXT,
+          title: 'Analyzing the prompt',
+          details: [
             {
               text: '* Its selector is `undefined`',
               title: 'Data used',
@@ -882,6 +882,7 @@ c`;
         },
         {
           type: Freestyler.ResponseType.QUERYING,
+          query: '# Inspected element\n\n* Its selector is `undefined`\n\n# User request\n\nQUERY: test',
         },
         {
           rpcId: undefined,
@@ -912,15 +913,16 @@ c`;
 
       });
 
-      const responses = await Array.fromAsync(agent.run('test', {selectedElement: element}));
+      const responses = await Array.fromAsync(agent.run('test', {selected: element}));
       assert.deepStrictEqual(responses, [
         {
-          type: Freestyler.ResponseType.TITLE,
-          title: 'Analyzing the prompt',
+          type: Freestyler.ResponseType.USER_QUERY,
+          query: 'test',
         },
         {
-          type: Freestyler.ResponseType.THOUGHT,
-          contextDetails: [
+          type: Freestyler.ResponseType.CONTEXT,
+          title: 'Analyzing the prompt',
+          details: [
             {
               text: '* Its selector is `undefined`',
               title: 'Data used',
@@ -929,12 +931,13 @@ c`;
         },
         {
           type: Freestyler.ResponseType.QUERYING,
+          query: '# Inspected element\n\n* Its selector is `undefined`\n\n# User request\n\nQUERY: test',
         },
         {
           type: Freestyler.ResponseType.ANSWER,
           text: 'this is the answer',
+          suggestions: undefined,
           rpcId: 123,
-          suggestions: [],
         },
       ]);
     });
@@ -953,15 +956,16 @@ c`;
         aidaClient: mockAidaClient(generateNothing),
         execJs,
       });
-      const responses = await Array.fromAsync(agent.run('test', {selectedElement: element}));
+      const responses = await Array.fromAsync(agent.run('test', {selected: element}));
       assert.deepStrictEqual(responses, [
         {
-          type: Freestyler.ResponseType.TITLE,
-          title: 'Analyzing the prompt',
+          type: Freestyler.ResponseType.USER_QUERY,
+          query: 'test',
         },
         {
-          type: Freestyler.ResponseType.THOUGHT,
-          contextDetails: [
+          type: Freestyler.ResponseType.CONTEXT,
+          title: 'Analyzing the prompt',
+          details: [
             {
               text: '* Its selector is `undefined`',
               title: 'Data used',
@@ -970,6 +974,7 @@ c`;
         },
         {
           type: Freestyler.ResponseType.QUERYING,
+          query: '# Inspected element\n\n* Its selector is `undefined`\n\n# User request\n\nQUERY: test',
         },
         {
           type: Freestyler.ResponseType.ERROR,
@@ -1014,15 +1019,16 @@ ANSWER: this is the answer`,
         execJs,
 
       });
-      const responses = await Array.fromAsync(agent.run('test', {selectedElement: element}));
+      const responses = await Array.fromAsync(agent.run('test', {selected: element}));
       assert.deepStrictEqual(responses, [
         {
-          type: Freestyler.ResponseType.TITLE,
-          title: 'Analyzing the prompt',
+          type: Freestyler.ResponseType.USER_QUERY,
+          query: 'test',
         },
         {
-          type: Freestyler.ResponseType.THOUGHT,
-          contextDetails: [
+          type: Freestyler.ResponseType.CONTEXT,
+          title: 'Analyzing the prompt',
+          details: [
             {
               text: '* Its selector is `undefined`',
               title: 'Data used',
@@ -1031,6 +1037,7 @@ ANSWER: this is the answer`,
         },
         {
           type: Freestyler.ResponseType.QUERYING,
+          query: '# Inspected element\n\n* Its selector is `undefined`\n\n# User request\n\nQUERY: test',
         },
         {
           type: Freestyler.ResponseType.THOUGHT,
@@ -1046,12 +1053,13 @@ ANSWER: this is the answer`,
         },
         {
           type: Freestyler.ResponseType.QUERYING,
+          query: 'OBSERVATION: hello',
         },
         {
           type: Freestyler.ResponseType.ANSWER,
           text: 'this is the actual answer',
+          suggestions: undefined,
           rpcId: undefined,
-          suggestions: [],
         },
       ]);
       sinon.assert.calledOnce(execJs);
@@ -1084,7 +1092,7 @@ ANSWER: this is the answer`,
 
       });
 
-      await Array.fromAsync(agent.run('test', {selectedElement: element}));
+      await Array.fromAsync(agent.run('test', {selected: element}));
 
       assert.deepStrictEqual(agent.chatHistoryForTesting, [
         {
@@ -1153,7 +1161,7 @@ ANSWER: this is the answer`,
 
       const controller = new AbortController();
       controller.abort();
-      await Array.fromAsync(agent.run('test', {selectedElement: element, signal: controller.signal}));
+      await Array.fromAsync(agent.run('test', {selected: element, signal: controller.signal}));
 
       assert.deepStrictEqual(agent.chatHistoryForTesting, []);
     });
@@ -1201,7 +1209,7 @@ ANSWER: this is the answer`,
           createExtensionScope,
           execJs,
         });
-        const responses = await Array.fromAsync(agent.run('test', {selectedElement: element}));
+        const responses = await Array.fromAsync(agent.run('test', {selected: element}));
         const actionStep = responses.find(response => response.type === Freestyler.ResponseType.ACTION)!;
         assert.strictEqual(actionStep.output, 'Error: JavaScript execution is currently disabled.');
         assert.strictEqual(execJs.getCalls().length, 0);
@@ -1223,7 +1231,7 @@ ANSWER: this is the answer`,
           createExtensionScope,
           execJs,
         });
-        const responses = await Array.fromAsync(agent.run('test', {selectedElement: element}));
+        const responses = await Array.fromAsync(agent.run('test', {selected: element}));
         const actionStep = responses.find(response => response.type === Freestyler.ResponseType.ACTION)!;
         assert.strictEqual(
             actionStep.output, 'Error: JavaScript execution that modifies the page is currently disabled.');