@newbase-clawchat/openclaw-clawchat 2026.5.12-2 → 2026.5.12-21

package/dist/src/inbound.js

@@ -1,9 +1,7 @@
-import { EVENT, } from "@newbase-clawchat/sdk";
+import { EVENT, } from "./protocol-types.js";
+import { effectiveGroupMode } from "./config.js";
 import { extractMediaFragments, fragmentsToText } from "./message-mapper.js";
 import { hasRenderableText, isInboundMessagePayload } from "./protocol.js";
-const DEDUP_MAX = 256;
-const dedupSeen = [];
-const dedupSet = new Set();
 function normalizeSender(sender) {
     if (!sender || typeof sender !== "object")
         return null;
@@ -12,7 +10,8 @@ function normalizeSender(sender) {
     if (!id)
         return null;
     const nickName = typeof s.nick_name === "string" ? s.nick_name : id;
-    return { id, nickName };
+    const profileType = s.type === "agent" || s.type === "user" ? s.type : null;
+    return { id, nickName, profileType };
 }
 function isStreamDonePayload(payload) {
     if (!payload || typeof payload !== "object")
@@ -39,21 +38,18 @@ function extractMentionIds(fragments) {
         .map((fragment) => fragment.kind === "mention" ? fragment.user_id : undefined)
         .filter((userId) => typeof userId === "string" && userId.length > 0);
 }
-export function _resetDedupForTest() {
-    dedupSeen.length = 0;
-    dedupSet.clear();
-}
-function rememberAndCheck(messageId) {
-    if (dedupSet.has(messageId))
-        return true;
-    dedupSet.add(messageId);
-    dedupSeen.push(messageId);
-    if (dedupSeen.length > DEDUP_MAX) {
-        const evict = dedupSeen.shift();
-        if (evict)
-            dedupSet.delete(evict);
-    }
-    return false;
+function normalizeMentionIds(mentions) {
+    return mentions
+        .map((mention) => {
+        if (typeof mention === "string")
+            return mention;
+        if (mention && typeof mention === "object") {
+            const userId = mention.user_id;
+            return typeof userId === "string" ? userId : undefined;
+        }
+        return undefined;
+    })
+        .filter((userId) => typeof userId === "string" && userId.length > 0);
 }
 /**
  * Exported for direct unit testing. Direct chats always count as addressed;
@@ -62,7 +58,7 @@ function rememberAndCheck(messageId) {
 export function detectMention(params) {
     if (params.chatType === "direct")
         return true;
-    return params.mentions.includes(params.userId);
+    return normalizeMentionIds(params.mentions).includes(params.userId);
 }
 export async function dispatchOpenclawClawlingInbound(params) {
     const { envelope, account, log } = params;
@@ -107,23 +103,21 @@ export async function dispatchOpenclawClawlingInbound(params) {
         log?.info?.(`[${account.accountId}] openclaw-clawchat skip empty msg=${payload.message_id}`);
         return;
     }
-    if (rememberAndCheck(payload.message_id)) {
-        log?.info?.(`[${account.accountId}] openclaw-clawchat skip duplicate msg=${payload.message_id}`);
-        return;
-    }
+    const mentionIds = normalizeMentionIds(message.context.mentions);
     const rawBody = fragmentsToText(message.body.fragments, {
-        mentionFallbackIds: message.context.mentions,
+        mentionFallbackIds: mentionIds,
     });
     const mediaItems = extractMediaFragments(message.body.fragments);
     const wasMentioned = detectMention({
-        mentions: message.context.mentions,
+        mentions: mentionIds,
         chatType,
         userId: account.userId,
     });
     // Group trigger policy: in "mention" mode we only handle group messages
     // that @-mention us; "all" listens open and processes every group msg.
     // Direct chats are unaffected (detectMention returns true).
-    if (isGroup && account.groupMode === "mention" && !wasMentioned) {
+    const groupMode = isGroup ? effectiveGroupMode(account, chatId) : account.groupMode;
+    if (isGroup && groupMode === "mention" && !wasMentioned) {
         log?.info?.(`[${account.accountId}] openclaw-clawchat skip group (no mention) msg=${payload.message_id}`);
         return;
     }
@@ -143,11 +137,13 @@ export async function dispatchOpenclawClawlingInbound(params) {
         peer: { kind: isGroup ? "group" : "direct", id: chatId },
         senderId: sender.id,
         senderNickName: sender.nickName,
+        ...(sender.profileType ? { senderProfileType: sender.profileType } : {}),
         rawBody,
         messageId: payload.message_id,
         traceId: envelope.trace_id,
         timestamp: envelope.emitted_at,
         wasMentioned,
+        mentionedUserIds: mentionIds,
         mediaItems,
         ...(replyCtx ? { replyCtx } : {}),
         cfg: params.cfg,

package/dist/src/login.runtime.js

@@ -2,6 +2,7 @@ import { createInterface } from "node:readline/promises";
 import { createOpenclawClawlingApiClient } from "./api-client.js";
 import { ClawlingApiError } from "./api-types.js";
 import { CHANNEL_ID, mergeOpenclawClawchatRuntimePluginActivation, mergeOpenclawClawchatToolAllow, resolveOpenclawClawlingAccount, } from "./config.js";
+import { getClawChatStore } from "./storage.js";
 /**
  * Platform tag sent to `/v1/agents/connect`. Identifies the host of this
  * agent runtime — openclaw's bundled clawchat channel.
@@ -38,15 +39,28 @@ async function promptInviteCodeFromStdin(runtime) {
 function buildLoginConfig(cfg, result) {
     const channels = (cfg.channels ?? {});
     const existing = (channels[CHANNEL_ID] ?? {});
+    const groupMode = existing.groupMode === "mention" || existing.groupMode === "all"
+        ? existing.groupMode
+        : "all";
+    const groupCommandMode = existing.groupCommandMode === "all" || existing.groupCommandMode === "off"
+        ? existing.groupCommandMode
+        : "owner";
     const nextSection = {
         ...existing,
         enabled: true,
+        groupMode,
+        groupCommandMode,
         token: result.access_token,
+        ...(result.agent.id ? { agentId: result.agent.id } : {}),
         userId: result.agent.user_id,
+        ownerUserId: result.agent.owner_id,
     };
     if (result.refresh_token) {
         nextSection.refreshToken = result.refresh_token;
     }
+    else {
+        delete nextSection.refreshToken;
+    }
     return mergeOpenclawClawchatRuntimePluginActivation(mergeOpenclawClawchatToolAllow({
         ...cfg,
         channels: { ...channels, [CHANNEL_ID]: nextSection },
@@ -54,7 +68,7 @@ function buildLoginConfig(cfg, result) {
 }
 async function persistLoginConfig(params, result) {
     if (params.mutateConfigFile) {
-        params.runtime.log(`Persisting ClawChat credentials and plugin activation for userId=${result.agent.user_id} with Gateway restart intent.`);
+        params.runtime.log(`Persisting ClawChat credentials and plugin activation for userId=${result.agent.user_id} ownerUserId=${result.agent.owner_id} with Gateway restart intent.`);
         await params.mutateConfigFile({
             afterWrite: {
                 mode: "restart",
@@ -64,19 +78,35 @@ async function persistLoginConfig(params, result) {
                 Object.assign(draft, buildLoginConfig(draft, result));
             },
         });
-        params.runtime.log(`ClawChat credentials and plugin activation persisted for userId=${result.agent.user_id}.`);
+        params.runtime.log(`ClawChat credentials and plugin activation persisted for userId=${result.agent.user_id} ownerUserId=${result.agent.owner_id}.`);
         return;
     }
     if (params.persistConfig) {
-        params.runtime.log(`Persisting ClawChat credentials and plugin activation for userId=${result.agent.user_id}.`);
+        params.runtime.log(`Persisting ClawChat credentials and plugin activation for userId=${result.agent.user_id} ownerUserId=${result.agent.owner_id}.`);
         await params.persistConfig(buildLoginConfig(params.cfg, result));
-        params.runtime.log(`ClawChat credentials and plugin activation persisted for userId=${result.agent.user_id}.`);
+        params.runtime.log(`ClawChat credentials and plugin activation persisted for userId=${result.agent.user_id} ownerUserId=${result.agent.owner_id}.`);
         return;
     }
     throw new Error("openclaw-clawchat: mutateConfigFile is required to persist login credentials");
 }
+function requireConnectString(value, fieldName) {
+    if (typeof value !== "string") {
+        throw new Error(`agents/connect response missing required fields (${fieldName})`);
+    }
+    const trimmed = value.trim();
+    if (!trimmed) {
+        throw new Error(`agents/connect response missing required fields (${fieldName})`);
+    }
+    return trimmed;
+}
+function readOptionalConnectString(value, fieldName) {
+    if (value == null) {
+        return undefined;
+    }
+    return requireConnectString(value, fieldName);
+}
 /**
- * Run the invite-code credential exchange used by `/clawchat-login`,
+ * Run the invite-code credential exchange used by `/clawchat-activate`,
  * `openclaw channels add --channel openclaw-clawchat --token <invite-code>`,
  * and `openclaw channels login --channel openclaw-clawchat`:
  *   1. Read the existing channel section; require `baseUrl` to be set so we
@@ -120,20 +150,53 @@ export async function runOpenclawClawlingLogin(params) {
         }
         throw err;
     }
-    if (!result?.access_token || !result?.agent?.user_id) {
-        throw new Error(`agents/connect response missing required fields (access_token / agent.user_id): ${JSON.stringify(result)}`);
+    const accessToken = requireConnectString(result?.access_token, "access_token");
+    const agentUserId = requireConnectString(result?.agent?.user_id, "agent.user_id");
+    const ownerUserId = requireConnectString(result?.agent?.owner_id, "agent.owner_id");
+    const agentId = readOptionalConnectString(result?.agent?.id, "agent.id");
+    let conversationId = null;
+    if (result?.conversation != null) {
+        conversationId = requireConnectString(result.conversation.id, "conversation.id");
+    }
+    const normalizedResult = {
+        ...result,
+        access_token: accessToken,
+        refresh_token: typeof result?.refresh_token === "string" ? result.refresh_token.trim() : "",
+        agent: {
+            ...result.agent,
+            ...(agentId ? { id: agentId } : {}),
+            owner_id: ownerUserId,
+            user_id: agentUserId,
+        },
+        ...(conversationId
+            ? {
+                conversation: {
+                    ...result.conversation,
+                    id: conversationId,
+                },
+            }
+            : {}),
+    };
+    runtime.log(`Updating config: channels.${CHANNEL_ID}.token=[REDACTED] agentId=${normalizedResult.agent.id || "-"} userId=${normalizedResult.agent.user_id} ownerUserId=${normalizedResult.agent.owner_id}${normalizedResult.refresh_token ? " refreshToken=[REDACTED]" : ""} plugins.entries.${CHANNEL_ID}.enabled=true plugins.allow+=${CHANNEL_ID} …`);
+    await persistLoginConfig(params, normalizedResult);
+    try {
+        const store = params.store ??
+            getClawChatStore({
+                ...(params.dbPath ? { dbPath: params.dbPath } : {}),
+                log: { error: runtime.log },
+            });
+        store.upsertActivation({
+            platform: "openclaw",
+            accountId: account.accountId,
+            userId: normalizedResult.agent.user_id,
+            ownerUserId: normalizedResult.agent.owner_id,
+            conversationId: normalizedResult.conversation?.id ?? null,
+            loginMethod: "login",
+        });
+    }
+    catch {
+        runtime.log("openclaw-clawchat sqlite activation persistence failed; login continues.");
     }
-    const tokenPreview = redactToken(result.access_token);
-    runtime.log(`Updating config: channels.${CHANNEL_ID}.token=${tokenPreview} userId=${result.agent.user_id}${result.refresh_token ? " refreshToken=***" : ""} plugins.entries.${CHANNEL_ID}.enabled=true plugins.allow+=${CHANNEL_ID} …`);
-    await persistLoginConfig(params, result);
     runtime.log(`Config file updated.`);
-    runtime.log(`openclaw-clawchat login succeeded (user_id=${result.agent.user_id}, nickname=${result.agent.nickname || "-"}).`);
-}
-/** Shortens a token for display logs without revealing the full secret. */
-function redactToken(token) {
-    if (!token)
-        return "(empty)";
-    if (token.length <= 8)
-        return "***";
-    return `${token.slice(0, 4)}…${token.slice(-4)}`;
+    runtime.log(`openclaw-clawchat login succeeded (user_id=${normalizedResult.agent.user_id}, owner_user_id=${normalizedResult.agent.owner_id}, nickname=${normalizedResult.agent.nickname || "-"}).`);
 }

package/dist/src/media-runtime.js

@@ -69,13 +69,12 @@ export async function uploadOutboundMedia(urls, ctx) {
                 mime: loaded.contentType,
             });
             const fragment = {
-                kind: inferMediaKindFromMime(uploaded.mime),
+                kind: uploaded.kind,
                 url: uploaded.url,
+                name: uploaded.name,
                 mime: uploaded.mime,
                 size: uploaded.size,
             };
-            if (loaded.fileName)
-                fragment.name = loaded.fileName;
             out.push(fragment);
         }
         catch (err) {

package/dist/src/message-mapper.js

@@ -53,7 +53,7 @@ export function textToFragments(text) {
 /**
  * Extract media fragments from a body (image/file/audio/video). Skips
  * entries missing `url`. Preserves all optional metadata fields the
- * SDK passes through (mime/size/width/height/duration/name).
+ * protocol carries through (mime/size/width/height/duration/name).
  */
 export function extractMediaFragments(fragments) {
     const out = [];

package/dist/src/mock-transport.js

@@ -0,0 +1,31 @@
+export class MockTransport {
+    handlers;
+    currentState = "closed";
+    sent = [];
+    get state() {
+        return this.currentState;
+    }
+    async connect(_url, handlers) {
+        this.handlers = handlers;
+        this.currentState = "open";
+        handlers.onOpen();
+    }
+    send(data) {
+        if (this.currentState !== "open") {
+            throw new Error("transport is not open");
+        }
+        this.sent.push(data);
+    }
+    close(code = 1000, reason = "client close") {
+        if (this.currentState === "closed")
+            return;
+        this.currentState = "closed";
+        this.handlers?.onClose(code, reason);
+    }
+    emitInbound(data) {
+        this.handlers?.onMessage(data);
+    }
+    emitError(err) {
+        this.handlers?.onError(err);
+    }
+}