@ai-setting/roy-agent-core 1.7.31 → 1.7.33

package/dist/env/event-source/index.js

@@ -11,7 +11,7 @@ import {
   larkCliHandler,
   resolveBountyIMSystemPrompt,
   timerHandler
-} from "../../shared/@ai-setting/roy-agent-core-vqexb6am.js";
+} from "../../shared/@ai-setting/roy-agent-core-jq8rmmm6.js";
 import"../../shared/@ai-setting/roy-agent-core-0nz53t5v.js";
 import {
   BUILT_IN_EVENT_SOURCE_TYPES,
@@ -22,7 +22,7 @@ import {
   isValidEventSourceType,
   validateEventSourceConfig
 } from "../../shared/@ai-setting/roy-agent-core-ds5f75pg.js";
-import"../../shared/@ai-setting/roy-agent-core-06wbc8km.js";
+import"../../shared/@ai-setting/roy-agent-core-6f7cjzem.js";
 import"../../shared/@ai-setting/roy-agent-core-1pg0fepg.js";
 import"../../shared/@ai-setting/roy-agent-core-skqt40yy.js";
 import"../../shared/@ai-setting/roy-agent-core-1df0grva.js";
@@ -30,7 +30,7 @@ import"../../shared/@ai-setting/roy-agent-core-jdvgzf2y.js";
 import"../../shared/@ai-setting/roy-agent-core-jrj30vq3.js";
 import"../../shared/@ai-setting/roy-agent-core-jbc1t62x.js";
 import"../../shared/@ai-setting/roy-agent-core-e25xkv53.js";
-import"../../shared/@ai-setting/roy-agent-core-az13yzmc.js";
+import"../../shared/@ai-setting/roy-agent-core-rmn29nrh.js";
 import"../../shared/@ai-setting/roy-agent-core-7hh0brvs.js";
 import"../../shared/@ai-setting/roy-agent-core-m725wp1x.js";
 import"../../shared/@ai-setting/roy-agent-core-sf4bjgwz.js";

package/dist/env/index.js

@@ -1,6 +1,6 @@
 import {
   BaseEnvironment
-} from "../shared/@ai-setting/roy-agent-core-1ht06trt.js";
+} from "../shared/@ai-setting/roy-agent-core-mssk8f0g.js";
 import {
   TaskComponent
 } from "../shared/@ai-setting/roy-agent-core-m09a4xwh.js";
@@ -15,7 +15,7 @@ import {
   EventSourceComponent,
   builtInHandlers,
   larkCliHandler
-} from "../shared/@ai-setting/roy-agent-core-vqexb6am.js";
+} from "../shared/@ai-setting/roy-agent-core-jq8rmmm6.js";
 import"../shared/@ai-setting/roy-agent-core-0nz53t5v.js";
 import {
   EventSourceInitHooks,
@@ -24,7 +24,7 @@ import {
   isValidEventSourceType,
   validateEventSourceConfig
 } from "../shared/@ai-setting/roy-agent-core-ds5f75pg.js";
-import"../shared/@ai-setting/roy-agent-core-06wbc8km.js";
+import"../shared/@ai-setting/roy-agent-core-6f7cjzem.js";
 import"../shared/@ai-setting/roy-agent-core-1pg0fepg.js";
 import"../shared/@ai-setting/roy-agent-core-skqt40yy.js";
 import {
@@ -69,8 +69,8 @@ import"../shared/@ai-setting/roy-agent-core-c1v263jn.js";
 import"../shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import {
   PluginComponent
-} from "../shared/@ai-setting/roy-agent-core-0ra1gtn9.js";
-import"../shared/@ai-setting/roy-agent-core-az13yzmc.js";
+} from "../shared/@ai-setting/roy-agent-core-bt7mg8j5.js";
+import"../shared/@ai-setting/roy-agent-core-rmn29nrh.js";
 import {
   McpComponent
 } from "../shared/@ai-setting/roy-agent-core-gjnhkemk.js";

package/dist/env/plugin/index.js

@@ -1,10 +1,11 @@
 import {
   EventBusNotificationChannel,
   PluginComponent
-} from "../../shared/@ai-setting/roy-agent-core-0ra1gtn9.js";
+} from "../../shared/@ai-setting/roy-agent-core-bt7mg8j5.js";
 import {
-  BasePlugin
-} from "../../shared/@ai-setting/roy-agent-core-az13yzmc.js";
+  BasePlugin,
+  normalizeLarkAtMentions
+} from "../../shared/@ai-setting/roy-agent-core-rmn29nrh.js";
 import"../../shared/@ai-setting/roy-agent-core-m725wp1x.js";
 import"../../shared/@ai-setting/roy-agent-core-sf4bjgwz.js";
 import"../../shared/@ai-setting/roy-agent-core-g772q3gf.js";
@@ -64,6 +65,7 @@ ${options.content}`;
     return new Promise((resolve, reject) => {
       const { chatId, messageId, content, profile } = options;
       let args;
+      const normalizedContent = normalizeLarkAtMentions(content);
       if (messageId) {
         args = [
           "im",
@@ -71,7 +73,7 @@ ${options.content}`;
           "--message-id",
           messageId,
           "--markdown",
-          content,
+          normalizedContent,
           "--as",
           "bot"
         ];
@@ -82,7 +84,7 @@ ${options.content}`;
           "--chat-id",
           chatId,
           "--markdown",
-          content
+          normalizedContent
         ];
       }
       if (profile) {

package/dist/env/task/plugins/index.js

@@ -10,7 +10,7 @@ import {
   formatExtractorInput,
   formatExtractorInputFromDescription,
   parseExtractorOutput
-} from "../../../shared/@ai-setting/roy-agent-core-06wbc8km.js";
+} from "../../../shared/@ai-setting/roy-agent-core-6f7cjzem.js";
 import"../../../shared/@ai-setting/roy-agent-core-1pg0fepg.js";
 import"../../../shared/@ai-setting/roy-agent-core-skqt40yy.js";
 import"../../../shared/@ai-setting/roy-agent-core-1df0grva.js";
@@ -18,7 +18,7 @@ import"../../../shared/@ai-setting/roy-agent-core-jdvgzf2y.js";
 import"../../../shared/@ai-setting/roy-agent-core-jrj30vq3.js";
 import"../../../shared/@ai-setting/roy-agent-core-jbc1t62x.js";
 import"../../../shared/@ai-setting/roy-agent-core-e25xkv53.js";
-import"../../../shared/@ai-setting/roy-agent-core-az13yzmc.js";
+import"../../../shared/@ai-setting/roy-agent-core-rmn29nrh.js";
 import"../../../shared/@ai-setting/roy-agent-core-m2pxg5d8.js";
 import"../../../shared/@ai-setting/roy-agent-core-7p6rny5m.js";
 import"../../../shared/@ai-setting/roy-agent-core-38rtrpk3.js";

package/dist/index.js

@@ -66,7 +66,7 @@ import {
   BaseEnvironment,
   generateDescendingId,
   generateId
-} from "./shared/@ai-setting/roy-agent-core-1ht06trt.js";
+} from "./shared/@ai-setting/roy-agent-core-mssk8f0g.js";
 import {
   TaskComponent
 } from "./shared/@ai-setting/roy-agent-core-m09a4xwh.js";
@@ -92,7 +92,7 @@ import {
   larkCliHandler,
   resolveBountyIMSystemPrompt,
   timerHandler
-} from "./shared/@ai-setting/roy-agent-core-vqexb6am.js";
+} from "./shared/@ai-setting/roy-agent-core-jq8rmmm6.js";
 import {
   LogTraceComponent,
   LogTraceConfigSchema
@@ -109,7 +109,7 @@ import {
 import {
   TaskTagPlugin,
   createAutoTaskPlugin
-} from "./shared/@ai-setting/roy-agent-core-06wbc8km.js";
+} from "./shared/@ai-setting/roy-agent-core-6f7cjzem.js";
 import {
   TaskHookPoints
 } from "./shared/@ai-setting/roy-agent-core-1pg0fepg.js";
@@ -189,10 +189,10 @@ import {
 } from "./shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import {
   PluginComponent
-} from "./shared/@ai-setting/roy-agent-core-0ra1gtn9.js";
+} from "./shared/@ai-setting/roy-agent-core-bt7mg8j5.js";
 import {
   BasePlugin
-} from "./shared/@ai-setting/roy-agent-core-az13yzmc.js";
+} from "./shared/@ai-setting/roy-agent-core-rmn29nrh.js";
 import {
   McpComponent
 } from "./shared/@ai-setting/roy-agent-core-gjnhkemk.js";

package/dist/shared/@ai-setting/{roy-agent-core-06wbc8km.js → roy-agent-core-6f7cjzem.js}

@@ -11,8 +11,9 @@ import {
   enqueueToAddFakeUserMessage
 } from "./roy-agent-core-jbc1t62x.js";
 import {
-  BasePlugin
-} from "./roy-agent-core-az13yzmc.js";
+  BasePlugin,
+  normalizeLarkAtMentions
+} from "./roy-agent-core-rmn29nrh.js";
 import {
   init_context
 } from "./roy-agent-core-m2pxg5d8.js";
@@ -556,6 +557,7 @@ ${content}`;
     return new Promise((resolve, reject) => {
       const { chatId, messageId, content, profile } = options;
       let args;
+      const normalizedContent = normalizeLarkAtMentions(content);
       if (messageId) {
         args = [
           "im",
@@ -563,7 +565,7 @@ ${content}`;
           "--message-id",
           messageId,
           "--markdown",
-          content,
+          normalizedContent,
           "--as",
           "bot"
         ];
@@ -574,7 +576,7 @@ ${content}`;
           "--chat-id",
           chatId,
           "--markdown",
-          content
+          normalizedContent
         ];
       }
       if (profile) {
@@ -830,6 +832,7 @@ class PerTaskGroupChatPlugin {
       descriptionTemplate: config.descriptionTemplate ?? "roy-agent task #{id} - #{project_path}",
       botAppIds: config.botAppIds ?? [],
       inviteUserIds: config.inviteUserIds ?? ["sender"],
+      defaultInviteUserIds: config.defaultInviteUserIds ?? [],
       fallbackToMain: config.fallbackToMain ?? true,
       operationThrottleMs: config.operationThrottleMs ?? 5000,
       disableSubTaskSkip: config.disableSubTaskSkip ?? false,
@@ -1137,7 +1140,7 @@ class PerTaskGroupChatPlugin {
       "--chat-id",
       opts.chatId,
       "--markdown",
-      opts.content,
+      normalizeLarkAtMentions(opts.content),
       "--as",
       "bot"
     ];
@@ -1174,9 +1177,9 @@ class PerTaskGroupChatPlugin {
   }
   sendToMain(replyChannel, opts) {
     return new Promise((resolve, reject) => {
-      const message = `${opts.title}
+      const message = normalizeLarkAtMentions(`${opts.title}
 
-${opts.content}`;
+${opts.content}`);
       const args = replyChannel.messageId ? ["im", "+messages-reply", "--message-id", replyChannel.messageId, "--markdown", message, "--as", "bot"] : ["im", "+messages-send", "--chat-id", replyChannel.chatId, "--markdown", message];
       if (opts.profile) {
         args.unshift("--profile", opts.profile);
@@ -1258,6 +1261,15 @@ ${opts.content}`;
   }
   resolveUserIds(replyChannel) {
     const ids = new Set;
+    if (this.config.defaultInviteUserIds && this.config.defaultInviteUserIds.length > 0) {
+      for (const id of this.config.defaultInviteUserIds) {
+        if (id && id !== "sender" && id.startsWith("ou_")) {
+          ids.add(id);
+        } else if (id && id !== "sender") {
+          logger4.debug(`resolveUserIds[${this.pluginName}]: skip non-open_id in defaultInviteUserIds: "${id}"`);
+        }
+      }
+    }
     if (this.config.inviteUserIds && this.config.inviteUserIds.length > 0) {
       for (const id of this.config.inviteUserIds) {
         if (id !== "sender" && id)
@@ -1270,12 +1282,15 @@ ${opts.content}`;
         ids.add(senderId);
       }
     }
-    if (ids.size === 0) {
+    if (ids.size === 0 && this.config.inviteUserIds?.includes("sender")) {
       const alsUserId = getEnvContextOrEmpty().userId;
       if (alsUserId && alsUserId.startsWith("ou_")) {
         ids.add(alsUserId);
       }
     }
+    if (isPluginDebugEnabled()) {
+      logger4.debug(`resolveUserIds[${this.pluginName}]: ` + `defaultInviteUserIds=${JSON.stringify(this.config.defaultInviteUserIds)} ` + `inviteUserIds=${JSON.stringify(this.config.inviteUserIds)} ` + `replyChannel.userId=${replyChannel?.userId ?? "(none)"} ` + `→ final userIds=${JSON.stringify(Array.from(ids))}`);
+    }
     return Array.from(ids);
   }
   isSubTask(task) {

package/dist/shared/@ai-setting/{roy-agent-core-0ra1gtn9.js → roy-agent-core-bt7mg8j5.js}

@@ -1,6 +1,6 @@
 import {
   BasePlugin
-} from "./roy-agent-core-az13yzmc.js";
+} from "./roy-agent-core-rmn29nrh.js";
 import {
   BaseComponent
 } from "./roy-agent-core-m725wp1x.js";

package/dist/shared/@ai-setting/{roy-agent-core-vqexb6am.js → roy-agent-core-jq8rmmm6.js}

@@ -2,7 +2,10 @@ import {
   TaskTagPlugin,
   createLarkCliTaskNotifyHook,
   createPerTaskGroupChatPlugin
-} from "./roy-agent-core-06wbc8km.js";
+} from "./roy-agent-core-6f7cjzem.js";
+import {
+  normalizeLarkAtMentions
+} from "./roy-agent-core-rmn29nrh.js";
 import {
   envKeyToConfigKey
 } from "./roy-agent-core-7hh0brvs.js";
@@ -906,7 +909,10 @@ function extractMetadata(rawEvent, eventType) {
   const larkInnerEvent = event.event;
   const header = larkInnerEvent?.header || event.header;
   const sender = larkInnerEvent?.sender || event.sender;
-  const senderId = sender?.sender_id;
+  let senderId = sender?.sender_id;
+  if (!senderId && typeof event.sender_id === "string") {
+    senderId = event.sender_id;
+  }
   let messageData;
   if (larkInnerEvent?.message) {
     messageData = larkInnerEvent.message;
@@ -932,7 +938,9 @@ function extractMetadata(rawEvent, eventType) {
     metadata.messageId = messageData.message_id;
     metadata.messageType = messageData.message_type;
   }
-  if (senderId) {
+  if (typeof senderId === "string") {
+    metadata.senderId = senderId;
+  } else if (senderId) {
     metadata.senderId = senderId.open_id || senderId.user_id || senderId.union_id;
   }
   let recommendedAction;
@@ -947,6 +955,7 @@ function extractMetadata(rawEvent, eventType) {
     });
   }
   const profile = event.profile;
+  const senderOpenId = typeof senderId === "string" ? senderId : senderId?.open_id;
   const replyChannel = {
     type: "lark-cli",
     appId: metadata.appId,
@@ -954,7 +963,7 @@ function extractMetadata(rawEvent, eventType) {
     chatId: messageData?.chat_id,
     messageId: messageData?.message_id,
     params: {
-      userId: senderId?.open_id
+      userId: senderOpenId
     }
   };
   return { metadata, replyChannel, recommendedAction };
@@ -1367,6 +1376,12 @@ class LarkCliInstance {
     const message = innerEvent?.message || event.message;
     const sender = innerEvent?.sender || event.sender || message?.sender;
     const senderId = sender?.sender_id;
+    if (typeof event.sender_id === "string") {
+      return event.sender_id;
+    }
+    if (typeof senderId === "string") {
+      return senderId;
+    }
     return senderId?.open_id || senderId?.user_id || senderId?.union_id || "unknown";
   }
   buildReplyChannel(replyChannel) {
@@ -1425,14 +1440,15 @@ class LarkCliInstance {
   async sendLarkMessage(options) {
     return new Promise((resolve, reject) => {
       const { chatId, userId, messageId, content, as: identity, format = "text", profile } = options;
+      const normalizedContent = normalizeLarkAtMentions(content);
       const contentFlag = format === "markdown" ? "--markdown" : "--text";
       const args = ["im"];
       if (messageId) {
-        args.push("+messages-reply", "--message-id", messageId, "--as", identity, contentFlag, content);
+        args.push("+messages-reply", "--message-id", messageId, "--as", identity, contentFlag, normalizedContent);
       } else if (chatId) {
-        args.push("+messages-send", "--chat-id", chatId, "--as", identity, contentFlag, content);
+        args.push("+messages-send", "--chat-id", chatId, "--as", identity, contentFlag, normalizedContent);
       } else if (userId) {
-        args.push("+messages-send", "--user-id", userId, "--as", identity, contentFlag, content);
+        args.push("+messages-send", "--user-id", userId, "--as", identity, contentFlag, normalizedContent);
       } else {
         reject(new Error("No target specified for sending message"));
         return;

package/dist/shared/@ai-setting/{roy-agent-core-1ht06trt.js → roy-agent-core-mssk8f0g.js}

@@ -1,6 +1,6 @@
 import {
   createAutoTaskPlugin
-} from "./roy-agent-core-06wbc8km.js";
+} from "./roy-agent-core-6f7cjzem.js";
 import {
   ContextError,
   ErrorCodes

package/dist/shared/@ai-setting/roy-agent-core-rmn29nrh.js

@@ -0,0 +1,34 @@
+// src/env/plugin/types.ts
+class BasePlugin {
+  version = "1.0.0";
+  description;
+  priority = 0;
+  constructor() {}
+  init(env) {}
+  dispose() {}
+}
+
+// src/env/lark-mention-utils.ts
+var SELF_CLOSING_AT_RE = /<at\s+user_id\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s>]+))\s*\/\s*>/g;
+function normalizeLarkAtMentions(content, nameMap) {
+  if (!content)
+    return content;
+  return content.replace(SELF_CLOSING_AT_RE, (_match, dq, sq, bare) => {
+    const userId = dq ?? sq ?? bare ?? "";
+    if (!userId)
+      return _match;
+    const displayName = nameMap?.get(userId);
+    if (displayName) {
+      return `<at user_id="${escapeXmlAttr(userId)}">${escapeXmlText(displayName)}</at>`;
+    }
+    return `<at user_id="${escapeXmlAttr(userId)}"></at>`;
+  });
+}
+function escapeXmlAttr(value) {
+  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+}
+function escapeXmlText(value) {
+  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+
+export { BasePlugin, normalizeLarkAtMentions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-core",
-  "version": "1.7.31",
+  "version": "1.7.33",
   "type": "module",
   "description": "Core SDK for roy-agent - Environment, Components, Tools, Sessions, Tasks",
   "main": "./dist/index.js",

package/dist/shared/@ai-setting/roy-agent-core-az13yzmc.js

@@ -1,11 +0,0 @@
-// src/env/plugin/types.ts
-class BasePlugin {
-  version = "1.0.0";
-  description;
-  priority = 0;
-  constructor() {}
-  init(env) {}
-  dispose() {}
-}
-
-export { BasePlugin };