Tidy

Author: SteveSandersonMS

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

@@ -5,26 +5,24 @@ conversations:
       - role: system
         content: ${system}
       - role: user
-        content: Run 'echo hello world' and tell me the output
+        content: Run 'echo hello' and tell me the output
       - role: assistant
         tool_calls:
           - id: toolcall_0
             type: function
             function:
               name: report_intent
               arguments: '{"intent":"Running echo command"}'
-      - role: assistant
-        tool_calls:
           - id: toolcall_1
             type: function
             function:
               name: ${shell}
-              arguments: '{"command":"echo hello world","description":"Run echo hello world"}'
+              arguments: '{"command":"echo hello","description":"Run echo hello"}'
   - messages:
       - role: system
         content: ${system}
       - role: user
-        content: Run 'echo hello world' and tell me the output
+        content: Run 'echo hello' and tell me the output
       - role: assistant
         tool_calls:
           - id: toolcall_0
@@ -36,28 +34,14 @@ conversations:
             type: function
             function:
               name: ${shell}
-              arguments: '{"command":"echo hello world","description":"Run echo hello world"}'
+              arguments: '{"command":"echo hello","description":"Run echo hello"}'
       - role: tool
         tool_call_id: toolcall_0
         content: Intent logged
       - role: tool
         tool_call_id: toolcall_1
         content: |-
           hello
-          world
           <exited with exit code 0>
       - role: assistant
-        content: >-
-          The output is:
-
-          ```
-
-          hello
-
-          world
-
-          ```
-
-
-          Note that PowerShell's `echo` (which is an alias for `Write-Output`) outputs "hello" and "world" on separate
-          lines.
+        content: The output is `hello`.