openclaw-quiubo 2.3.5 → 2.4.0

package/dist/index.js

@@ -13606,23 +13606,43 @@ var quiuboPlugin = {
               client.getGroup(groupId),
               client.listGroupMembers(groupId)
             ]);
-            const owner = members.find((m) => m.role === "owner");
-            const botSettings = group.settings?.bot ?? {};
-            log?.info?.(`[${accountId}] Quiubo: cache-miss resolved as partner group ${groupId}`);
-            return {
-              enabled: botSettings.enabled ?? false,
-              suppressionMinutes: botSettings.suppressionMinutes ?? 10,
-              ownerIdentityId: owner?.identityId ?? "",
-              groupType: group.groupType ?? "standard"
-            };
-          } catch (partnerErr) {
-            log?.info?.(`[${accountId}] Quiubo: not a partner group ${groupId}: ${partnerErr}`);
+            if (group.management === "partner") {
+              const owner = members.find((m) => m.role === "owner");
+              const botSettings = group.settings?.bot ?? {};
+              log?.info?.(`[${accountId}] Quiubo: cache-miss resolved as partner group ${groupId}`);
+              return {
+                enabled: botSettings.enabled ?? false,
+                suppressionMinutes: botSettings.suppressionMinutes ?? 10,
+                ownerIdentityId: owner?.identityId ?? "",
+                groupType: group.groupType ?? "standard"
+              };
+            }
+            if (resolvedAgentId) {
+              log?.info?.(`[${accountId}] Quiubo: non-partner group ${groupId}, trying getGroupAgent(${resolvedAgentId})`);
+              const status = await client.getGroupAgent(resolvedAgentId, groupId);
+              if (status) {
+                log?.info?.(`[${accountId}] Quiubo: cache-miss resolved as directory group ${groupId}: ${JSON.stringify(status)}`);
+                return {
+                  enabled: status.enabled,
+                  suppressionMinutes: 10,
+                  ownerIdentityId: "",
+                  groupType: group.groupType ?? "standard",
+                  triggerMode: status.triggerMode,
+                  source: "directory",
+                  grantedScopes: status.grantedScopes,
+                  agentDisplayName: resolvedAgentDisplayName
+                };
+              }
+            }
+            log?.warn?.(`[${accountId}] Quiubo: cache-miss returned null for group ${groupId} (fail-closed)`);
+            return null;
+          } catch (err) {
+            log?.info?.(`[${accountId}] Quiubo: getGroup failed for ${groupId}: ${err}`);
             if (resolvedAgentId) {
               try {
-                log?.info?.(`[${accountId}] Quiubo: trying getGroupAgent(${resolvedAgentId}, ${groupId})`);
                 const status = await client.getGroupAgent(resolvedAgentId, groupId);
-                log?.info?.(`[${accountId}] Quiubo: getGroupAgent result: ${JSON.stringify(status)}`);
                 if (status) {
+                  log?.info?.(`[${accountId}] Quiubo: cache-miss resolved via getGroupAgent for ${groupId}`);
                   return {
                     enabled: status.enabled,
                     suppressionMinutes: 10,
@@ -13662,11 +13682,7 @@ var quiuboPlugin = {
         onRequest: async (req) => {
           log?.info?.(`[${accountId}] Quiubo: openclaw:request type=${req.type} requestId=${req.requestId} group=${req.groupId} from=${req.requestingIdentityId}`);
           try {
-            const bindings = cfg?.bindings ?? [];
-            const matchedBinding = bindings.find(
-              (b) => b?.match?.channel === "quiubo" && b?.match?.accountId === accountId
-            );
-            const agentId = matchedBinding?.agentId || cfg?.agents?.list?.[0]?.id || "main";
+            const agentId = resolveAgentId(cfg, accountId);
             let data;
             if (req.type === "activity") {
               data = await getActivityData(runtime2, log, agentId);
@@ -13831,6 +13847,16 @@ async function createBotIdentity(client, prompter) {
     return null;
   }
 }
+function resolveAgentId(cfg, accountId) {
+  const bindings = cfg?.bindings ?? [];
+  const matched = bindings.find(
+    (b) => b?.match?.channel === "quiubo" && b?.match?.accountId === accountId
+  );
+  return matched?.agentId || cfg?.agents?.list?.[0]?.id || "main";
+}
+function buildSessionKey(agentId, groupId) {
+  return agentId === "main" ? `quiubo:${groupId}` : `agent:${agentId}:quiubo:${groupId}`;
+}
 async function routeInboundMessage(opts) {
   const { runtime: runtime2, cfg, accountId, botIdentityId, client, msg, log, keyManager, e2eeGrantedGroups } = opts;
   const senderId = msg.senderIdentityId;
@@ -13855,6 +13881,9 @@ async function routeInboundMessage(opts) {
   };
   await sendTyping();
   const typingInterval = setInterval(sendTyping, 4e3);
+  const agentId = resolveAgentId(cfg, accountId);
+  const sessionKey = buildSessionKey(agentId, groupId);
+  log?.info?.(`[${accountId}] Quiubo: resolved agentId=${agentId}, sessionKey=${sessionKey}`);
   const ctxPayload = runtime2.channel.reply.finalizeInboundContext({
     Body: text,
     RawBody: text,
@@ -13862,7 +13891,7 @@ async function routeInboundMessage(opts) {
     CommandAuthorized: true,
     From: `quiubo:${senderId}`,
     To: `quiubo:${botIdentityId}`,
-    SessionKey: `quiubo:${groupId}`,
+    SessionKey: sessionKey,
     AccountId: accountId,
     ChatType: "group",
     ConversationLabel: `quiubo:${groupId}`,