From af2c7fc17127475a6e1a85e143c08505f9e2a5b5 Mon Sep 17 00:00:00 2001
From: gaohongxiang <33713367+gaohongxiang@users.noreply.github.com>
Date: Wed, 18 Mar 2026 09:39:05 +0000
Subject: [PATCH] test: drop unrelated branch carryover

---
 extensions/discord/src/monitor/exec-approvals.test.ts     | 8 +-------
 .../src/bot-message-context.topic-agentid.test.ts         | 6 ++----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/extensions/discord/src/monitor/exec-approvals.test.ts b/extensions/discord/src/monitor/exec-approvals.test.ts
index 135a418822c..be3ead1d400 100644
--- a/extensions/discord/src/monitor/exec-approvals.test.ts
+++ b/extensions/discord/src/monitor/exec-approvals.test.ts
@@ -714,8 +714,6 @@ describe("DiscordExecApprovalHandler target config", () => {
 
 describe("DiscordExecApprovalHandler gateway auth", () => {
   it("passes the shared gateway token from config into GatewayClient", async () => {
-    vi.stubEnv("OPENCLAW_GATEWAY_TOKEN", undefined);
-    vi.stubEnv("CLAWDBOT_GATEWAY_TOKEN", undefined);
     const handler = new DiscordExecApprovalHandler({
       token: "discord-bot-token",
       accountId: "default",
@@ -729,11 +727,7 @@ describe("DiscordExecApprovalHandler gateway auth", () => {
       },
     });
 
-    try {
-      await handler.start();
-    } finally {
-      vi.unstubAllEnvs();
-    }
+    await handler.start();
 
     expect(gatewayClientStarts).toHaveBeenCalledTimes(1);
     expect(gatewayClientParams[0]).toMatchObject({
diff --git a/extensions/telegram/src/bot-message-context.topic-agentid.test.ts b/extensions/telegram/src/bot-message-context.topic-agentid.test.ts
index f8797de29c3..57c0c8209a0 100644
--- a/extensions/telegram/src/bot-message-context.topic-agentid.test.ts
+++ b/extensions/telegram/src/bot-message-context.topic-agentid.test.ts
@@ -100,7 +100,7 @@ describe("buildTelegramMessageContext per-topic agentId routing", () => {
     expect(ctx?.ctxPayload?.SessionKey).toContain("agent:main:");
   });
 
-  it("falls back to default agent for unknown topic agentId", async () => {
+  it("preserves an unknown topic agentId in the session key", async () => {
     vi.mocked(loadConfig).mockReturnValue({
       agents: {
         list: [{ id: "main", default: true }, { id: "zu" }],
@@ -112,9 +112,7 @@ describe("buildTelegramMessageContext per-topic agentId routing", () => {
     const ctx = await buildForumContext({ topicConfig: { agentId: "ghost" } });
 
     expect(ctx).not.toBeNull();
-    // pickFirstExistingAgentId falls back to the default agent when the
-    // configured agentId does not match any entry in agents.list.
-    expect(ctx?.ctxPayload?.SessionKey).toContain("agent:main:");
+    expect(ctx?.ctxPayload?.SessionKey).toContain("agent:ghost:");
   });
 
   it("routes DM topic to specific agent when agentId is set", async () => {