Merge pull request #70 from polywrap/nerfzael-evo-fixes

Stopping the agent

apps/browser/src/components/Chat/Chat.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, ChangeEvent, KeyboardEvent } from "react";
+import React, { useState, useEffect, ChangeEvent, KeyboardEvent, useRef } from "react";
 import { Evo } from "@evo-ninja/core";
 import ReactMarkdown from "react-markdown";
 
@@ -14,16 +14,34 @@ export interface ChatProps {
   evo: Evo;
   onMessage: (message: ChatMessage) => void;
   messages: ChatMessage[];
+  goalAchieved: boolean
 }
 
-const Chat: React.FC<ChatProps> = ({ evo, onMessage, messages }: ChatProps) => {
+const Chat: React.FC<ChatProps> = ({ evo, onMessage, messages, goalAchieved }: ChatProps) => {
   const [message, setMessage] = useState<string>("");
   const [evoRunning, setEvoRunning] = useState<boolean>(false);
   const [paused, setPaused] = useState<boolean>(false);
   const [sending, setSending] = useState<boolean>(false);
   const [evoItr, setEvoItr] = useState<ReturnType<Evo["run"]> | undefined>(
     undefined
   );
+  const [stopped, setStopped] = useState<boolean>(false);
+
+  const pausedRef = useRef(paused);
+  useEffect(() => {
+      pausedRef.current = paused;
+  }, [paused]);
+
+  const goalAchievedRef = useRef(paused);
+  useEffect(() => {
+    goalAchievedRef.current = goalAchieved;
+  }, [goalAchieved]);
+
+  useEffect(() => {
+    if (goalAchieved) {
+      setPaused(true);
+    }
+  }, [goalAchieved]);
 
   useEffect(() => {
     const runEvo = async () => {
@@ -41,10 +59,13 @@ const Chat: React.FC<ChatProps> = ({ evo, onMessage, messages }: ChatProps) => {
       let messageLog = messages;
 
       while (evoRunning) {
-        if (paused) {
+        if (pausedRef.current || goalAchievedRef.current) {
+          setStopped(true);
           return Promise.resolve();
         }
 
+        setStopped(false);
+
         const response = await evoItr.next();
 
         if (response.value && response.value.message) {
@@ -53,7 +74,9 @@ const Chat: React.FC<ChatProps> = ({ evo, onMessage, messages }: ChatProps) => {
             user: "evo"
           };
           messageLog = [...messageLog, evoMessage];
-          onMessage(evoMessage);
+          if (!goalAchievedRef.current) {
+            onMessage(evoMessage);
+          }
         }
 
         if (response.done) {
@@ -65,7 +88,8 @@ const Chat: React.FC<ChatProps> = ({ evo, onMessage, messages }: ChatProps) => {
       return Promise.resolve();
     }
 
-    runEvo();
+    const timer = setTimeout(runEvo, 200);
+    return () => clearTimeout(timer);
   }, [evoRunning, evoItr]);
 
   const handleSend = async () => {
@@ -129,9 +153,19 @@ const Chat: React.FC<ChatProps> = ({ evo, onMessage, messages }: ChatProps) => {
             }
             {
               paused && (
-                <button className="Chat__Btn" onClick={handleContinue} disabled={evoRunning && !paused}>
-                Continue
-                </button>
+                <>
+                  {!stopped && (
+                     <button className="Chat__Btn" disabled={true}>
+                     Pausing
+                     </button>
+                  )}
+
+                  {stopped && (
+                     <button className="Chat__Btn" onClick={handleContinue} disabled={evoRunning && !paused}>
+                     Paused
+                     </button>
+                  )}
+                </>
               )
             }
           </>

apps/browser/src/pages/Dojo.tsx

@@ -34,6 +34,7 @@ function Dojo() {
   const [userWorkspace, setUserWorkspace] = useState<EvoCore.InMemoryWorkspace | undefined>(undefined);
   const [scriptsWorkspace, setScriptsWorkspace] = useState<EvoCore.InMemoryWorkspace | undefined>(undefined);
   const [messages, setMessages] = useState<ChatMessage[]>([]);
+  const [goalAchieved, setGoalAchieved] = useState<boolean>(false);
 
   useEffect(() => {
     if (!evo || !scriptsWorkspace) {
@@ -158,6 +159,7 @@ function Dojo() {
       const agentPackage = PluginPackage.from(module => ({
         "onGoalAchieved": async (args: any) => {
           logger.success("Goal has been achieved!");
+          setGoalAchieved(true);
         },
         "speak": async (args: any) => {
           logger.success("Evo: " + args.message);
@@ -191,7 +193,7 @@ function Dojo() {
       }
       <Sidebar onSettingsClick={() => setConfigOpen(true)} scripts={scripts} userFiles={userFiles} uploadUserFiles={setUploadedFiles} />
       <>
-        {evo && <Chat evo={evo} onMessage={onMessage} messages={messages} />}
+        {evo && <Chat evo={evo} onMessage={onMessage} messages={messages} goalAchieved={goalAchieved} />}
         {dojoError && <DojoError error={dojoError} />}
       </>
     </div>

packages/core/src/agents/evo/prompts.ts

@@ -5,7 +5,7 @@ export const INITIAL_PROMP = `You are an agent that executes scripts to accompli
 `When creating scripts be sure to declare all the require statements. The code of the scripts should be written as if in a function.\n` +
 `Do not use async/await or promises.\n` + 
 `Use the speak script to inform the user.\n` +
-`Once you have achieved the goal, execute the onGoalAchieved script in the agent namespace.`;
+`Once you have achieved the goal, use executeScript function to execute agent.onGoalAchieved script.`;
 
 export const GOAL_PROMPT = (goal: string) => `The user has the following goal: ${goal}.`
 export const LOOP_PREVENTION_PROMPT = "Assistant, are you trying to inform the user? If so, Try calling findScript with the agent namespace.";