Normalize platform-specific shell tool names in snapshot matching

The 1.0.64-0 runtime removed report_intent; when the model still calls it,
the runtime replies 'Available tools that can be called are <list>.' That
list contains platform-specific shell tool names (powershell/read_powershell/
... on Windows, bash/read_bash/... on Linux/macOS), which broke snapshot
matching across CI platform legs.

Add a normalizeAvailableToolNames tool-result normalizer that maps the shell
tool family names in that error list to stable placeholders (\,
\, \, \, \), applied
symmetrically to stored snapshots and incoming requests. Re-normalize the 45
affected snapshots accordingly so they match on all platforms.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: stephentoub

test/harness/replayingCapiProxy.ts

@@ -56,6 +56,7 @@ export class ReplayingCapiProxy extends CapturingHttpProxy {
     { toolName: "*", normalizer: normalizeLargeOutputFilepaths },
     { toolName: "${shell}", normalizer: normalizeShellExitMarkers },
     { toolName: "*", normalizer: normalizeGhAuthMessages },
+    { toolName: "*", normalizer: normalizeAvailableToolNames },
     { toolName: "read_agent", normalizer: normalizeReadAgentTimings },
   ];
 
@@ -1157,6 +1158,44 @@ function normalizeReadAgentTimings(result: string): string {
     .replace(/\bduration: \d+(?:\.\d+)?s\b/g, "duration: 0s");
 }
 
+// Maps the platform-specific shell tool family names to stable placeholders.
+// On Windows the runtime exposes powershell/read_powershell/stop_powershell/...,
+// on Linux/macOS it exposes bash/read_bash/stop_bash/.... Ordered so that the
+// prefixed names are handled explicitly; \b boundaries keep bare names from
+// matching inside the prefixed ones.
+const shellToolFamilyReplacements: ReadonlyArray<readonly [RegExp, string]> = [
+  [/\bread_powershell\b/g, "${read_shell}"],
+  [/\bstop_powershell\b/g, "${stop_shell}"],
+  [/\blist_powershell\b/g, "${list_shell}"],
+  [/\bwrite_powershell\b/g, "${write_shell}"],
+  [/\bpowershell\b/g, "${shell}"],
+  [/\bread_bash\b/g, "${read_shell}"],
+  [/\bstop_bash\b/g, "${stop_shell}"],
+  [/\blist_bash\b/g, "${list_shell}"],
+  [/\bwrite_bash\b/g, "${write_shell}"],
+  [/\bbash\b/g, "${shell}"],
+];
+
+function normalizeShellToolFamilyNames(text: string): string {
+  let result = text;
+  for (const [pattern, replacement] of shellToolFamilyReplacements) {
+    result = result.replace(pattern, replacement);
+  }
+  return result;
+}
+
+// When a model calls a tool that doesn't exist (e.g., the removed report_intent
+// tool), the runtime replies with "Available tools that can be called are <list>."
+// The shell tool family names in that list are platform-specific, so normalize
+// them to placeholders to keep snapshots matching across Windows/Linux/macOS.
+function normalizeAvailableToolNames(result: string): string {
+  return result.replace(
+    /(Available tools that can be called are )([^.]*)/g,
+    (_full, prefix: string, list: string) =>
+      prefix + normalizeShellToolFamilyNames(list),
+  );
+}
+
 // Transforms a single OpenAI-style inbound response message into normalized form
 function transformOpenAIResponseChoice(
   choices: ChatCompletion.Choice[],

test/snapshots/builtin_tools/should_capture_exit_code_in_output.yaml

@@ -39,9 +39,9 @@ conversations:
               arguments: '{"command":"echo hello && echo world","description":"Run echo hello && echo world"}'
       - role: tool
         tool_call_id: toolcall_0
-        content: Tool 'report_intent' does not exist. Available tools that can be called are powershell, read_powershell,
-          stop_powershell, list_powershell, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep,
-          glob, task.
+        content: Tool 'report_intent' does not exist. Available tools that can be called are ${shell}, ${read_shell},
+          ${stop_shell}, ${list_shell}, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep, glob,
+          task.
       - role: tool
         tool_call_id: toolcall_1
         content: |-

test/snapshots/builtin_tools/should_create_a_new_file.yaml

@@ -39,9 +39,9 @@ conversations:
               arguments: '{"path":"${workdir}/new_file.txt","file_text":"Created by test"}'
       - role: tool
         tool_call_id: toolcall_0
-        content: Tool 'report_intent' does not exist. Available tools that can be called are powershell, read_powershell,
-          stop_powershell, list_powershell, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep,
-          glob, task.
+        content: Tool 'report_intent' does not exist. Available tools that can be called are ${shell}, ${read_shell},
+          ${stop_shell}, ${list_shell}, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep, glob,
+          task.
       - role: tool
         tool_call_id: toolcall_1
         content: Created file ${workdir}/new_file.txt with 15 characters

test/snapshots/builtin_tools/should_edit_a_file_successfully.yaml

@@ -41,9 +41,9 @@ conversations:
               arguments: '{"path":"${workdir}/edit_me.txt","old_str":"Hello World","new_str":"Hi Universe"}'
       - role: tool
         tool_call_id: toolcall_0
-        content: Tool 'report_intent' does not exist. Available tools that can be called are powershell, read_powershell,
-          stop_powershell, list_powershell, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep,
-          glob, task.
+        content: Tool 'report_intent' does not exist. Available tools that can be called are ${shell}, ${read_shell},
+          ${stop_shell}, ${list_shell}, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep, glob,
+          task.
       - role: tool
         tool_call_id: toolcall_1
         content: File ${workdir}/edit_me.txt updated with changes.

test/snapshots/builtin_tools/should_find_files_by_pattern.yaml

@@ -42,9 +42,9 @@ conversations:
               arguments: '{"pattern":"**/*.ts"}'
       - role: tool
         tool_call_id: toolcall_0
-        content: Tool 'report_intent' does not exist. Available tools that can be called are powershell, read_powershell,
-          stop_powershell, list_powershell, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep,
-          glob, task.
+        content: Tool 'report_intent' does not exist. Available tools that can be called are ${shell}, ${read_shell},
+          ${stop_shell}, ${list_shell}, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep, glob,
+          task.
       - role: tool
         tool_call_id: toolcall_1
         content: ./src/index.ts

test/snapshots/builtin_tools/should_handle_nonexistent_file_gracefully.yaml

@@ -39,9 +39,9 @@ conversations:
               arguments: '{"path":"${workdir}/does_not_exist.txt"}'
       - role: tool
         tool_call_id: toolcall_0
-        content: Tool 'report_intent' does not exist. Available tools that can be called are powershell, read_powershell,
-          stop_powershell, list_powershell, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep,
-          glob, task.
+        content: Tool 'report_intent' does not exist. Available tools that can be called are ${shell}, ${read_shell},
+          ${stop_shell}, ${list_shell}, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep, glob,
+          task.
       - role: tool
         tool_call_id: toolcall_1
         content: Path ${workdir}/does_not_exist.txt does not exist. Please provide a valid path.

test/snapshots/builtin_tools/should_read_file_with_line_range.yaml

@@ -39,9 +39,9 @@ conversations:
               arguments: '{"path":"${workdir}/lines.txt","view_range":[2,4]}'
       - role: tool
         tool_call_id: toolcall_0
-        content: Tool 'report_intent' does not exist. Available tools that can be called are powershell, read_powershell,
-          stop_powershell, list_powershell, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep,
-          glob, task.
+        content: Tool 'report_intent' does not exist. Available tools that can be called are ${shell}, ${read_shell},
+          ${stop_shell}, ${list_shell}, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep, glob,
+          task.
       - role: tool
         tool_call_id: toolcall_1
         content: |-

test/snapshots/builtin_tools/should_search_for_patterns_in_files.yaml

@@ -39,9 +39,9 @@ conversations:
               arguments: '{"pattern":"^ap","path":"${workdir}/data.txt","output_mode":"content","-n":true}'
       - role: tool
         tool_call_id: toolcall_0
-        content: Tool 'report_intent' does not exist. Available tools that can be called are powershell, read_powershell,
-          stop_powershell, list_powershell, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep,
-          glob, task.
+        content: Tool 'report_intent' does not exist. Available tools that can be called are ${shell}, ${read_shell},
+          ${stop_shell}, ${list_shell}, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep, glob,
+          task.
       - role: tool
         tool_call_id: toolcall_1
         content: |-

test/snapshots/client_options/should_use_client_cwd_for_default_workingdirectory.yaml

@@ -20,9 +20,9 @@ conversations:
               arguments: '{"path":"${workdir}/client-cwd/marker.txt"}'
       - role: tool
         tool_call_id: toolcall_0
-        content: Tool 'report_intent' does not exist. Available tools that can be called are powershell, read_powershell,
-          stop_powershell, list_powershell, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep,
-          glob, task.
+        content: Tool 'report_intent' does not exist. Available tools that can be called are ${shell}, ${read_shell},
+          ${stop_shell}, ${list_shell}, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep, glob,
+          task.
       - role: tool
         tool_call_id: toolcall_1
         content: 1. I am in the client cwd

test/snapshots/event_fidelity/should_emit_events_in_correct_order_for_tool_using_conversation.yaml

@@ -39,9 +39,9 @@ conversations:
               arguments: '{"path":"${workdir}/hello.txt"}'
       - role: tool
         tool_call_id: toolcall_0
-        content: Tool 'report_intent' does not exist. Available tools that can be called are powershell, read_powershell,
-          stop_powershell, list_powershell, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep,
-          glob, task.
+        content: Tool 'report_intent' does not exist. Available tools that can be called are ${shell}, ${read_shell},
+          ${stop_shell}, ${list_shell}, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep, glob,
+          task.
       - role: tool
         tool_call_id: toolcall_1
         content: 1. Hello World