Instructions improvement. Removed possibility of wrong type of tool model getting parsed

Author: Aman Rusia

gpt_action_json_schema.json

@@ -255,6 +255,14 @@
     "schemas": {
       "BashInteractionWithUUID": {
         "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "BashInteraction"
+            ],
+            "const": "BashInteraction",
+            "title": "Type"
+          },
           "send_text": {
             "anyOf": [
               {
@@ -312,7 +320,8 @@
         },
         "type": "object",
         "required": [
-          "user_id"
+          "user_id",
+          "type"
         ],
         "title": "BashInteractionWithUUID"
       },
@@ -443,7 +452,8 @@
         },
         "type": "object",
         "required": [
-          "user_id"
+          "user_id",
+          "should_reset"
         ],
         "title": "ResetShellWithUUID"
       },

gpt_instructions.txt

@@ -39,16 +39,35 @@ Instructions for `FileEdit`:
     - Use absolute file path only.
     - Use SEARCH/REPLACE blocks to edit the file.
         Only edit the files using the following SEARCH/REPLACE blocks.
+
 ```
 <<<<<<< SEARCH
-// Original code
+def hello():
+    "print a greeting"
+
+    print("hello")
 =======
-// New code
+from hello import hello as hello_renamed
+>>>>>>> REPLACE
+<<<<<<< SEARCH
+def call_hello():
+    "call hello"
+
+    hello()
+=======
+def call_hello_renamed():
+    "call hello renamed"
+
+    hello_renamed()
 >>>>>>> REPLACE
 <<<<<<< SEARCH
-// Original code further down in the file
+    impl1()
+    hello()
+    impl2()
 =======
-// New code to replace
+    impl1()
+    hello_renamed()
+    impl2()
 >>>>>>> REPLACE
 ```
 

src/wcgw/client/anthropic_client.py

@@ -223,9 +223,10 @@ def loop(
 
 Instructions:
 
-    - You should use the provided bash execution tool to run script to complete objective.
-    - First understand about the project by understanding the folder structure (ignoring node_modules or venv, etc.)
-    - Always read relevant files before making any changes.
+    - You should use the provided bash execution, reading and writing file tools to complete objective.
+    - First understand about the project by getting the folder structure (ignoring .git, node_modules, venv, etc.)
+    - Always read relevant files before editing.
+    - Do not provide code snippets unless asked by the user, instead directly edit the code.
     
 System information:
     - System: {uname_sysname}

src/wcgw/client/diff-instructions.txt

@@ -1,5 +1,7 @@
 
-Instructions for 
+Instructions for editing files.
+
+
 Only edit the files using the following SEARCH/REPLACE blocks.
 ```
 <<<<<<< SEARCH
@@ -8,7 +10,27 @@ def hello():
 
     print("hello")
 =======
-from hello import hello
+from hello import hello as hello_renamed
+>>>>>>> REPLACE
+<<<<<<< SEARCH
+def call_hello():
+    "call hello"
+
+    hello()
+=======
+def call_hello_renamed():
+    "call hello renamed"
+
+    hello_renamed()
+>>>>>>> REPLACE
+<<<<<<< SEARCH
+    impl1()
+    hello()
+    impl2()
+=======
+    impl1()
+    hello_renamed()
+    impl2()
 >>>>>>> REPLACE
 ```
 

src/wcgw/client/openai_client.py

@@ -227,10 +227,11 @@ def loop(
 
 Instructions:
 
-    - You should use the provided bash execution tool to run script to complete objective.
-    - First understand about the project by understanding the folder structure (ignoring node_modules or venv, etc.)
-    - Always read relevant files before making any changes.
-    
+    - You should use the provided bash execution, reading and writing file tools to complete objective.
+    - First understand about the project by getting the folder structure (ignoring .git, node_modules, venv, etc.)
+    - Always read relevant files before editing.
+    - Do not provide code snippets unless asked by the user, instead directly edit the code.
+
 System information:
     - System: {uname_sysname}
     - Machine: {uname_machine}

src/wcgw/client/tools.py

@@ -251,55 +251,71 @@ def execute_bash(
                 )
 
             SHELL.sendline(command)
-        elif bash_arg.send_specials:
-            console.print(f"Sending special sequence: {bash_arg.send_specials}")
-            for char in bash_arg.send_specials:
-                if char == "Key-up":
-                    SHELL.send("\033[A")
-                elif char == "Key-down":
-                    SHELL.send("\033[B")
-                elif char == "Key-left":
-                    SHELL.send("\033[D")
-                elif char == "Key-right":
-                    SHELL.send("\033[C")
-                elif char == "Enter":
-                    SHELL.send("\n")
-                elif char == "Ctrl-c":
-                    SHELL.sendintr()
-                    is_interrupt = True
-                elif char == "Ctrl-d":
-                    SHELL.sendintr()
-                    is_interrupt = True
-                elif char == "Ctrl-z":
-                    SHELL.send("\x1a")
-                else:
-                    raise Exception(f"Unknown special character: {char}")
-        elif bash_arg.send_ascii:
-            console.print(f"Sending ASCII sequence: {bash_arg.send_ascii}")
-            for ascii_char in bash_arg.send_ascii:
-                SHELL.send(chr(ascii_char))
-                if ascii_char == 3:
-                    is_interrupt = True
+
         else:
-            if bash_arg.send_text is None:
+            if (
+                sum(
+                    [
+                        int(bool(bash_arg.send_text)),
+                        int(bool(bash_arg.send_specials)),
+                        int(bool(bash_arg.send_ascii)),
+                    ]
+                )
+                != 1
+            ):
                 return (
-                    "Failure: at least one of send_text, send_specials or send_ascii should be provided",
+                    "Failure: exactly one of send_text, send_specials or send_ascii should be provided",
                     0.0,
                 )
+            if bash_arg.send_specials:
+                console.print(f"Sending special sequence: {bash_arg.send_specials}")
+                for char in bash_arg.send_specials:
+                    if char == "Key-up":
+                        SHELL.send("\033[A")
+                    elif char == "Key-down":
+                        SHELL.send("\033[B")
+                    elif char == "Key-left":
+                        SHELL.send("\033[D")
+                    elif char == "Key-right":
+                        SHELL.send("\033[C")
+                    elif char == "Enter":
+                        SHELL.send("\n")
+                    elif char == "Ctrl-c":
+                        SHELL.sendintr()
+                        is_interrupt = True
+                    elif char == "Ctrl-d":
+                        SHELL.sendintr()
+                        is_interrupt = True
+                    elif char == "Ctrl-z":
+                        SHELL.send("\x1a")
+                    else:
+                        raise Exception(f"Unknown special character: {char}")
+            elif bash_arg.send_ascii:
+                console.print(f"Sending ASCII sequence: {bash_arg.send_ascii}")
+                for ascii_char in bash_arg.send_ascii:
+                    SHELL.send(chr(ascii_char))
+                    if ascii_char == 3:
+                        is_interrupt = True
+            else:
+                if bash_arg.send_text is None:
+                    return (
+                        "Failure: at least one of send_text, send_specials or send_ascii should be provided",
+                        0.0,
+                    )
 
-            updated_repl_mode = update_repl_prompt(bash_arg.send_text)
-            if updated_repl_mode:
-                BASH_STATE = "repl"
-                response = (
-                    "Prompt updated, you can execute REPL lines using BashCommand now"
-                )
-                console.print(response)
-                return (
-                    response,
-                    0,
-                )
-            console.print(f"Interact text: {bash_arg.send_text}")
-            SHELL.sendline(bash_arg.send_text)
+                updated_repl_mode = update_repl_prompt(bash_arg.send_text)
+                if updated_repl_mode:
+                    BASH_STATE = "repl"
+                    response = (
+                        "Prompt updated, you can execute REPL lines using BashCommand now"
+                    )
+                    console.print(response)
+                    return (
+                        response,
+                        0,
+                    )
+                console.print(f"Interact text: {bash_arg.send_text}")
+                SHELL.sendline(bash_arg.send_text)
 
         BASH_STATE = "repl"
 
@@ -520,6 +536,12 @@ def do_diff_edit(fedit: FileEdit) -> str:
         apply_diff_to = f.read()
 
     lines = fedit.file_edit_using_search_replace_blocks.split("\n")
+
+    if not lines or not re.match(r"^<<<<<<+\s*SEARCH\s*$", lines[0]):
+        raise Exception(
+            "Error: first line should be `<<<<<< SEARCH` to start a search-replace block"
+        )
+    
     n_lines = len(lines)
     i = 0
     replacement_count = 0

src/wcgw/types_.py

@@ -13,26 +13,11 @@ class BashCommand(BaseModel):
 
 
 class BashInteraction(BaseModel):
+    type: Literal["BashInteraction"]
     send_text: Optional[str] = None
     send_specials: Optional[Sequence[Specials]] = None
     send_ascii: Optional[Sequence[int]] = None
 
-    def model_post_init(self, __context: object) -> None:
-        # Ensure only one of the fields is set
-        if (
-            sum(
-                [
-                    int(bool(self.send_text)),
-                    int(bool(self.send_specials)),
-                    int(bool(self.send_ascii)),
-                ]
-            )
-            != 1
-        ):
-            raise ValueError(
-                "Exactly one of 'send_text', 'send_specials', or 'send_ascii' must be set"
-            )
-
 
 class ReadImage(BaseModel):
     file_path: str
@@ -61,16 +46,9 @@ class FileEditFindReplace(BaseModel):
 
 
 class ResetShell(BaseModel):
-    should_reset: Literal[True] = True
+    should_reset: Literal[True]
 
 
 class FileEdit(BaseModel):
     file_path: str
     file_edit_using_search_replace_blocks: str
-
-    def model_post_init(self, __context: object) -> None:
-        # Ensure first line is "<<<<<<< SEARCH"
-
-        if not re.match(r"^<<<<<<+\s*SEARCH\s*$", self.file_edit_using_search_replace_blocks.split("\n")[0]):
-
-            raise ValueError("First line of file_edit_using_search_replace_blocks must be '<<<<<<< SEARCH'")