Update some snapshots; remove redundant ones

go/e2e/permissions_test.go

@@ -94,7 +94,7 @@ func TestPermissions(t *testing.T) {
 		}
 
 		_, err = session.SendAndWait(copilot.MessageOptions{
-			Prompt: "Run 'echo hello world' and tell me the output",
+			Prompt: "Run 'echo hello' and tell me the output",
 		}, 60*time.Second)
 		if err != nil {
 			t.Fatalf("Failed to send message: %v", err)

python/e2e/test_permissions.py

@@ -57,7 +57,7 @@ def on_permission_request(
 
         session = await ctx.client.create_session({"on_permission_request": on_permission_request})
 
-        await session.send_and_wait({"prompt": "Run 'echo hello world' and tell me the output"})
+        await session.send_and_wait({"prompt": "Run 'echo hello' and tell me the output"})
 
         # Should have received at least one shell permission request
         shell_requests = [req for req in permission_requests if req.get("kind") == "shell"]

test/snapshots/permissions/permission_handler_for_shell_commands.yaml

@@ -13,8 +13,6 @@ conversations:
             function:
               name: report_intent
               arguments: '{"intent":"Running echo command"}'
-      - role: assistant
-        tool_calls:
           - id: toolcall_1
             type: function
             function:
@@ -46,4 +44,4 @@ conversations:
           hello
           <exited with exit code 0>
       - role: assistant
-        content: The output is `hello` with exit code 0 (success).
+        content: The output is `hello`.

test/snapshots/permissions/should_invoke_permission_handler_for_write_operations.yaml

@@ -6,6 +6,8 @@ conversations:
         content: ${system}
       - role: user
         content: Edit test.txt and replace 'original' with 'modified'
+      - role: assistant
+        content: I'll view the file first to see its contents, then make the replacement.
       - role: assistant
         tool_calls:
           - id: toolcall_0
@@ -26,6 +28,40 @@ conversations:
       - role: user
         content: Edit test.txt and replace 'original' with 'modified'
       - role: assistant
+        content: I'll view the file first to see its contents, then make the replacement.
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: report_intent
+              arguments: '{"intent":"Editing test.txt file"}'
+          - id: toolcall_1
+            type: function
+            function:
+              name: view
+              arguments: '{"path":"${workdir}/test.txt"}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: Intent logged
+      - role: tool
+        tool_call_id: toolcall_1
+        content: 1. original content
+      - role: assistant
+        content: "Now I'll replace 'original' with 'modified':"
+      - role: assistant
+        tool_calls:
+          - id: toolcall_2
+            type: function
+            function:
+              name: edit
+              arguments: '{"path":"${workdir}/test.txt","old_str":"original content","new_str":"modified content"}'
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Edit test.txt and replace 'original' with 'modified'
+      - role: assistant
+        content: I'll view the file first to see its contents, then make the replacement.
         tool_calls:
           - id: toolcall_0
             type: function
@@ -44,6 +80,7 @@ conversations:
         tool_call_id: toolcall_1
         content: 1. original content
       - role: assistant
+        content: "Now I'll replace 'original' with 'modified':"
         tool_calls:
           - id: toolcall_2
             type: function

test/snapshots/tools/invokes_built_in_tools.yaml

@@ -9,44 +9,16 @@ conversations:
       - role: assistant
         tool_calls:
           - id: toolcall_0
-            type: function
-            function:
-              name: report_intent
-              arguments: '{"intent":"Reading README.md file"}'
-      - role: assistant
-        tool_calls:
-          - id: toolcall_1
-            type: function
-            function:
-              name: view
-              arguments: '{"path":"${workdir}/README.md"}'
-  - messages:
-      - role: system
-        content: ${system}
-      - role: user
-        content: What's the first line of README.md in this directory?
-      - role: assistant
-        tool_calls:
-          - id: toolcall_0
-            type: function
-            function:
-              name: report_intent
-              arguments: '{"intent":"Reading README.md file"}'
-          - id: toolcall_1
             type: function
             function:
               name: view
               arguments: '{"path":"${workdir}/README.md"}'
       - role: tool
         tool_call_id: toolcall_0
-        content: Intent logged
-      - role: tool
-        tool_call_id: toolcall_1
         content: "1. # ELIZA, the only chatbot you'll ever need"
       - role: assistant
         content: |-
           The first line of README.md is:
-
           ```
           # ELIZA, the only chatbot you'll ever need
           ```