From 80439b0912b8136eb930d754cd055f89f414a2e4 Mon Sep 17 00:00:00 2001
From: zhi <zhi@dev.hangman-lab.top>
Date: Sat, 28 Feb 2026 19:34:37 +0000
Subject: [PATCH] Revert "Merge pull request 'fix: use systemPrompt instead of
 prependContext for end marker instruction' (#5) from
 fix/moderator-and-system-prompt into feat/turn-based-speaking"

This reverts commit 6a81f75fd021140a222c665ac0ed4b2610c69deb, reversing
changes made to 86fdc63802cb8df0213ef31f141601a031ef925a.
---
 docs/CONFIG.example.json |  3 +--
 plugin/index.ts          | 55 +++-------------------------------------
 2 files changed, 5 insertions(+), 53 deletions(-)

diff --git a/docs/CONFIG.example.json b/docs/CONFIG.example.json
index a18ed96..d14f120 100644
--- a/docs/CONFIG.example.json
+++ b/docs/CONFIG.example.json
@@ -22,8 +22,7 @@
           "debugLogChannelIds": [],
           "discordControlApiBaseUrl": "http://127.0.0.1:8790",
           "discordControlApiToken": "<DISCORD_CONTROL_AUTH_TOKEN>",
-          "discordControlCallerId": "agent-main",
-          "moderatorBotToken": "<MODERATOR_BOT_TOKEN>"
+          "discordControlCallerId": "agent-main"
         }
       }
     }
diff --git a/plugin/index.ts b/plugin/index.ts
index 8bbb6fb..2dd9411 100644
--- a/plugin/index.ts
+++ b/plugin/index.ts
@@ -24,7 +24,6 @@ type DebugConfig = {
 };
 
 const sessionDecision = new Map<string, DecisionRecord>();
-const sessionInjected = new Set<string>(); // Track which sessions have already injected the end marker
 const MAX_SESSION_DECISIONS = 2000;
 const DECISION_TTL_MS = 5 * 60 * 1000;
 function buildEndMarkerInstruction(endSymbols: string[], isGroupChat: boolean): string {
@@ -262,20 +261,8 @@ function resolveDiscordUserId(api: OpenClawPluginApi, accountId: string): string
   const discord = (channels.discord as Record<string, unknown>) || {};
   const accounts = (discord.accounts as Record<string, Record<string, unknown>>) || {};
   const acct = accounts[accountId];
-
-  if (!acct?.token || typeof acct.token !== "string") {
-    api.logger.warn(`whispergate: resolveDiscordUserId failed for accountId=${accountId}: no token found in config`);
-    return undefined;
-  }
-
-  const userId = userIdFromToken(acct.token);
-  if (!userId) {
-    api.logger.warn(`whispergate: resolveDiscordUserId failed for accountId=${accountId}: could not parse userId from token`);
-    return undefined;
-  }
-
-  api.logger.info(`whispergate: resolveDiscordUserId success accountId=${accountId} userId=${userId}`);
-  return userId;
+  if (!acct?.token || typeof acct.token !== "string") return undefined;
+  return userIdFromToken(acct.token);
 }
 
 /** Get the moderator bot's Discord user ID from its token */
@@ -624,27 +611,7 @@ export default {
       // This ensures only the current speaker can respond even for human messages.
       if (derived.channelId) {
         ensureTurnOrder(api, derived.channelId);
-
-        // Try resolveAccountId first, fall back to ctx.accountId if not found
-        let accountId = resolveAccountId(api, ctx.agentId || "");
-
-        // Debug log for turn check
-        if (shouldDebugLog(live, derived.channelId)) {
-          const turnDebug = getTurnDebugInfo(derived.channelId);
-          api.logger.info(
-            `whispergate: turn check preflight agentId=${ctx.agentId ?? "undefined"} ` +
-              `resolvedAccountId=${accountId ?? "undefined"} ` +
-              `ctxAccountId=${ctx.accountId ?? "undefined"} ` +
-              `turnOrderLen=${turnDebug.turnOrder?.length ?? 0} ` +
-              `currentSpeaker=${turnDebug.currentSpeaker ?? "null"}`,
-          );
-        }
-
-        // Fallback to ctx.accountId if resolveAccountId failed
-        if (!accountId && ctx.accountId) {
-          accountId = String(ctx.accountId);
-        }
-
+        const accountId = resolveAccountId(api, ctx.agentId || "");
         if (accountId) {
           const turnCheck = checkTurn(derived.channelId, accountId);
           if (!turnCheck.allowed) {
@@ -736,17 +703,6 @@ export default {
       }
 
       sessionDecision.delete(key);
-
-      // Only inject once per session (one-time injection)
-      if (sessionInjected.has(key)) {
-        if (shouldDebugLog(live, undefined)) {
-          api.logger.info(
-            `whispergate: debug before_prompt_build session=${key} inject skipped (already injected)`,
-          );
-        }
-        return;
-      }
-
       if (!rec.decision.shouldInjectEndMarkerPrompt) {
         if (shouldDebugLog(live, undefined)) {
           api.logger.info(
@@ -770,10 +726,7 @@ export default {
         if (idStr) identity = idStr + "\n\n";
       }
 
-      // Mark session as injected (one-time injection)
-      sessionInjected.add(key);
-
-      api.logger.info(`whispergate: one-time inject end marker for session=${key}, reason=${rec.decision.reason} isGroupChat=${isGroupChat}`);
+      api.logger.info(`whispergate: prepend end marker instruction for session=${key}, reason=${rec.decision.reason} isGroupChat=${isGroupChat}`);
       return { prependContext: identity + instruction };
     });