From ae7cb908a6d537bbdb8d197f4d5ec4c643d142ee Mon Sep 17 00:00:00 2001
From: TossSky <v.totski@etorn.ee>
Date: Thu, 24 Sep 2026 21:45:24 +0300
Subject: [PATCH] [OMEGA-429] Update channel mock suites for the V2 mock

---
 Autotests/mock/llm.py                                |  9 +++++++--
 Autotests/mock/test_llm.py                           | 10 ++++++++++
 .../test_complex_weather_flow_slack_mock.py          | 11 ++++++-----
 .../mock_slack/test_convert_format_slack_mock.py     |  2 +-
 .../mock_slack/test_create_empty_file_slack_mock.py  |  6 ++++--
 Autotests/mock_slack/test_create_file_slack_mock.py  |  5 ++++-
 .../mock_slack/test_create_script_slack_mock.py      |  8 +++++---
 .../mock_slack/test_edit_add_timestamp_slack_mock.py |  2 +-
 .../mock_slack/test_edit_append_line_slack_mock.py   |  2 +-
 .../mock_slack/test_edit_delete_line_slack_mock.py   |  2 +-
 .../mock_slack/test_git_local_commit_slack_mock.py   | 10 ++++++----
 .../mock_slack/test_memory_chromadb_slack_mock.py    |  2 +-
 .../mock_slack/test_memory_episode_slack_mock.py     |  7 +++++--
 .../mock_slack/test_run_create_dirs_slack_mock.py    |  8 +++++---
 .../mock_slack/test_run_error_script_slack_mock.py   |  2 +-
 .../mock_slack/test_skill_episodes_slack_mock.py     |  7 +++++--
 Autotests/mock_slack/test_skill_metta_slack_mock.py  |  5 ++++-
 Autotests/mock_slack/test_skill_query_slack_mock.py  |  8 +++++---
 Autotests/mock_slack/test_slack_unwrap.py            | 12 +++++++++++-
 .../test_complex_weather_flow_telegram_mock.py       | 11 ++++++-----
 .../test_convert_format_telegram_mock.py             |  2 +-
 .../test_create_empty_file_telegram_mock.py          |  6 ++++--
 .../mock_telegram/test_create_file_telegram_mock.py  |  5 ++++-
 .../test_create_script_telegram_mock.py              |  8 +++++---
 .../test_edit_add_timestamp_telegram_mock.py         |  2 +-
 .../test_edit_append_line_telegram_mock.py           |  2 +-
 .../test_edit_delete_line_telegram_mock.py           |  2 +-
 .../test_git_local_commit_telegram_mock.py           | 10 ++++++----
 .../test_git_pull_public_telegram_mock.py            |  2 +-
 .../test_git_push_to_remote_telegram_mock.py         |  2 +-
 .../test_memory_chromadb_telegram_mock.py            |  2 +-
 .../test_memory_episode_telegram_mock.py             |  7 +++++--
 .../test_memory_history_telegram_mock.py             |  2 +-
 .../test_run_create_dirs_telegram_mock.py            |  8 +++++---
 .../test_run_error_script_telegram_mock.py           |  2 +-
 .../mock_telegram/test_run_repeated_telegram_mock.py |  2 +-
 .../mock_telegram/test_search_basic_telegram_mock.py |  2 +-
 .../test_search_invalid_telegram_mock.py             |  3 +--
 .../test_search_weather_telegram_mock.py             |  2 +-
 .../test_skill_episodes_telegram_mock.py             |  7 +++++--
 .../mock_telegram/test_skill_metta_telegram_mock.py  |  5 ++++-
 .../mock_telegram/test_skill_pin_telegram_mock.py    |  6 ++++--
 .../mock_telegram/test_skill_query_telegram_mock.py  | 12 ++++++++----
 Autotests/mock_websocket/test_create_file_ws_mock.py |  5 ++++-
 .../mock_websocket/test_memory_chromadb_ws_mock.py   |  2 +-
 Autotests/mock_websocket/test_ws_delivery_ws_mock.py |  2 +-
 .../test_ws_frame_robustness_ws_mock.py              |  2 +-
 .../mock_websocket/test_ws_outbox_flush_ws_mock.py   |  2 +-
 .../mock_websocket/test_ws_queue_merge_ws_mock.py    |  2 +-
 .../mock_websocket/test_ws_resume_dedup_ws_mock.py   |  4 ++--
 50 files changed, 163 insertions(+), 86 deletions(-)

diff --git a/Autotests/mock/llm.py b/Autotests/mock/llm.py
index 5a0cf547f..061321ad4 100644
--- a/Autotests/mock/llm.py
+++ b/Autotests/mock/llm.py
@@ -6,11 +6,15 @@
 except ImportError:
     from rpc import Rpc, IPCClient, IPCServer
 from contextlib import contextmanager
+import re
 import threading
 from providers import *
 
 LLM_MOCK_PORT = 9765
 
+# The loop sends every user message as "Step <time>: <text>"; answers are keyed by <text>.
+_STEP_PREFIX = re.compile(r"^Step \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}: ")
+
 class LlmMockAgent:
 
     def __init__(self, address):
@@ -41,15 +45,16 @@ def normalize(text):
                         .replace("_quote_", '"')
                         .replace("_newline_", "\n"))
 
+            text = _STEP_PREFIX.sub("", body, count=1)
             with self._lock:
-                answer = self._answers.get(body) or self._answers.get(normalize(body))
+                answer = self._answers.get(text) or self._answers.get(normalize(text))
 
             if not answer:
                 # IRC may deliver multiple PRIVMSGs in one agent iteration; the
                 # agent concatenates them with " | " between speakers. Split
                 # and look up each fragment individually so a registered answer
                 # is not missed when several messages arrive together.
-                fragments = body.split(" | ")
+                fragments = text.split(" | ")
                 for fragment in fragments:
                     if ": " not in fragment:
                         continue
diff --git a/Autotests/mock/test_llm.py b/Autotests/mock/test_llm.py
index 71d2f19dc..facfe53bd 100644
--- a/Autotests/mock/test_llm.py
+++ b/Autotests/mock/test_llm.py
@@ -53,6 +53,16 @@ def test_no_message(self, agent, controller):
         assert controller.set_answer("hello", _llm_response_json("world"))
         assert agent.chat(_llm_request("DO NOT RE-SEND OR SPAM!")) == LLMResponse()
 
+    def test_step_prefix_before_sender(self, agent, controller):
+        assert controller.set_answer("hello", _llm_response_json("world"))
+        msg = "Step 2026-09-24 15:12:23: <@U0B6ML16Q84> (OmegaClaw Driver): hello"
+        assert agent.chat(_llm_request(msg)) == _llm_response("world")
+
+    def test_step_prefix_without_sender(self, agent, controller):
+        assert controller.set_answer("hello", _llm_response_json("world"))
+        msg = "Step 2026-09-24 15:12:23: hello"
+        assert agent.chat(_llm_request(msg)) == _llm_response("world")
+
     def test_context_manager(self, agent):
         with llm_mock_controller(address=TEST_ADDRESS) as controller:
             assert controller.set_answer("hello", _llm_response_json("world"))
diff --git a/Autotests/mock_slack/test_complex_weather_flow_slack_mock.py b/Autotests/mock_slack/test_complex_weather_flow_slack_mock.py
index d38dce64f..6b348bb3e 100644
--- a/Autotests/mock_slack/test_complex_weather_flow_slack_mock.py
+++ b/Autotests/mock_slack/test_complex_weather_flow_slack_mock.py
@@ -58,11 +58,12 @@ def test_complex_weather_flow_slack_mock(llm, sl):
         # Single LLM response containing the full pipeline.
         llm.set_answer(
             prompt,
-            f'(write-file "{WEATHER_TXT}" "{FORECAST_TEXT}") '
-            f'(write-file "{SCRIPT_SH}" '
-            f'"#!/bin/bash\\ngrep -oE \'[0-9]+\' {WEATHER_TXT} | head -1 > {TEMP_ONLY}\\n") '
-            f'(shell "chmod +x {SCRIPT_SH}") '
-            f'(shell "sh {SCRIPT_SH}")',
+            [
+                ("write-file", { "filename": f"{WEATHER_TXT}", "content": f"{FORECAST_TEXT}" }),
+                ("write-file", { "filename": f"{SCRIPT_SH}", "content": f"#!/bin/bash\\ngrep -oE '[0-9]+' {WEATHER_TXT} | head -1 > {TEMP_ONLY}\\n" }),
+                ("shell", { "cmd": f"chmod +x {SCRIPT_SH}" }),
+                ("shell", { "cmd": f"sh {SCRIPT_SH}" }),
+            ],
         )
         sl_send_prompt(sl, prompt)
         c.ok("slack", f"run-id={c.run_id}")
diff --git a/Autotests/mock_slack/test_convert_format_slack_mock.py b/Autotests/mock_slack/test_convert_format_slack_mock.py
index 946d04184..ea698ed49 100644
--- a/Autotests/mock_slack/test_convert_format_slack_mock.py
+++ b/Autotests/mock_slack/test_convert_format_slack_mock.py
@@ -51,7 +51,7 @@ def test_convert_md_to_txt_slack_mock(llm, sl):
         )
         llm.set_answer(
             prompt,
-            f'(shell "cp {SOURCE_FILE} {DEST_FILE}")',
+            [("shell", { "cmd": f"cp {SOURCE_FILE} {DEST_FILE}" })],
         )
         sl_send_prompt(sl, prompt)
         c.ok("slack", f"run-id={c.run_id}")
diff --git a/Autotests/mock_slack/test_create_empty_file_slack_mock.py b/Autotests/mock_slack/test_create_empty_file_slack_mock.py
index 5db72045d..f27de52db 100644
--- a/Autotests/mock_slack/test_create_empty_file_slack_mock.py
+++ b/Autotests/mock_slack/test_create_empty_file_slack_mock.py
@@ -38,8 +38,10 @@ def test_create_empty_file_slack_mock(llm, sl):
         )
         llm.set_answer(
             prompt,
-            f'(shell "mkdir -p {TARGET_DIR}") '
-            f'(write-file "{TARGET_FILE}" "")',
+            [
+                ("shell", { "cmd": f"mkdir -p {TARGET_DIR}" }),
+                ("write-file", { "filename": f"{TARGET_FILE}", "content": "" }),
+            ],
         )
         sl_send_prompt(sl, prompt)
         c.ok("slack", f"run-id={c.run_id}")
diff --git a/Autotests/mock_slack/test_create_file_slack_mock.py b/Autotests/mock_slack/test_create_file_slack_mock.py
index 1c1f9b4b8..546b41692 100644
--- a/Autotests/mock_slack/test_create_file_slack_mock.py
+++ b/Autotests/mock_slack/test_create_file_slack_mock.py
@@ -31,7 +31,10 @@ def test_hello_file_slack_mock(llm, sl):
             f"Please overwrite {TARGET_FILE} so it contains exactly the single "
             "word Hello (no quotes, no extra newlines, create the directory if needed).",
         )
-        llm.set_answer(prompt, f'(shell "mkdir -p /tmp/testcat") (write-file "/tmp/testcat/hello.txt" "Hello")')
+        llm.set_answer(prompt, [
+            ("shell", { "cmd": "mkdir -p /tmp/testcat" }),
+            ("write-file", { "filename": "/tmp/testcat/hello.txt", "content": "Hello" }),
+        ])
 
         sl_send_prompt(sl, prompt)
         c.ok("slack", f"prompt delivered, run-id={c.run_id}")
diff --git a/Autotests/mock_slack/test_create_script_slack_mock.py b/Autotests/mock_slack/test_create_script_slack_mock.py
index 9ebbac2c2..d791421d5 100644
--- a/Autotests/mock_slack/test_create_script_slack_mock.py
+++ b/Autotests/mock_slack/test_create_script_slack_mock.py
@@ -49,9 +49,11 @@ def test_create_date_script_slack_mock(llm, sl):
         )
         llm.set_answer(
             prompt,
-            f'(shell "mkdir -p {TARGET_DIR}") '
-            f'(write-file "{TARGET_FILE}" "#!/bin/bash\\ndate\\n") '
-            f'(shell "chmod +x {TARGET_FILE}")',
+            [
+                ("shell", { "cmd": f"mkdir -p {TARGET_DIR}" }),
+                ("write-file", { "filename": f"{TARGET_FILE}", "content": "#!/bin/bash\\ndate\\n" }),
+                ("shell", { "cmd": f"chmod +x {TARGET_FILE}" }),
+            ],
         )
         sl_send_prompt(sl, prompt)
         c.ok("slack", f"run-id={c.run_id}")
diff --git a/Autotests/mock_slack/test_edit_add_timestamp_slack_mock.py b/Autotests/mock_slack/test_edit_add_timestamp_slack_mock.py
index 9d639fbe4..15a40a0b0 100644
--- a/Autotests/mock_slack/test_edit_add_timestamp_slack_mock.py
+++ b/Autotests/mock_slack/test_edit_add_timestamp_slack_mock.py
@@ -53,7 +53,7 @@ def test_edit_add_timestamp_slack_mock(llm, sl):
         # real test.
         llm.set_answer(
             prompt,
-            f'(shell "date -Iseconds >> {TARGET_FILE}")',
+            [("shell", { "cmd": f"date -Iseconds >> {TARGET_FILE}" })],
         )
         sl_send_prompt(sl, prompt)
         c.ok("slack", f"run-id={c.run_id}")
diff --git a/Autotests/mock_slack/test_edit_append_line_slack_mock.py b/Autotests/mock_slack/test_edit_append_line_slack_mock.py
index fe53e4671..73b7776cd 100644
--- a/Autotests/mock_slack/test_edit_append_line_slack_mock.py
+++ b/Autotests/mock_slack/test_edit_append_line_slack_mock.py
@@ -52,7 +52,7 @@ def test_edit_append_line_slack_mock(llm, sl):
         )
         llm.set_answer(
             prompt,
-            f'(shell "printf \'%s\\\\n\' {LINE4_EXPECTED} >> {TARGET_FILE}")',
+            [("shell", { "cmd": f"printf '%s\\\\n' {LINE4_EXPECTED} >> {TARGET_FILE}" })],
         )
         sl_send_prompt(sl, prompt)
         c.ok("slack", f"run-id={c.run_id}")
diff --git a/Autotests/mock_slack/test_edit_delete_line_slack_mock.py b/Autotests/mock_slack/test_edit_delete_line_slack_mock.py
index 9f98871c3..de30f9ccb 100644
--- a/Autotests/mock_slack/test_edit_delete_line_slack_mock.py
+++ b/Autotests/mock_slack/test_edit_delete_line_slack_mock.py
@@ -52,7 +52,7 @@ def test_edit_delete_line_slack_mock(llm, sl):
         )
         llm.set_answer(
             prompt,
-            f'(shell "sed -i 2d {TARGET_FILE}")',
+            [("shell", { "cmd": f"sed -i 2d {TARGET_FILE}" })],
         )
         sl_send_prompt(sl, prompt)
         c.ok("slack", f"run-id={c.run_id}")
diff --git a/Autotests/mock_slack/test_git_local_commit_slack_mock.py b/Autotests/mock_slack/test_git_local_commit_slack_mock.py
index 67215f8ce..47c9704bc 100644
--- a/Autotests/mock_slack/test_git_local_commit_slack_mock.py
+++ b/Autotests/mock_slack/test_git_local_commit_slack_mock.py
@@ -54,10 +54,12 @@ def test_git_local_commit_slack_mock(llm, sl):
         # arg itself is double-quoted, so we escape inner quotes.
         llm.set_answer(
             prompt,
-            f'(shell "git -C {TARGET_DIR} init") '
-            f'(write-file "{commit_path}" "{marker}") '
-            f'(shell "git -C {TARGET_DIR} add -A") '
-            f'(shell "git -C {TARGET_DIR} commit -m \\"add hello {c.run_id}\\"")',
+            [
+                ("shell", { "cmd": f"git -C {TARGET_DIR} init" }),
+                ("write-file", { "filename": f"{commit_path}", "content": f"{marker}" }),
+                ("shell", { "cmd": f"git -C {TARGET_DIR} add -A" }),
+                ("shell", { "cmd": f"git -C {TARGET_DIR} commit -m \"add hello {c.run_id}\"" }),
+            ],
         )
         sl_send_prompt(sl, prompt)
         c.ok("slack", f"run-id={c.run_id}")
diff --git a/Autotests/mock_slack/test_memory_chromadb_slack_mock.py b/Autotests/mock_slack/test_memory_chromadb_slack_mock.py
index ecc32e106..c294aeb95 100644
--- a/Autotests/mock_slack/test_memory_chromadb_slack_mock.py
+++ b/Autotests/mock_slack/test_memory_chromadb_slack_mock.py
@@ -60,7 +60,7 @@ def test_memory_chromadb_slack_mock(llm, sl):
         )
         llm.set_answer(
             prompt,
-            f'(remember "Unique smoke marker {marker} was emitted by CI.")',
+            [("remember", { "content": f"Unique smoke marker {marker} was emitted by CI." })],
         )
         sl_send_prompt(sl, prompt)
         c.ok("slack", f"run-id={c.run_id}")
diff --git a/Autotests/mock_slack/test_memory_episode_slack_mock.py b/Autotests/mock_slack/test_memory_episode_slack_mock.py
index 649803283..dd4c95c75 100644
--- a/Autotests/mock_slack/test_memory_episode_slack_mock.py
+++ b/Autotests/mock_slack/test_memory_episode_slack_mock.py
@@ -46,7 +46,7 @@ def test_memory_episode_slack_mock(llm, sl):
         )
         llm.set_answer(
             prompt1,
-            '(remember "Barney the dog lost his first baby tooth at the vet today.")',
+            [("remember", { "content": "Barney the dog lost his first baby tooth at the vet today." })],
         )
         sl_send_prompt(sl, prompt1)
         c.ok("irc-1", f"run-id={fact_marker}")
@@ -88,7 +88,10 @@ def is_barney_memory(s):
         )
         llm.set_answer(
             prompt2,
-            f'(query "Barney tooth") (send "{recall_reply}")',
+            [
+                ("query", { "content": "Barney tooth" }),
+                ("send", { "content": f"{recall_reply}" }),
+            ],
         )
         sl_send_prompt(sl, prompt2)
         c.ok("irc-2", f"run-id={recall_marker}")
diff --git a/Autotests/mock_slack/test_run_create_dirs_slack_mock.py b/Autotests/mock_slack/test_run_create_dirs_slack_mock.py
index 647e780a9..851e77db5 100644
--- a/Autotests/mock_slack/test_run_create_dirs_slack_mock.py
+++ b/Autotests/mock_slack/test_run_create_dirs_slack_mock.py
@@ -47,9 +47,11 @@ def test_run_create_dirs_slack_mock(llm, sl):
         mkdir_args = " ".join(f"{TARGET_DIR}/{d}" for d in EXPECTED_DIRS)
         llm.set_answer(
             prompt,
-            f'(write-file "{SCRIPT_PATH}" "#!/bin/bash\\nmkdir -p {mkdir_args}\\n") '
-            f'(shell "chmod +x {SCRIPT_PATH}") '
-            f'(shell "sh {SCRIPT_PATH}")',
+            [
+                ("write-file", { "filename": f"{SCRIPT_PATH}", "content": f"#!/bin/bash\\nmkdir -p {mkdir_args}\\n" }),
+                ("shell", { "cmd": f"chmod +x {SCRIPT_PATH}" }),
+                ("shell", { "cmd": f"sh {SCRIPT_PATH}" }),
+            ],
         )
         sl_send_prompt(sl, prompt)
         c.ok("slack", f"run-id={c.run_id}")
diff --git a/Autotests/mock_slack/test_run_error_script_slack_mock.py b/Autotests/mock_slack/test_run_error_script_slack_mock.py
index e7a5925e4..d0821bec7 100644
--- a/Autotests/mock_slack/test_run_error_script_slack_mock.py
+++ b/Autotests/mock_slack/test_run_error_script_slack_mock.py
@@ -55,7 +55,7 @@ def test_run_error_script_slack_mock(llm, sl):
         )
         llm.set_answer(
             prompt,
-            f'(shell "sh {SCRIPT_FILE} > {OUTPUT_FILE} 2>&1")',
+            [("shell", { "cmd": f"sh {SCRIPT_FILE} > {OUTPUT_FILE} 2>&1" })],
         )
         sl_send_prompt(sl, prompt)
         c.ok("slack", f"run-id={c.run_id}")
diff --git a/Autotests/mock_slack/test_skill_episodes_slack_mock.py b/Autotests/mock_slack/test_skill_episodes_slack_mock.py
index eae4fcf12..ed994a306 100644
--- a/Autotests/mock_slack/test_skill_episodes_slack_mock.py
+++ b/Autotests/mock_slack/test_skill_episodes_slack_mock.py
@@ -41,7 +41,7 @@ def test_skill_episodes_slack_mock(llm, sl):
             f"the keyword {marker} from me. No need to remember it — just "
             f"reply once.",
         )
-        llm.set_answer(seed_prompt, f'(send "Acknowledged keyword {marker}.")')
+        llm.set_answer(seed_prompt, [("send", { "content": f"Acknowledged keyword {marker}." })])
         sl_send_prompt(sl, seed_prompt)
         c.ok("irc-seed", f"run-id={seed_id}, time={seed_time:%H:%M:%S}")
 
@@ -69,7 +69,10 @@ def test_skill_episodes_slack_mock(llm, sl):
         )
         llm.set_answer(
             recall_prompt,
-            f'(episodes "{time_str}") (send "The unique keyword was {marker}.")',
+            [
+                ("episodes", { "timestamp": f"{time_str}" }),
+                ("send", { "content": f"The unique keyword was {marker}." }),
+            ],
         )
         sl_send_prompt(sl, recall_prompt)
         c.ok("irc-recall", f"run-id={recall_id}")
diff --git a/Autotests/mock_slack/test_skill_metta_slack_mock.py b/Autotests/mock_slack/test_skill_metta_slack_mock.py
index 4379139ae..fbb909475 100644
--- a/Autotests/mock_slack/test_skill_metta_slack_mock.py
+++ b/Autotests/mock_slack/test_skill_metta_slack_mock.py
@@ -34,7 +34,10 @@ def test_skill_metta_slack_mock(llm, sl):
         # concrete number is communicated back.
         llm.set_answer(
             prompt,
-            '(metta "(+ 2 2)") (send "The metta skill evaluated (+ 2 2) and returned 4.")',
+            [
+                ("metta", { "sexpression": "(+ 2 2)" }),
+                ("send", { "content": "The metta skill evaluated (+ 2 2) and returned 4." }),
+            ],
         )
         sl_send_prompt(sl, prompt)
         c.ok("slack", f"run-id={c.run_id}")
diff --git a/Autotests/mock_slack/test_skill_query_slack_mock.py b/Autotests/mock_slack/test_skill_query_slack_mock.py
index f1f6ef7b2..43e7029f1 100644
--- a/Autotests/mock_slack/test_skill_query_slack_mock.py
+++ b/Autotests/mock_slack/test_skill_query_slack_mock.py
@@ -44,7 +44,7 @@ def test_skill_query_slack_mock(llm, sl):
             seed_prompt,
             [
                 ("remember", { "content": f"My favorite color is {secret_color}." }),
-                ("send", { "content": f"Stored: favorite colour is {secret_color}."),
+                ("send", { "content": f"Stored: favorite colour is {secret_color}." }),
             ]
         )
         sl_send_prompt(sl, seed_prompt)
@@ -79,8 +79,10 @@ def has_color(arg):
         )
         llm.set_answer(
             recall_prompt,
-            f'(query "favorite color") '
-            f'(send "Your favorite color is {secret_color}.")',
+            [
+                ("query", { "content": "favorite color" }),
+                ("send", { "content": f"Your favorite color is {secret_color}." }),
+            ],
         )
         sl_send_prompt(sl, recall_prompt)
         c.ok("irc-recall", f"run-id={recall_id}")
diff --git a/Autotests/mock_slack/test_slack_unwrap.py b/Autotests/mock_slack/test_slack_unwrap.py
index 91055789a..b9937a4a3 100644
--- a/Autotests/mock_slack/test_slack_unwrap.py
+++ b/Autotests/mock_slack/test_slack_unwrap.py
@@ -8,6 +8,7 @@
 Run:
     pytest test_slack_unwrap.py -s
 """
+import importlib.util
 import os
 import sys
 
@@ -17,7 +18,16 @@
 if _PARENT not in sys.path:
     sys.path.insert(0, _PARENT)
 
-from channels.slack import _slack_unwrap  # noqa: E402
+# src/channels.py shadows the channels/ package on pythonpath, so load slack.py by path
+# and let it import its siblings (auth, delivery_queue) the way the container does.
+_CHANNELS = os.path.join(_PARENT, "channels")
+if _CHANNELS not in sys.path:
+    sys.path.append(_CHANNELS)
+_spec = importlib.util.spec_from_file_location(
+    "slack_channel_under_test", os.path.join(_PARENT, "channels", "slack.py"))
+_slack = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_slack)
+_slack_unwrap = _slack._slack_unwrap
 
 
 @pytest.fixture(scope="session")
diff --git a/Autotests/mock_telegram/test_complex_weather_flow_telegram_mock.py b/Autotests/mock_telegram/test_complex_weather_flow_telegram_mock.py
index 4e076d0e2..878ebf26a 100644
--- a/Autotests/mock_telegram/test_complex_weather_flow_telegram_mock.py
+++ b/Autotests/mock_telegram/test_complex_weather_flow_telegram_mock.py
@@ -58,11 +58,12 @@ def test_complex_weather_flow_telegram_mock(llm, tg):
         # Single LLM response containing the full pipeline.
         llm.set_answer(
             prompt,
-            f'(write-file "{WEATHER_TXT}" "{FORECAST_TEXT}") '
-            f'(write-file "{SCRIPT_SH}" '
-            f'"#!/bin/bash\\ngrep -oE \'[0-9]+\' {WEATHER_TXT} | head -1 > {TEMP_ONLY}\\n") '
-            f'(shell "chmod +x {SCRIPT_SH}") '
-            f'(shell "sh {SCRIPT_SH}")',
+            [
+                ("write-file", { "filename": f"{WEATHER_TXT}", "content": f"{FORECAST_TEXT}" }),
+                ("write-file", { "filename": f"{SCRIPT_SH}", "content": f"#!/bin/bash\\ngrep -oE '[0-9]+' {WEATHER_TXT} | head -1 > {TEMP_ONLY}\\n" }),
+                ("shell", { "cmd": f"chmod +x {SCRIPT_SH}" }),
+                ("shell", { "cmd": f"sh {SCRIPT_SH}" }),
+            ],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_convert_format_telegram_mock.py b/Autotests/mock_telegram/test_convert_format_telegram_mock.py
index 75b599815..93993028a 100644
--- a/Autotests/mock_telegram/test_convert_format_telegram_mock.py
+++ b/Autotests/mock_telegram/test_convert_format_telegram_mock.py
@@ -51,7 +51,7 @@ def test_convert_md_to_txt_telegram_mock(llm, tg):
         )
         llm.set_answer(
             prompt,
-            f'(shell "cp {SOURCE_FILE} {DEST_FILE}")',
+            [("shell", { "cmd": f"cp {SOURCE_FILE} {DEST_FILE}" })],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_create_empty_file_telegram_mock.py b/Autotests/mock_telegram/test_create_empty_file_telegram_mock.py
index d706d1ceb..9ead2f14e 100644
--- a/Autotests/mock_telegram/test_create_empty_file_telegram_mock.py
+++ b/Autotests/mock_telegram/test_create_empty_file_telegram_mock.py
@@ -38,8 +38,10 @@ def test_create_empty_file_telegram_mock(llm, tg):
         )
         llm.set_answer(
             prompt,
-            f'(shell "mkdir -p {TARGET_DIR}") '
-            f'(write-file "{TARGET_FILE}" "")',
+            [
+                ("shell", { "cmd": f"mkdir -p {TARGET_DIR}" }),
+                ("write-file", { "filename": f"{TARGET_FILE}", "content": "" }),
+            ],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_create_file_telegram_mock.py b/Autotests/mock_telegram/test_create_file_telegram_mock.py
index cd79561ef..9c410cc63 100644
--- a/Autotests/mock_telegram/test_create_file_telegram_mock.py
+++ b/Autotests/mock_telegram/test_create_file_telegram_mock.py
@@ -31,7 +31,10 @@ def test_hello_file_telegram_mock(llm, tg):
             f"Please overwrite {TARGET_FILE} so it contains exactly the single "
             "word Hello (no quotes, no extra newlines, create the directory if needed).",
         )
-        llm.set_answer(prompt, f'(shell "mkdir -p /tmp/testcat") (write-file "/tmp/testcat/hello.txt" "Hello")')
+        llm.set_answer(prompt, [
+            ("shell", { "cmd": "mkdir -p /tmp/testcat" }),
+            ("write-file", { "filename": "/tmp/testcat/hello.txt", "content": "Hello" }),
+        ])
 
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"prompt delivered, run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_create_script_telegram_mock.py b/Autotests/mock_telegram/test_create_script_telegram_mock.py
index e075f527f..559636e92 100644
--- a/Autotests/mock_telegram/test_create_script_telegram_mock.py
+++ b/Autotests/mock_telegram/test_create_script_telegram_mock.py
@@ -49,9 +49,11 @@ def test_create_date_script_telegram_mock(llm, tg):
         )
         llm.set_answer(
             prompt,
-            f'(shell "mkdir -p {TARGET_DIR}") '
-            f'(write-file "{TARGET_FILE}" "#!/bin/bash\\ndate\\n") '
-            f'(shell "chmod +x {TARGET_FILE}")',
+            [
+                ("shell", { "cmd": f"mkdir -p {TARGET_DIR}" }),
+                ("write-file", { "filename": f"{TARGET_FILE}", "content": "#!/bin/bash\\ndate\\n" }),
+                ("shell", { "cmd": f"chmod +x {TARGET_FILE}" }),
+            ],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_edit_add_timestamp_telegram_mock.py b/Autotests/mock_telegram/test_edit_add_timestamp_telegram_mock.py
index 5239dbd41..77c7acab8 100644
--- a/Autotests/mock_telegram/test_edit_add_timestamp_telegram_mock.py
+++ b/Autotests/mock_telegram/test_edit_add_timestamp_telegram_mock.py
@@ -53,7 +53,7 @@ def test_edit_add_timestamp_telegram_mock(llm, tg):
         # real test.
         llm.set_answer(
             prompt,
-            f'(shell "date -Iseconds >> {TARGET_FILE}")',
+            [("shell", { "cmd": f"date -Iseconds >> {TARGET_FILE}" })],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_edit_append_line_telegram_mock.py b/Autotests/mock_telegram/test_edit_append_line_telegram_mock.py
index fa082b00f..471fb5577 100644
--- a/Autotests/mock_telegram/test_edit_append_line_telegram_mock.py
+++ b/Autotests/mock_telegram/test_edit_append_line_telegram_mock.py
@@ -52,7 +52,7 @@ def test_edit_append_line_telegram_mock(llm, tg):
         )
         llm.set_answer(
             prompt,
-            f'(shell "printf \'%s\\\\n\' {LINE4_EXPECTED} >> {TARGET_FILE}")',
+            [("shell", { "cmd": f"printf '%s\\\\n' {LINE4_EXPECTED} >> {TARGET_FILE}" })],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_edit_delete_line_telegram_mock.py b/Autotests/mock_telegram/test_edit_delete_line_telegram_mock.py
index cb23b545b..354ba1dc0 100644
--- a/Autotests/mock_telegram/test_edit_delete_line_telegram_mock.py
+++ b/Autotests/mock_telegram/test_edit_delete_line_telegram_mock.py
@@ -52,7 +52,7 @@ def test_edit_delete_line_telegram_mock(llm, tg):
         )
         llm.set_answer(
             prompt,
-            f'(shell "sed -i 2d {TARGET_FILE}")',
+            [("shell", { "cmd": f"sed -i 2d {TARGET_FILE}" })],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_git_local_commit_telegram_mock.py b/Autotests/mock_telegram/test_git_local_commit_telegram_mock.py
index 2ce2e30e7..cece08617 100644
--- a/Autotests/mock_telegram/test_git_local_commit_telegram_mock.py
+++ b/Autotests/mock_telegram/test_git_local_commit_telegram_mock.py
@@ -54,10 +54,12 @@ def test_git_local_commit_telegram_mock(llm, tg):
         # arg itself is double-quoted, so we escape inner quotes.
         llm.set_answer(
             prompt,
-            f'(shell "git -C {TARGET_DIR} init") '
-            f'(write-file "{commit_path}" "{marker}") '
-            f'(shell "git -C {TARGET_DIR} add -A") '
-            f'(shell "git -C {TARGET_DIR} commit -m \\"add hello {c.run_id}\\"")',
+            [
+                ("shell", { "cmd": f"git -C {TARGET_DIR} init" }),
+                ("write-file", { "filename": f"{commit_path}", "content": f"{marker}" }),
+                ("shell", { "cmd": f"git -C {TARGET_DIR} add -A" }),
+                ("shell", { "cmd": f"git -C {TARGET_DIR} commit -m \"add hello {c.run_id}\"" }),
+            ],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_git_pull_public_telegram_mock.py b/Autotests/mock_telegram/test_git_pull_public_telegram_mock.py
index 24a30500e..8c90ae5d8 100644
--- a/Autotests/mock_telegram/test_git_pull_public_telegram_mock.py
+++ b/Autotests/mock_telegram/test_git_pull_public_telegram_mock.py
@@ -56,7 +56,7 @@ def test_git_pull_public_telegram_mock(llm, tg):
         # clone into the path directly.
         llm.set_answer(
             prompt,
-            f'(shell "rm -rf {TARGET_DIR} && git clone {remote} {TARGET_DIR}")',
+            [("shell", { "cmd": f"rm -rf {TARGET_DIR} && git clone {remote} {TARGET_DIR}" })],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_git_push_to_remote_telegram_mock.py b/Autotests/mock_telegram/test_git_push_to_remote_telegram_mock.py
index 5ec41b205..81b541d19 100644
--- a/Autotests/mock_telegram/test_git_push_to_remote_telegram_mock.py
+++ b/Autotests/mock_telegram/test_git_push_to_remote_telegram_mock.py
@@ -108,7 +108,7 @@ def test_git_push_to_remote_telegram_mock(llm, tg):
             f"git commit -m 'qa run {c.run_id}' && "
             f"git push -u origin {branch}"
         )
-        llm.set_answer(prompt, f'(shell "{chain}")')
+        llm.set_answer(prompt, [("shell", { "cmd": f"{chain}" })])
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
 
diff --git a/Autotests/mock_telegram/test_memory_chromadb_telegram_mock.py b/Autotests/mock_telegram/test_memory_chromadb_telegram_mock.py
index 94f1978cb..a2b6242b7 100644
--- a/Autotests/mock_telegram/test_memory_chromadb_telegram_mock.py
+++ b/Autotests/mock_telegram/test_memory_chromadb_telegram_mock.py
@@ -60,7 +60,7 @@ def test_memory_chromadb_telegram_mock(llm, tg):
         )
         llm.set_answer(
             prompt,
-            f'(remember "Unique smoke marker {marker} was emitted by CI.")',
+            [("remember", { "content": f"Unique smoke marker {marker} was emitted by CI." })],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_memory_episode_telegram_mock.py b/Autotests/mock_telegram/test_memory_episode_telegram_mock.py
index fe5df7893..8254097d2 100644
--- a/Autotests/mock_telegram/test_memory_episode_telegram_mock.py
+++ b/Autotests/mock_telegram/test_memory_episode_telegram_mock.py
@@ -46,7 +46,7 @@ def test_memory_episode_telegram_mock(llm, tg):
         )
         llm.set_answer(
             prompt1,
-            '(remember "Barney the dog lost his first baby tooth at the vet today.")',
+            [("remember", { "content": "Barney the dog lost his first baby tooth at the vet today." })],
         )
         tg_send_prompt(tg, prompt1)
         c.ok("irc-1", f"run-id={fact_marker}")
@@ -88,7 +88,10 @@ def is_barney_memory(s):
         )
         llm.set_answer(
             prompt2,
-            f'(query "Barney tooth") (send "{recall_reply}")',
+            [
+                ("query", { "content": "Barney tooth" }),
+                ("send", { "content": f"{recall_reply}" }),
+            ],
         )
         tg_send_prompt(tg, prompt2)
         c.ok("irc-2", f"run-id={recall_marker}")
diff --git a/Autotests/mock_telegram/test_memory_history_telegram_mock.py b/Autotests/mock_telegram/test_memory_history_telegram_mock.py
index 37ce0d26b..3237ca883 100644
--- a/Autotests/mock_telegram/test_memory_history_telegram_mock.py
+++ b/Autotests/mock_telegram/test_memory_history_telegram_mock.py
@@ -39,7 +39,7 @@ def test_memory_history_telegram_mock(llm, tg):
             f"Acknowledge with one short line that you received marker {c.run_id}.",
         )
         ack = f"Marker {c.run_id} received. REQ-{c.run_id} acknowledged."
-        llm.set_answer(prompt, f'(send "{ack}")')
+        llm.set_answer(prompt, [("send", { "content": f"{ack}" })])
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
 
diff --git a/Autotests/mock_telegram/test_run_create_dirs_telegram_mock.py b/Autotests/mock_telegram/test_run_create_dirs_telegram_mock.py
index ef1a3031b..83993605a 100644
--- a/Autotests/mock_telegram/test_run_create_dirs_telegram_mock.py
+++ b/Autotests/mock_telegram/test_run_create_dirs_telegram_mock.py
@@ -47,9 +47,11 @@ def test_run_create_dirs_telegram_mock(llm, tg):
         mkdir_args = " ".join(f"{TARGET_DIR}/{d}" for d in EXPECTED_DIRS)
         llm.set_answer(
             prompt,
-            f'(write-file "{SCRIPT_PATH}" "#!/bin/bash\\nmkdir -p {mkdir_args}\\n") '
-            f'(shell "chmod +x {SCRIPT_PATH}") '
-            f'(shell "sh {SCRIPT_PATH}")',
+            [
+                ("write-file", { "filename": f"{SCRIPT_PATH}", "content": f"#!/bin/bash\\nmkdir -p {mkdir_args}\\n" }),
+                ("shell", { "cmd": f"chmod +x {SCRIPT_PATH}" }),
+                ("shell", { "cmd": f"sh {SCRIPT_PATH}" }),
+            ],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_run_error_script_telegram_mock.py b/Autotests/mock_telegram/test_run_error_script_telegram_mock.py
index 6ffd24275..e39f2fef7 100644
--- a/Autotests/mock_telegram/test_run_error_script_telegram_mock.py
+++ b/Autotests/mock_telegram/test_run_error_script_telegram_mock.py
@@ -55,7 +55,7 @@ def test_run_error_script_telegram_mock(llm, tg):
         )
         llm.set_answer(
             prompt,
-            f'(shell "sh {SCRIPT_FILE} > {OUTPUT_FILE} 2>&1")',
+            [("shell", { "cmd": f"sh {SCRIPT_FILE} > {OUTPUT_FILE} 2>&1" })],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_run_repeated_telegram_mock.py b/Autotests/mock_telegram/test_run_repeated_telegram_mock.py
index 9f09b498e..adcdd3bad 100644
--- a/Autotests/mock_telegram/test_run_repeated_telegram_mock.py
+++ b/Autotests/mock_telegram/test_run_repeated_telegram_mock.py
@@ -49,7 +49,7 @@ def test_run_repeated_telegram_mock(llm, tg):
             f"a row. The script appends a date line to {OUTPUT_FILE} each "
             "time it runs.",
         )
-        repeated = " ".join(f'(shell "sh {SCRIPT_FILE}")' for _ in range(EXPECTED_RUNS))
+        repeated = [("shell", { "cmd": f"sh {SCRIPT_FILE}" }) for _ in range(EXPECTED_RUNS)]
         llm.set_answer(prompt, repeated)
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_search_basic_telegram_mock.py b/Autotests/mock_telegram/test_search_basic_telegram_mock.py
index c5e26602f..d7f1fb727 100644
--- a/Autotests/mock_telegram/test_search_basic_telegram_mock.py
+++ b/Autotests/mock_telegram/test_search_basic_telegram_mock.py
@@ -37,7 +37,7 @@ def test_search_basic_telegram_mock(llm, tg):
             c.run_id,
             "What is SingularityNet? Search the web and give me a short description.",
         )
-        llm.set_answer(prompt, f'(send "{SINGULARITYNET_DESCRIPTION}")')
+        llm.set_answer(prompt, [("send", { "content": f"{SINGULARITYNET_DESCRIPTION}" })])
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
 
diff --git a/Autotests/mock_telegram/test_search_invalid_telegram_mock.py b/Autotests/mock_telegram/test_search_invalid_telegram_mock.py
index 11ba219ac..8d66c20ad 100644
--- a/Autotests/mock_telegram/test_search_invalid_telegram_mock.py
+++ b/Autotests/mock_telegram/test_search_invalid_telegram_mock.py
@@ -43,8 +43,7 @@ def test_search_invalid_telegram_mock(llm, tg):
         )
         llm.set_answer(
             prompt,
-            f'(send "No results found for {GIBBERISH}. The string appears to '
-            f'be gibberish — no meaningful matches.")',
+            [("send", { "content": f"No results found for {GIBBERISH}. The string appears to be gibberish — no meaningful matches." })],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_search_weather_telegram_mock.py b/Autotests/mock_telegram/test_search_weather_telegram_mock.py
index bde7611e3..39d98cce5 100644
--- a/Autotests/mock_telegram/test_search_weather_telegram_mock.py
+++ b/Autotests/mock_telegram/test_search_weather_telegram_mock.py
@@ -34,7 +34,7 @@ def test_search_weather_telegram_mock(llm, tg):
         mocked_reply = (
             f"Current weather in Valencia, Spain: about {REF_TEMP_C:.1f}°C."
         )
-        llm.set_answer(prompt, f'(send "{mocked_reply}")')
+        llm.set_answer(prompt, [("send", { "content": f"{mocked_reply}" })])
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
 
diff --git a/Autotests/mock_telegram/test_skill_episodes_telegram_mock.py b/Autotests/mock_telegram/test_skill_episodes_telegram_mock.py
index 89ea3ed29..5e05d418d 100644
--- a/Autotests/mock_telegram/test_skill_episodes_telegram_mock.py
+++ b/Autotests/mock_telegram/test_skill_episodes_telegram_mock.py
@@ -41,7 +41,7 @@ def test_skill_episodes_telegram_mock(llm, tg):
             f"the keyword {marker} from me. No need to remember it — just "
             f"reply once.",
         )
-        llm.set_answer(seed_prompt, f'(send "Acknowledged keyword {marker}.")')
+        llm.set_answer(seed_prompt, [("send", { "content": f"Acknowledged keyword {marker}." })])
         tg_send_prompt(tg, seed_prompt)
         c.ok("irc-seed", f"run-id={seed_id}, time={seed_time:%H:%M:%S}")
 
@@ -69,7 +69,10 @@ def test_skill_episodes_telegram_mock(llm, tg):
         )
         llm.set_answer(
             recall_prompt,
-            f'(episodes "{time_str}") (send "The unique keyword was {marker}.")',
+            [
+                ("episodes", { "timestamp": f"{time_str}" }),
+                ("send", { "content": f"The unique keyword was {marker}." }),
+            ],
         )
         tg_send_prompt(tg, recall_prompt)
         c.ok("irc-recall", f"run-id={recall_id}")
diff --git a/Autotests/mock_telegram/test_skill_metta_telegram_mock.py b/Autotests/mock_telegram/test_skill_metta_telegram_mock.py
index d627f2fad..5e967a964 100644
--- a/Autotests/mock_telegram/test_skill_metta_telegram_mock.py
+++ b/Autotests/mock_telegram/test_skill_metta_telegram_mock.py
@@ -34,7 +34,10 @@ def test_skill_metta_telegram_mock(llm, tg):
         # concrete number is communicated back.
         llm.set_answer(
             prompt,
-            '(metta "(+ 2 2)") (send "The metta skill evaluated (+ 2 2) and returned 4.")',
+            [
+                ("metta", { "sexpression": "(+ 2 2)" }),
+                ("send", { "content": "The metta skill evaluated (+ 2 2) and returned 4." }),
+            ],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_skill_pin_telegram_mock.py b/Autotests/mock_telegram/test_skill_pin_telegram_mock.py
index 52876ce52..7747a2432 100644
--- a/Autotests/mock_telegram/test_skill_pin_telegram_mock.py
+++ b/Autotests/mock_telegram/test_skill_pin_telegram_mock.py
@@ -30,8 +30,10 @@ def test_skill_pin_telegram_mock(llm, tg):
         )
         llm.set_answer(
             prompt,
-            '(pin "Server restart progress: alpha done; beta and gamma pending.") '
-            '(send "Tracking: alpha done, beta and gamma pending.")',
+            [
+                ("pin", { "message": "Server restart progress: alpha done; beta and gamma pending." }),
+                ("send", { "content": "Tracking: alpha done, beta and gamma pending." }),
+            ],
         )
         tg_send_prompt(tg, prompt)
         c.ok("telegram", f"run-id={c.run_id}")
diff --git a/Autotests/mock_telegram/test_skill_query_telegram_mock.py b/Autotests/mock_telegram/test_skill_query_telegram_mock.py
index aafb81404..3bec1c31d 100644
--- a/Autotests/mock_telegram/test_skill_query_telegram_mock.py
+++ b/Autotests/mock_telegram/test_skill_query_telegram_mock.py
@@ -41,8 +41,10 @@ def test_skill_query_telegram_mock(llm, tg):
         )
         llm.set_answer(
             seed_prompt,
-            f'(remember "My favorite color is {secret_color}.") '
-            f'(send "Stored: favorite colour is {secret_color}.")',
+            [
+                ("remember", { "content": f"My favorite color is {secret_color}." }),
+                ("send", { "content": f"Stored: favorite colour is {secret_color}." }),
+            ],
         )
         tg_send_prompt(tg, seed_prompt)
         c.ok("irc-seed", f"run-id={seed_id}")
@@ -76,8 +78,10 @@ def has_color(arg):
         )
         llm.set_answer(
             recall_prompt,
-            f'(query "favorite color") '
-            f'(send "Your favorite color is {secret_color}.")',
+            [
+                ("query", { "content": "favorite color" }),
+                ("send", { "content": f"Your favorite color is {secret_color}." }),
+            ],
         )
         tg_send_prompt(tg, recall_prompt)
         c.ok("irc-recall", f"run-id={recall_id}")
diff --git a/Autotests/mock_websocket/test_create_file_ws_mock.py b/Autotests/mock_websocket/test_create_file_ws_mock.py
index 90a8e7c44..bea31b9c0 100644
--- a/Autotests/mock_websocket/test_create_file_ws_mock.py
+++ b/Autotests/mock_websocket/test_create_file_ws_mock.py
@@ -37,7 +37,10 @@ def test_hello_file_ws_mock(llm, ws):
             f"Please overwrite {TARGET_FILE} so it contains exactly the single "
             "word Hello (no quotes, no extra newlines, create the directory if needed).",
         )
-        llm.set_answer(prompt, f'(shell "mkdir -p /tmp/testcat") (write-file "/tmp/testcat/hello.txt" "Hello")')
+        llm.set_answer(prompt, [
+            ("shell", { "cmd": "mkdir -p /tmp/testcat" }),
+            ("write-file", { "filename": "/tmp/testcat/hello.txt", "content": "Hello" }),
+        ])
 
         ws_send_prompt(ws, prompt)
         c.ok("websocket", f"prompt delivered, run-id={c.run_id}")
diff --git a/Autotests/mock_websocket/test_memory_chromadb_ws_mock.py b/Autotests/mock_websocket/test_memory_chromadb_ws_mock.py
index bbf20cea4..a9ba297c1 100644
--- a/Autotests/mock_websocket/test_memory_chromadb_ws_mock.py
+++ b/Autotests/mock_websocket/test_memory_chromadb_ws_mock.py
@@ -61,7 +61,7 @@ def test_memory_chromadb_ws_mock(llm, ws):
         )
         llm.set_answer(
             prompt,
-            f'(remember "Unique smoke marker {marker} was emitted by CI.")',
+            [("remember", { "content": f"Unique smoke marker {marker} was emitted by CI." })],
         )
         ws_send_prompt(ws, prompt)
         c.ok("websocket", f"run-id={c.run_id}")
diff --git a/Autotests/mock_websocket/test_ws_delivery_ws_mock.py b/Autotests/mock_websocket/test_ws_delivery_ws_mock.py
index db20314e4..2bfb95368 100644
--- a/Autotests/mock_websocket/test_ws_delivery_ws_mock.py
+++ b/Autotests/mock_websocket/test_ws_delivery_ws_mock.py
@@ -46,7 +46,7 @@ def test_ws_delivery_ws_mock(llm, ws):
         c.step("register answer and inject user_message")
         answer = f"WS-PONG-{c.run_id}"
         prompt = make_prompt(c.run_id, f"Reply with exactly this token using the send skill: {answer}")
-        llm.set_answer(prompt, f'(send "{answer}")')
+        llm.set_answer(prompt, [("send", { "content": f"{answer}" })])
         ws_send_prompt(ws, prompt)
         c.ok("injected", f"run-id={c.run_id}")
 
diff --git a/Autotests/mock_websocket/test_ws_frame_robustness_ws_mock.py b/Autotests/mock_websocket/test_ws_frame_robustness_ws_mock.py
index 3639ad2f7..d09991e60 100644
--- a/Autotests/mock_websocket/test_ws_frame_robustness_ws_mock.py
+++ b/Autotests/mock_websocket/test_ws_frame_robustness_ws_mock.py
@@ -52,7 +52,7 @@ def test_ws_frame_robustness_ws_mock(llm, ws):
         c.step("a following valid prompt is answered")
         answer = f"WS-ALIVE-{c.run_id}"
         prompt = make_prompt(c.run_id, f"Reply with the send skill: {answer}")
-        llm.set_answer(prompt, f'(send "{answer}")')
+        llm.set_answer(prompt, [("send", { "content": f"{answer}" })])
         ws.inject_user_message(prompt)
         client_seq, text = _wait_for_reply(ws, answer, WAIT)
         if text is None:
diff --git a/Autotests/mock_websocket/test_ws_outbox_flush_ws_mock.py b/Autotests/mock_websocket/test_ws_outbox_flush_ws_mock.py
index 927c9bfba..c30429275 100644
--- a/Autotests/mock_websocket/test_ws_outbox_flush_ws_mock.py
+++ b/Autotests/mock_websocket/test_ws_outbox_flush_ws_mock.py
@@ -31,7 +31,7 @@ def test_ws_outbox_flush_ws_mock(llm, ws):
         c.step("deliver prompt, then drop and refuse reconnects while the agent replies")
         answer = f"WS-BUFFERED-{c.run_id}"
         prompt = make_prompt(c.run_id, f"Reply with the send skill: {answer}")
-        llm.set_answer(prompt, f'(send "{answer}")')
+        llm.set_answer(prompt, [("send", { "content": f"{answer}" })])
         ws.inject_user_message(prompt)
         ws.block_connections()
         c.ok("dropped", "connection dropped, reconnects blocked")
diff --git a/Autotests/mock_websocket/test_ws_queue_merge_ws_mock.py b/Autotests/mock_websocket/test_ws_queue_merge_ws_mock.py
index e04483e53..90c95d6b4 100644
--- a/Autotests/mock_websocket/test_ws_queue_merge_ws_mock.py
+++ b/Autotests/mock_websocket/test_ws_queue_merge_ws_mock.py
@@ -40,7 +40,7 @@ def test_ws_queue_merge_ws_mock(llm, ws):
         p2 = make_prompt(c.run_id, "fragment BRAVO")
         p3 = make_prompt(c.run_id, "fragment CHARLIE")
         joined = " | ".join([p1, p2, p3])
-        llm.set_answer(joined, f'(send "{answer}")')
+        llm.set_answer(joined, [("send", { "content": f"{answer}" })])
         s1 = ws.inject_user_message(p1)
         s2 = ws.inject_user_message(p2)
         s3 = ws.inject_user_message(p3)
diff --git a/Autotests/mock_websocket/test_ws_resume_dedup_ws_mock.py b/Autotests/mock_websocket/test_ws_resume_dedup_ws_mock.py
index 4c241dfee..f44826942 100644
--- a/Autotests/mock_websocket/test_ws_resume_dedup_ws_mock.py
+++ b/Autotests/mock_websocket/test_ws_resume_dedup_ws_mock.py
@@ -41,7 +41,7 @@ def test_ws_resume_dedup_ws_mock(llm, ws):
         c.step("deliver one prompt and get the single reply")
         answer = f"WS-ONCE-{c.run_id}"
         prompt = make_prompt(c.run_id, f"Reply once with the send skill: {answer}")
-        llm.set_answer(prompt, f'(send "{answer}")')
+        llm.set_answer(prompt, [("send", { "content": f"{answer}" })])
         seq = ws.inject_user_message(prompt)
         client_seq, text = _wait_for_reply(ws, answer, WAIT)
         if text is None:
@@ -52,7 +52,7 @@ def test_ws_resume_dedup_ws_mock(llm, ws):
         c.step("register a distinct answer for a poisoned replay at the seen seq")
         poison = f"WS-POISON-{c.run_id}"
         poison_prompt = make_prompt(c.run_id, f"Poisoned replay must be dropped: {poison}")
-        llm.set_answer(poison_prompt, f'(send "{poison}")')
+        llm.set_answer(poison_prompt, [("send", { "content": f"{poison}" })])
         c.ok("poison registered")
 
         c.step("force reconnect; agent must resume with the advanced last_seen_seq")