@cxyhhhhh/openclaw-qqbot 2.0.0-dev.202607082305 → 2.0.0-dev.202607091556

package/dist/index.cjs

@@ -4819,7 +4819,7 @@ function evaluateMatchedGroupAccessForPolicy(params) {
   return { allowed: true, groupPolicy: params.groupPolicy, reason: "allowed" };
 }
 var DEFAULT_GROUP_POLICY = "open";
-var DEFAULT_GROUP_HISTORY_LIMIT = 50;
+var DEFAULT_GROUP_HISTORY_LIMIT = 20;
 var DEFAULT_GROUP_CONFIG = {
   requireMention: true,
   ignoreOtherMentions: false,
@@ -9093,7 +9093,7 @@ var import_node_path2 = __toESM(require("path"), 1);
 var import_node_fs2 = __toESM(require("fs"), 1);
 var _cachedOpenclawVersion;
 function getPackageVersion() {
-  return true ? "2.0.0-dev.202607082305" : "unknown";
+  return true ? "2.0.0-dev.202607091556" : "unknown";
 }
 function getOpenclawVersion(runtimeVersion) {
   if (_cachedOpenclawVersion) return _cachedOpenclawVersion;
@@ -9541,11 +9541,15 @@ function resolveRuntimeAdapters(rt, log4) {
   ]);
   const rawFinalizeContext = !rawBuildContext ? probeFunction(rt, [["channel", "reply", "finalizeInboundContext"]]) : null;
   const buildInboundContext = rawBuildContext ? (params) => rawBuildContext(params) : rawFinalizeContext ? (params) => {
+    const isCommand = params.access?.commands?.authorized ?? false;
     const rawCtx = {
       Body: params.message.body,
       BodyForAgent: params.message.bodyForAgent,
       RawBody: params.message.rawBody,
       CommandBody: params.message.commandBody ?? params.message.rawBody,
+      CommandSource: isCommand ? "text" : void 0,
+      CommandTurn: params.command ?? void 0,
+      CommandAuthorized: isCommand,
       From: params.from,
       To: params.reply.to,
       SessionKey: params.route.routeSessionKey,
@@ -9560,7 +9564,6 @@ function resolveRuntimeAdapters(rt, log4) {
       Timestamp: params.timestamp ?? Date.now(),
       OriginatingChannel: params.channel,
       OriginatingTo: params.reply.originatingTo ?? params.reply.to,
-      CommandAuthorized: false,
       ...params.extra
     };
     return rawFinalizeContext(rawCtx);
@@ -11712,10 +11715,13 @@ async function downloadMediaFile(url, filename, log4) {
 // src/dispatch/body-assembler.ts
 var QUOTE_BEGIN = "[Quoted message begins]";
 var QUOTE_END = "[Quoted message ends]";
-var HISTORY_CTX_START = "[Chat messages since your last reply \u2014 CONTEXT ONLY]";
-var HISTORY_CTX_END = "[CURRENT MESSAGE \u2014 reply to this]";
-var MERGE_CTX_START = "[Merged messages \u2014 CONTEXT ONLY]";
-var MERGE_CTX_END = "[CURRENT MESSAGE \u2014 reply to this one]";
+var REF_BEGIN = "[Reference message begins]";
+var REF_END = "[Reference message ends]";
+var HISTORY_BEGIN = "[Chat history begins]";
+var HISTORY_END = "[Chat history ends]";
+var MERGE_CTX_BEGIN = "[Merged messages begins]";
+var MERGE_CTX_END = "[Merged messages ends]";
+var CURRENT_MSG = "[Current message]";
 function assembleBody(ctx, msg, account, getRuntime) {
   const rawBody = msg.content ?? "";
   const isGroup = msg.kind === "group";
@@ -11728,7 +11734,7 @@ function assembleBody(ctx, msg, account, getRuntime) {
   const userContent = buildUserContent(ctx.message.content ?? "", processed);
   const quotePart = buildQuotePart(quote);
   const userMessage = mergedMessages && mergedMessages.length > 0 ? buildMergedUserMessage({ messages: mergedMessages, quotePart, isGroup, wasMentioned, getRuntime }) : buildUserMessage({ msg, userContent, quotePart, isGroup, wasMentioned });
-  const dynamicCtx = buildDynamicCtx(processed);
+  const dynamicCtx = buildDynamicCtx(processed, msg, quote);
   const agentBody = buildAgentBody({
     userContent,
     base: dynamicCtx + userMessage,
@@ -11754,12 +11760,11 @@ ${voiceText}` : voiceText) + attachmentInfo;
 }
 function buildQuotePart(quote) {
   if (!quote) return "";
-  const sender = quote.entry?.senderName ? `${quote.entry.senderName} (${quote.entry.senderId})` : "";
-  const senderLine = sender ? `${sender}: ` : "";
   const text = quote.text || "Original content unavailable";
   return `${QUOTE_BEGIN}
-${senderLine}${text}
+${text}
 ${QUOTE_END}
+${CURRENT_MSG}
 `;
 }
 function buildUserMessage(input) {
@@ -11767,7 +11772,7 @@ function buildUserMessage(input) {
   const atYouTag = isGroup && wasMentioned ? " (@you)" : "";
   if (isGroup) {
     const senderLabel = formatSenderLabel(msg.senderName, msg.senderId);
-    return `[${senderLabel}] ${quotePart}${userContent}${atYouTag}`;
+    return `${quotePart}[${senderLabel}] ${userContent}${atYouTag}`;
   }
   return `${quotePart}${userContent}`;
 }
@@ -11793,7 +11798,7 @@ function buildMergedUserMessage(input) {
     return lines.join("\n");
   }
   const last = lines.pop();
-  return [MERGE_CTX_START, ...lines, MERGE_CTX_END, last].join("\n");
+  return [MERGE_CTX_BEGIN, ...lines, MERGE_CTX_END, CURRENT_MSG, last].join("\n");
 }
 function formatMergedLine(ctx, opts) {
   const m3 = ctx.message;
@@ -11814,13 +11819,12 @@ function allSameSender(messages) {
   const first = messages[0]?.message.senderId;
   return messages.every((c) => c.message.senderId === first);
 }
-function buildDynamicCtx(processed) {
-  if (!processed) return "";
+function buildDynamicCtx(processed, msg, quote) {
   const lines = [];
-  if (processed.imageUrls.length > 0) {
+  if (processed?.imageUrls.length) {
     lines.push(`- Images: ${processed.imageUrls.join(", ")}`);
   }
-  const transcripts = processed.transcripts ?? [];
+  const transcripts = processed?.transcripts ?? [];
   const voiceRefs = unique([
     ...transcripts.map((t) => t.localPath).filter(isNonEmpty),
     ...transcripts.map((t) => t.remoteUrl).filter(isNonEmpty)
@@ -11834,10 +11838,35 @@ function buildDynamicCtx(processed) {
   if (asrTexts.length > 0) {
     lines.push(`- ASR: ${asrTexts.join(" | ")}`);
   }
+  if (!quote) {
+    const elementsCtx = buildMsgElementsContext(msg);
+    if (elementsCtx.length > 0) {
+      lines.push(REF_BEGIN, ...elementsCtx, REF_END);
+    }
+  }
   return lines.length > 0 ? `${lines.join("\n")}
 
 ` : "";
 }
+function buildMsgElementsContext(msg) {
+  const elements = msg.msgElements;
+  if (!elements || elements.length === 0) return [];
+  const lines = [];
+  let index = 0;
+  for (const el of elements) {
+    const content = el.content?.trim();
+    if (!content) continue;
+    index += 1;
+    const author = el.author;
+    const sender = author?.username ?? "\u672A\u77E5";
+    lines.push(
+      `=== \u6D88\u606F ${index} ===`,
+      `[\u6D88\u606F\u5185\u5BB9] ${content}`,
+      `[\u53D1\u9001\u8005] ${sender}`
+    );
+  }
+  return lines;
+}
 function unique(arr) {
   return [...new Set(arr)];
 }
@@ -11854,7 +11883,7 @@ function buildAgentBody(input) {
       const label = formatSenderLabel(h2.senderName, h2.senderId);
       return `[${label}] ${h2.content}`;
     }).join("\n");
-    return [HISTORY_CTX_START, historyText, "", HISTORY_CTX_END, base].join("\n");
+    return [HISTORY_BEGIN, historyText, "", HISTORY_END, CURRENT_MSG, base].join("\n");
   }
   return base;
 }
@@ -11921,8 +11950,11 @@ function getHistoryStore() {
   if (!_store) _store = new MemoryHistoryStore();
   return _store;
 }
-function clearGroupHistory(groupId) {
-  _store?.clear?.(groupId);
+function historyGroupKey(accountId, groupId) {
+  return `${accountId}:${groupId}`;
+}
+function clearGroupHistory(accountId, groupId) {
+  _store?.clear?.(historyGroupKey(accountId, groupId));
 }
 
 // src/middleware/access-control.ts
@@ -12015,6 +12047,14 @@ function setupMiddlewares(bot, account, opts) {
   bot.use(errorHandler());
   bot.use(messageFilter({ skipSelfEcho: false }));
   bot.use(createPolicyInjector(account));
+  bot.use(historyBuffer({
+    store: getHistoryStore(),
+    groupKey: (ctx) => {
+      const gid = ctx.message.groupOpenid;
+      if (ctx.message.kind !== "group" || !gid) return void 0;
+      return historyGroupKey(account.accountId, gid);
+    }
+  }));
   bot.use(dynamicAccessControl({
     accountId: account.accountId,
     getRuntime: opts.getRuntime
@@ -12041,7 +12081,6 @@ function setupMiddlewares(bot, account, opts) {
   bot.use(quoteRef({
     store: getPersistedRefIndexStore(account.accountId)
   }));
-  bot.use(historyBuffer({ store: getHistoryStore() }));
   bot.use(attachmentProcessor({ getRuntime: opts.getRuntime }));
   bot.use(envelopeFormatter({
     format: (ctx) => {
@@ -12209,6 +12248,77 @@ async function handleVoiceIntent(text, ctx) {
   }
 }
 
+// src/dispatch/ctx-builder.ts
+function buildCtxPayload(params) {
+  const { assembled, envelope, route, msg, ctx, adapters } = params;
+  const isSlashCommand = /^\//.test(assembled.rawBody ?? "");
+  const convKind = envelope.chatScope === "group" ? "group" : "direct";
+  const peerId = convKind === "group" ? envelope.groupId ?? envelope.senderId : envelope.senderId;
+  const groupId = convKind === "group" ? envelope.groupId : void 0;
+  const processed = ctx.state.processedAttachments;
+  const voicePaths = processed?.localMediaPaths?.filter((_2, i) => processed.localMediaTypes?.[i]?.startsWith("audio/")) ?? [];
+  const voiceUrls = processed?.remoteMediaUrls?.filter((_2, i) => processed.remoteMediaUrls?.[i]?.startsWith?.("audio/")) ?? [];
+  const msgTimestamp = msg.timestamp ?? msg.Timestamp;
+  return adapters.buildInboundContext?.({
+    channel: "qqbot",
+    accountId: route.accountId,
+    provider: "qqbot",
+    surface: "qqbot",
+    messageId: envelope.messageId,
+    timestamp: msgTimestamp ? new Date(msgTimestamp).getTime() : Date.now(),
+    from: envelope.targetId,
+    sender: { id: envelope.senderId, name: envelope.senderName },
+    conversation: {
+      kind: convKind,
+      id: peerId,
+      label: assembled.systemPrompt
+    },
+    message: {
+      body: assembled.webBody,
+      bodyForAgent: assembled.agentBody,
+      rawBody: assembled.rawBody,
+      commandBody: assembled.rawBody
+    },
+    route: {
+      agentId: route.agentId ?? "default",
+      routeSessionKey: route.sessionKey,
+      accountId: route.accountId
+    },
+    reply: {
+      to: envelope.targetId,
+      replyToId: envelope.messageId,
+      originatingTo: envelope.targetId
+    },
+    access: {
+      commands: { authorized: isSlashCommand }
+    },
+    command: isSlashCommand ? { kind: "text-slash", body: assembled.rawBody, authorized: true } : void 0,
+    media: voicePaths.length > 0 ? voicePaths.map((p2, i) => ({
+      contentType: processed?.localMediaTypes?.[i] ?? "audio/silk",
+      localPath: p2,
+      url: voiceUrls[i]
+    })) : voiceUrls.length > 0 ? voiceUrls.map((u2) => ({ contentType: "audio/wav", url: u2 })) : void 0,
+    supplemental: {
+      quote: envelope.quote ? { id: envelope.messageId, body: envelope.quote.content, sender: envelope.quote.senderId } : void 0,
+      groupSystemPrompt: envelope.systemPrompt
+    },
+    extra: {
+      ...isSlashCommand ? { CommandSource: "text" } : {},
+      ...groupId ? { QQGroupOpenid: groupId } : {},
+      ...processed?.localMediaPaths?.length ? {
+        MediaPaths: processed.localMediaPaths,
+        MediaPath: processed.localMediaPaths[0],
+        MediaTypes: processed.localMediaTypes,
+        MediaType: processed.localMediaTypes?.[0]
+      } : {},
+      ...processed?.remoteMediaUrls?.length ? {
+        MediaUrls: processed.remoteMediaUrls,
+        MediaUrl: processed.remoteMediaUrls[0]
+      } : {}
+    }
+  });
+}
+
 // src/outbound/debounce.ts
 var DEFAULT_WINDOW_MS = 1500;
 var DEFAULT_MAX_WAIT_MS = 8e3;
@@ -12446,46 +12556,7 @@ async function dispatchToOpenClaw(ctx, msg, account, runtime2, log4) {
   const qualifiedTarget = envelope.targetId;
   const agentId = route.agentId ?? "default";
   const storePath = adapters.resolveStorePath?.(cfg?.session?.store, { agentId }) ?? "";
-  const ctxPayload = adapters.buildInboundContext?.({
-    channel: "qqbot",
-    accountId: route.accountId,
-    provider: "qqbot",
-    surface: "qqbot",
-    messageId: envelope.messageId,
-    timestamp: Date.now(),
-    from: envelope.targetId,
-    sender: { id: envelope.senderId, name: envelope.senderName },
-    conversation: {
-      kind: envelope.chatScope === "group" ? "group" : "direct",
-      label: assembled.systemPrompt
-    },
-    message: {
-      body: assembled.webBody,
-      bodyForAgent: assembled.agentBody,
-      rawBody: assembled.rawBody,
-      commandBody: assembled.rawBody
-    },
-    route: {
-      routeSessionKey: route.sessionKey,
-      accountId: route.accountId
-    },
-    reply: {
-      to: envelope.targetId,
-      replyToId: envelope.messageId,
-      originatingTo: envelope.targetId
-    }
-  });
-  const processed = ctx.state.processedAttachments;
-  if (processed?.localMediaPaths?.length) {
-    ctxPayload.MediaPaths = processed.localMediaPaths;
-    ctxPayload.MediaPath = processed.localMediaPaths[0];
-    ctxPayload.MediaTypes = processed.localMediaTypes;
-    ctxPayload.MediaType = processed.localMediaTypes?.[0];
-  }
-  if (processed?.remoteMediaUrls?.length) {
-    ctxPayload.MediaUrls = processed.remoteMediaUrls;
-    ctxPayload.MediaUrl = processed.remoteMediaUrls[0];
-  }
+  const ctxPayload = buildCtxPayload({ assembled, envelope, route, msg, ctx, adapters });
   const ttsRuntime = runtime2?.tts ?? runtime2?.channel?.runtimeContexts?.get?.("tts");
   const debounceConfig = account.config?.deliverDebounce;
   const debouncer = debounceConfig?.enabled !== false ? new DeliverDebouncer(
@@ -12679,7 +12750,7 @@ async function dispatchToOpenClaw(ctx, msg, account, runtime2, log4) {
   }
   dlog?.debug(`inboundRun completed sessionKey=${route.sessionKey}`);
   if (envelope.chatScope === "group") {
-    clearGroupHistory(envelope.groupId ?? envelope.senderId);
+    clearGroupHistory(account.accountId, envelope.groupId ?? envelope.senderId);
   }
   if (streamingController && !streamingController.isTerminal) {
     await streamingController.finalize();