diff --git a/src/agents/openclaw-tools.subagents.sessions-spawn.allowlist.test.ts b/src/agents/openclaw-tools.subagents.sessions-spawn.allowlist.test.ts
index 9989b784922..83597ed31f6 100644
--- a/src/agents/openclaw-tools.subagents.sessions-spawn.allowlist.test.ts
+++ b/src/agents/openclaw-tools.subagents.sessions-spawn.allowlist.test.ts
@@ -63,7 +63,7 @@ async function spawn(params: {
     },
     {
       agentSessionKey: params.requesterSessionKey ?? "main",
-      agentChannel: params.requesterChannel ?? "whatsapp",
+      agentChannel: params.requesterChannel ?? "mobilechat",
     },
   );
 }
diff --git a/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.context-engine.test.ts b/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.context-engine.test.ts
index 4cd179894bc..bf3365f1f2d 100644
--- a/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.context-engine.test.ts
+++ b/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.context-engine.test.ts
@@ -111,7 +111,7 @@ async function finalizeTurn(
 }
 
 describe("runEmbeddedAttempt context engine sessionKey forwarding", () => {
-  const sessionKey = "agent:main:discord:channel:test-ctx-engine";
+  const sessionKey = "agent:main:guildchat:channel:test-ctx-engine";
   const tempPaths: string[] = [];
   beforeEach(() => {
     resetEmbeddedAttemptHarness();
diff --git a/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.context-injection.test.ts b/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.context-injection.test.ts
index 18e65c7778f..b58112e25ba 100644
--- a/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.context-injection.test.ts
+++ b/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.context-injection.test.ts
@@ -204,7 +204,7 @@ describe("embedded attempt context injection", () => {
         assemble,
       } satisfies AttemptContextEngine,
       sessionId: "session",
-      sessionKey: "agent:main:discord:dm:test-user",
+      sessionKey: "agent:main:guildchat:dm:test-user",
       messages: limited,
       modelId: "gpt-test",
     });
diff --git a/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.resource-loader.test.ts b/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.resource-loader.test.ts
index cda4d3d7d80..e6166cd9a3c 100644
--- a/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.resource-loader.test.ts
+++ b/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.resource-loader.test.ts
@@ -21,7 +21,7 @@ describe("runEmbeddedAttempt resource loader wiring", () => {
 
   it("passes an explicit resourceLoader to createAgentSession even without extension factories", async () => {
     await createContextEngineAttemptRunner({
-      sessionKey: "agent:main:discord:dm:test-resource-loader",
+      sessionKey: "agent:main:guildchat:dm:test-resource-loader",
       tempPaths,
       contextEngine: {
         assemble: async ({ messages }) => ({
diff --git a/src/agents/pi-tools.message-provider-policy.test.ts b/src/agents/pi-tools.message-provider-policy.test.ts
index fb6b86a55d1..9b921498c78 100644
--- a/src/agents/pi-tools.message-provider-policy.test.ts
+++ b/src/agents/pi-tools.message-provider-policy.test.ts
@@ -13,7 +13,7 @@ describe("createOpenClawCodingTools message provider policy", () => {
   );
 
   it("keeps tts tool for non-voice providers", () => {
-    const names = new Set(filterToolNamesByMessageProvider(DEFAULT_TOOL_NAMES, "discord"));
+    const names = new Set(filterToolNamesByMessageProvider(DEFAULT_TOOL_NAMES, "guildchat"));
     expect(names.has("tts")).toBe(true);
   });
 });
diff --git a/src/agents/sandbox-explain.test.ts b/src/agents/sandbox-explain.test.ts
index 098ed587555..186f00a0762 100644
--- a/src/agents/sandbox-explain.test.ts
+++ b/src/agents/sandbox-explain.test.ts
@@ -104,7 +104,7 @@ describe("sandbox explain helpers", () => {
 
     const msg = formatSandboxToolPolicyBlockedMessage({
       cfg,
-      sessionKey: "agent:main:whatsapp:group:g1",
+      sessionKey: "agent:main:mobilechat:group:g1",
       toolName: "browser",
     });
     expect(msg).toBeTruthy();
diff --git a/src/agents/subagent-spawn.model-session.test.ts b/src/agents/subagent-spawn.model-session.test.ts
index 06d0b987ca0..ba6ce71b1e9 100644
--- a/src/agents/subagent-spawn.model-session.test.ts
+++ b/src/agents/subagent-spawn.model-session.test.ts
@@ -75,7 +75,7 @@ describe("spawnSubagentDirect runtime model persistence", () => {
       },
       {
         agentSessionKey: "agent:main:main",
-        agentChannel: "discord",
+        agentChannel: "guildchat",
       },
     );