@53ai/53ai-openclaw 1.0.6 → 1.0.8

package/dist/index.esm.js

@@ -310,7 +310,7 @@ function parseMessageContent(msg) {
 }
 
 async function sendReply(params) {
-    const { wsClient, text, toChatId, replyToMsgId, runtime, finish, streamId, isError, errorCode, errorDetails } = params;
+    const { wsClient, text, toChatId, replyToMsgId, runtime, finish, streamId, isError, errorCode, errorDetails, isThinking } = params;
     const reqId = replyToMsgId || streamId;
     runtime.log?.(`[53aihub] sendReply START: reqId=${reqId}, finish=${finish}, isError=${isError}, textLen=${text?.length || 0}, wsReadyState=${wsClient.readyState}`);
     if (wsClient.readyState !== 1) {
@@ -371,7 +371,7 @@ async function sendReply(params) {
     const payload = {
         req_id: reqId,
         action: "chat",
-        status: finish ? "done" : "streaming",
+        status: finish ? "done" : isThinking ? "thinking" : "streaming",
         data: chunk,
     };
     const jsonStr = JSON.stringify(payload);
@@ -949,7 +949,6 @@ async function processMessage(params) {
             cfg: config,
             dispatcherOptions: {
                 deliver: async (payload, info) => {
-                    state.accumulatedText += payload.text;
                     runtime.log?.(`[53aihub] deliver: kind=${info.kind}, textLen=${payload.text?.length || 0}, accumulatedLen=${state.accumulatedText.length}, isError=${payload.isError}`);
                     if (payload.isError) {
                         const errorMsg = payload.text || "Unknown error";
@@ -969,6 +968,23 @@ async function processMessage(params) {
                         });
                         return;
                     }
+                    const isCompaction = payload.text?.startsWith("🧹 Compacting context") ||
+                        state.accumulatedText.startsWith("🧹 Compacting context");
+                    if (isCompaction && info.kind !== "final") {
+                        runtime.log?.(`[53aihub] deliver COMPACTION: text preview=${payload.text?.substring(0, 50)}...`);
+                        await sendReply({
+                            wsClient,
+                            text: payload.text || "",
+                            toChatId: chatId,
+                            replyToMsgId: body.msgId,
+                            runtime,
+                            finish: false,
+                            streamId: state.streamId,
+                            isThinking: true,
+                        });
+                        return;
+                    }
+                    state.accumulatedText += payload.text;
                     if (info.kind !== "final") {
                         runtime.log?.(`[53aihub] deliver STREAMING: accumulatedText preview=${state.accumulatedText.substring(0, 50)}...`);
                         await sendReply({
@@ -1084,7 +1100,7 @@ async function monitorProvider(options) {
             if (isAborted)
                 return;
             // 安全: 不在 URL 中传递敏感信息，仅通过 headers 传递认证
-            const wsUrl = account.websocketUrl;
+            const wsUrl = account.WSUrl;
             const botId = account.botId || account.config.botId;
             const secret = account.secret || account.token || account.config.secret || account.config.token;
             // 日志输出时隐藏敏感信息
@@ -1183,7 +1199,7 @@ function resolveAccount(cfg, accountId = DEFAULT_ACCOUNT_ID) {
         accountId,
         name: config.name ?? "53AIHub",
         enabled: config.enabled !== false,
-        websocketUrl: config.websocketUrl || DEFAULT_WS_URL,
+        WSUrl: config.WSUrl || DEFAULT_WS_URL,
         botId: config.botId ?? config.userId ?? "",
         secret: config.secret ?? config.token ?? "",
         token: config.token ?? config.secret ?? "",
@@ -1204,8 +1220,8 @@ function setAccount(cfg, account) {
         allowFrom: account.allowFrom ?? existing.allowFrom,
         accessPolicy: account.accessPolicy ?? existing.accessPolicy,
         sendThinkingMessage: account.sendThinkingMessage ?? existing.sendThinkingMessage,
-        ...(account.websocketUrl || existing.websocketUrl
-            ? { websocketUrl: account.websocketUrl ?? existing.websocketUrl }
+        ...(account.WSUrl || existing.WSUrl
+            ? { WSUrl: account.WSUrl ?? existing.WSUrl }
             : {}),
         ...(account.name || existing.name
             ? { name: account.name ?? existing.name }
@@ -1243,10 +1259,10 @@ async function promptSecret(prompter, account) {
         validate: (value) => (value?.trim() ? undefined : "必填"),
     })).trim();
 }
-async function promptWebsocketUrl(prompter, account) {
+async function promptWSUrl(prompter, account) {
     return String(await prompter.text({
         message: "WebSocket URL (例如: ws://localhost:8080/ws)",
-        initialValue: account?.websocketUrl ?? "",
+        initialValue: account?.WSUrl ?? "",
         validate: (value) => {
             const trimmed = value?.trim();
             if (!trimmed)
@@ -1316,11 +1332,11 @@ const aiHubOnboardingAdapter = {
         }
         const botId = await promptBotId(prompter, account);
         const secret = await promptSecret(prompter, account);
-        const websocketUrl = await promptWebsocketUrl(prompter, account);
+        const WSUrl = await promptWSUrl(prompter, account);
         const cfgWithAccount = setAccount(cfg, {
             botId,
             secret,
-            websocketUrl: websocketUrl || undefined,
+            WSUrl: WSUrl || undefined,
             enabled: true,
             accessPolicy: account.config.accessPolicy ?? "open",
             allowFrom: account.config.allowFrom ?? [],
@@ -1399,7 +1415,7 @@ const aiHubPlugin = {
             enabled: account.enabled,
             configured: Boolean(account.botId?.trim() || account.token?.trim()),
             botId: account.botId,
-            websocketUrl: account.websocketUrl,
+            WSUrl: account.WSUrl,
             accessPolicy: account.config.accessPolicy ?? "open",
         }),
         resolveAllowFrom: ({ cfg }) => {
@@ -1568,6 +1584,67 @@ const aiHubPlugin = {
     },
 };
 
+const compactionSessions = new Map();
+/**
+ * 从 sessionKey 中解析 chatId
+ * sessionKey 格式: agent:{agentId}:{channel}:direct:{chatId}
+ * 例如: agent:main:53aihub:direct:user123 -> user123
+ */
+function parseChatIdFromSessionKey(sessionKey) {
+    if (!sessionKey)
+        return null;
+    const parts = sessionKey.split(":");
+    // 格式: agent:{agentId}:{channel}:direct:{chatId}
+    // parts: [0]agent, [1]agentId, [2]channel, [3]direct, [4]chatId
+    if (parts.length >= 5 && parts[2] === CHANNEL_ID && parts[3] === "direct") {
+        return parts[4];
+    }
+    return null;
+}
+async function handleBeforeCompaction(event, ctx) {
+    const runtime = getRuntime();
+    const logger = runtime.logging.getChildLogger({ component: "53aihub-compaction" });
+    const log = (msg) => logger.info(msg);
+    log(`before_compaction: sessionKey=${ctx.sessionKey}, channelId=${ctx.channelId}, messageCount=${event.messageCount}`);
+    const sessionKey = ctx.sessionKey || "";
+    if (!sessionKey.startsWith(`${CHANNEL_ID}:`) && !sessionKey.includes(`:${CHANNEL_ID}:`)) {
+        log(`Skipping compaction hook for non-53aihub session: ${sessionKey}`);
+        return;
+    }
+    const chatId = parseChatIdFromSessionKey(sessionKey);
+    if (!chatId) {
+        logger.error(`Cannot parse chatId from sessionKey: ${sessionKey}`);
+        return;
+    }
+    compactionSessions.set(sessionKey, {
+        startTime: Date.now(),
+        messageCount: event.messageCount,
+    });
+    log(`Compaction started for chatId=${chatId}`);
+}
+async function handleAfterCompaction(event, ctx) {
+    const runtime = getRuntime();
+    const logger = runtime.logging.getChildLogger({ component: "53aihub-compaction" });
+    const log = (msg) => logger.info(msg);
+    log(`after_compaction: sessionKey=${ctx.sessionKey}, channelId=${ctx.channelId}, messageCount=${event.messageCount}, compactedCount=${event.compactedCount}`);
+    const sessionKey = ctx.sessionKey || "";
+    if (!sessionKey.startsWith(`${CHANNEL_ID}:`) && !sessionKey.includes(`:${CHANNEL_ID}:`)) {
+        log(`Skipping compaction hook for non-53aihub session: ${sessionKey}`);
+        return;
+    }
+    const chatId = parseChatIdFromSessionKey(sessionKey);
+    if (!chatId) {
+        logger.error(`Cannot parse chatId from sessionKey: ${sessionKey}`);
+        return;
+    }
+    const sessionInfo = compactionSessions.get(sessionKey);
+    compactionSessions.delete(sessionKey);
+    if (sessionInfo) {
+        const duration = Date.now() - sessionInfo.startTime;
+        log(`Compaction completed: chatId=${chatId}, duration=${duration}ms, messagesBefore=${sessionInfo.messageCount}, messagesAfter=${event.messageCount}, compacted=${event.compactedCount}`);
+    }
+}
+
 const plugin = {
     id: "53ai-openclaw",
     name: "53AI OpenClaw",
@@ -1576,6 +1653,8 @@ const plugin = {
     register(api) {
         setRuntime(api.runtime);
         api.registerChannel({ plugin: aiHubPlugin });
+        api.on("before_compaction", handleBeforeCompaction);
+        api.on("after_compaction", handleAfterCompaction);
     },
 };