@ai-setting/roy-agent-core 1.7.38 → 1.7.40

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

@@ -1,9 +1,12 @@
+import {
+  getSharedEventStore
+} from "./roy-agent-core-xyys5m1a.js";
 import {
   TaskHookPoints
 } from "./roy-agent-core-1pg0fepg.js";
 import {
   WORKFLOW_EXTRACT_PROMPT
-} from "./roy-agent-core-skqt40yy.js";
+} from "./roy-agent-core-223v204d.js";
 import {
   validateWorkflowDefinition
 } from "./roy-agent-core-6vbgswjw.js";
@@ -16,13 +19,13 @@ import {
 } from "./roy-agent-core-rmn29nrh.js";
 import {
   init_context
-} from "./roy-agent-core-ff2ssff5.js";
+} from "./roy-agent-core-wn59p0zw.js";
 import {
   getEnvContextOrEmpty,
   getEventFromEnvContext,
   getLarkMessageId,
   isLarkEvent
-} from "./roy-agent-core-z4486eek.js";
+} from "./roy-agent-core-zbb3sk72.js";
 import {
   TracedAs,
   init_decorator,
@@ -378,6 +381,30 @@ var logger3 = createLogger("lark-cli:task-notify");
 function isTaskNotifyDebugEnabled() {
   return process.env.ROY_TASK_NOTIFY_DEBUG === "1" || process.env.ROY_TRACE_DEBUG === "1";
 }
+var CTX_FIELD_CHAT_ID = "larkPerTaskChatId";
+var CTX_FIELD_CHAT_PROFILE = "larkPerTaskChatProfile";
+function parseLarkPerTaskChatId(ctxStr) {
+  if (!ctxStr)
+    return;
+  try {
+    const obj = JSON.parse(ctxStr);
+    const id = obj[CTX_FIELD_CHAT_ID];
+    return typeof id === "string" ? id : undefined;
+  } catch {
+    return;
+  }
+}
+function parseLarkPerTaskChatProfile(ctxStr) {
+  if (!ctxStr)
+    return;
+  try {
+    const obj = JSON.parse(ctxStr);
+    const profile = obj[CTX_FIELD_CHAT_PROFILE];
+    return typeof profile === "string" ? profile : undefined;
+  } catch {
+    return;
+  }
+}
 function extractLarkFields(env) {
   const event = getEventFromEnvContext(env);
   if (!isLarkEvent(event)) {
@@ -407,6 +434,7 @@ class LarkCliTaskNotifyHook {
   pluginName;
   sourceId;
   config;
+  eventStore;
   lastNotifyTimestamps = new Map;
   constructor(config = {}) {
     this.name = config.pluginName || "LarkCliTaskNotifyHook";
@@ -515,14 +543,41 @@ class LarkCliTaskNotifyHook {
   async sendNotify(options) {
     const { type, title, content, _hookContext } = options;
     const env = getEnvContextOrEmpty();
-    let replyChannel = env.replyChannel;
+    const taskFromCtx = _hookContext?.data?.task ?? env.metadata?.task;
+    const taskContext = taskFromCtx?.context;
+    const taskChatId = taskContext ? parseLarkPerTaskChatId(taskContext) : undefined;
+    const taskChatProfile = taskContext ? parseLarkPerTaskChatProfile(taskContext) : undefined;
+    let replyChannel = taskChatId ? {
+      chatId: taskChatId,
+      messageId: undefined,
+      profile: taskChatProfile,
+      type: "lark-cli"
+    } : env.replyChannel;
     const envContextFromMetadata = env.metadata?.envContext;
-    if (!replyChannel && envContextFromMetadata) {
+    if (!replyChannel?.chatId && envContextFromMetadata?.replyChannel) {
       replyChannel = envContextFromMetadata.replyChannel;
     }
-    if (!replyChannel && _hookContext?.metadata?.envContext) {
+    if (!replyChannel?.chatId && _hookContext?.metadata?.envContext?.replyChannel) {
       replyChannel = _hookContext.metadata.envContext.replyChannel;
     }
+    const triggerEventId = env.envEvent?.metadata?.triggerEventId ?? env.envEvent?.payload?.triggerEventId ?? env.event?.metadata?.triggerEventId;
+    const fallbackStore = this.eventStore ?? getSharedEventStore() ?? undefined;
+    if (!replyChannel?.chatId && fallbackStore && triggerEventId) {
+      try {
+        const triggerEvent = await fallbackStore.getEventById(triggerEventId);
+        const triggerChatId = triggerEvent?.metadata?.chatId ?? triggerEvent?.metadata?.replyChannel?.chatId;
+        if (triggerChatId) {
+          replyChannel = {
+            chatId: triggerChatId,
+            messageId: undefined,
+            profile: triggerEvent?.metadata?.profile ?? triggerEvent?.metadata?.replyChannel?.profile,
+            type: "lark-cli"
+          };
+        }
+      } catch (err) {
+        logger3.debug(`EventStore fallback failed: ${err.message}`);
+      }
+    }
     const larkFields = extractLarkFields(env);
     if (!larkFields.isLark && env.event) {
       logger3.debug(`Skipping notification for non-lark event source: ${larkFields.source}`);
@@ -797,8 +852,12 @@ __legacyDecorateClassTS([
 __legacyDecorateClassTS([
   TracedAs("lark-cli-task-notify.sendLarkMessage")
 ], LarkCliTaskNotifyHook.prototype, "sendLarkMessage", null);
-function createLarkCliTaskNotifyHook(config = {}) {
-  return new LarkCliTaskNotifyHook(config);
+function createLarkCliTaskNotifyHook(config = {}, options = {}) {
+  const hook = new LarkCliTaskNotifyHook(config);
+  if (options.eventStore) {
+    hook.eventStore = options.eventStore;
+  }
+  return hook;
 }
 // src/env/task/plugins/per-task-group-chat-plugin.ts
 init_decorator();
@@ -809,8 +868,8 @@ var logger4 = createLogger("lark-cli:per-task-group");
 function isPluginDebugEnabled() {
   return process.env.ROY_TASK_NOTIFY_DEBUG === "1" || process.env.ROY_TRACE_DEBUG === "1";
 }
-var CTX_FIELD_CHAT_ID = "larkPerTaskChatId";
-var CTX_FIELD_CHAT_PROFILE = "larkPerTaskChatProfile";
+var CTX_FIELD_CHAT_ID2 = "larkPerTaskChatId";
+var CTX_FIELD_CHAT_PROFILE2 = "larkPerTaskChatProfile";
 var CTX_FIELD_CHAT_CREATED_AT = "larkPerTaskChatCreatedAt";
 var CTX_FIELD_CHAT_TASK_ID = "larkPerTaskChatTaskId";
 
@@ -822,6 +881,7 @@ class PerTaskGroupChatPlugin {
   config;
   lastNotifyTimestamps = new Map;
   taskUpdater;
+  taskGetter;
   sessionComponent;
   constructor(config = {}) {
     this.config = {
@@ -839,7 +899,8 @@ class PerTaskGroupChatPlugin {
       disableSubTaskSkip: config.disableSubTaskSkip ?? false,
       requireReplyChannel: config.requireReplyChannel ?? true,
       fallbackProfile: config.fallbackProfile ?? "",
-      sendWelcomeMessage: config.sendWelcomeMessage ?? true
+      sendWelcomeMessage: config.sendWelcomeMessage ?? true,
+      resolveToTriggerChatFallback: config.resolveToTriggerChatFallback ?? false
     };
     this.name = this.config.pluginName;
     this.priority = this.config.priority;
@@ -853,6 +914,13 @@ class PerTaskGroupChatPlugin {
   hasTaskUpdater() {
     return this.taskUpdater !== undefined;
   }
+  setTaskGetter(getter) {
+    this.taskGetter = getter;
+    logger4.debug(`TaskGetter injected for plugin ${this.name} (sourceId=${this.sourceId})`);
+  }
+  hasTaskGetter() {
+    return this.taskGetter !== undefined;
+  }
   setSessionComponent(sessionComponent) {
     this.sessionComponent = sessionComponent;
     logger4.debug(`SessionComponent injected for plugin ${this.name} (sourceId=${this.sourceId})`);
@@ -923,29 +991,17 @@ class PerTaskGroupChatPlugin {
     const botAppIds = this.resolveBotAppIds(replyChannel ?? {});
     const userIds = this.resolveUserIds(replyChannel);
     logger4.debug(`onAfterCreate[${this.pluginName}]: creating group chat for task #${task.id} ` + `name="${name}" profile="${profile}" botAppIds=${JSON.stringify(botAppIds)} ` + `userIds=${JSON.stringify(userIds)}`);
+    let chatId;
     try {
-      const chatId = await this.createGroupChat({
+      chatId = await this.createGroupChat({
         name,
         description,
         profile,
         botAppIds,
         userIds
       });
+      await this.writeChatBinding(task, chatId, profile, "creating");
       await this.attachChatIdToTask(task, chatId, profile);
-      if (this.sessionComponent) {
-        try {
-          await this.sessionComponent.upsertChatTaskBinding({
-            chatId,
-            taskId: task.id,
-            profile,
-            status: "ready"
-          });
-        } catch (bindErr) {
-          logger4.warn(`onAfterCreate[${this.pluginName}]: failed to write chat-task binding for ` + `chat ${chatId} / task #${task.id}: ${bindErr}. ` + `群消息 handler 将无法自动注入 parentTaskId。`);
-        }
-      } else if (isPluginDebugEnabled()) {
-        logger4.debug(`onAfterCreate[${this.pluginName}]: no sessionComponent injected, ` + `skip chat-task binding for chat ${chatId}`);
-      }
       if (this.config.sendWelcomeMessage) {
         try {
           await this.sendToChat({
@@ -974,13 +1030,36 @@ class PerTaskGroupChatPlugin {
       } else {
         logger4.debug(`onAfterCreate[${this.pluginName}]: skip "群聊已创建" main-chat notification ` + `(no replyChannel.chatId)`);
       }
+      await this.writeChatBinding(task, chatId, profile, "ready");
       logger4.info(`Created per-task group chat ${chatId} for task #${task.id}`);
     } catch (error) {
       logger4.error(`Failed to create per-task group chat for task #${task.id}: ${error}`);
+      if (chatId) {
+        await this.writeChatBinding(task, chatId, profile, "failed", String(error));
+      }
       if (!this.config.fallbackToMain)
         throw error;
     }
   }
+  async writeChatBinding(task, chatId, profile, status, errorMessage) {
+    if (!this.sessionComponent) {
+      if (isPluginDebugEnabled()) {
+        logger4.debug(`writeChatBinding[${this.pluginName}]: no sessionComponent injected, ` + `skip chat-task binding for chat ${chatId} (status=${status})`);
+      }
+      return;
+    }
+    try {
+      await this.sessionComponent.upsertChatTaskBinding({
+        chatId,
+        taskId: task.id,
+        profile,
+        status,
+        errorMessage: errorMessage ?? null
+      });
+    } catch (bindErr) {
+      logger4.warn(`writeChatBinding[${this.pluginName}]: failed to write chat-task binding for ` + `chat ${chatId} / task #${task.id} (status=${status}): ${bindErr}. ` + `群消息 handler 将无法自动注入 parentTaskId。`);
+    }
+  }
   async onAfterUpdate(ctx) {
     const data = ctx.data;
     if (!data?.task) {
@@ -988,13 +1067,13 @@ class PerTaskGroupChatPlugin {
       return;
     }
     const { task, changes } = data;
-    const chatId = this.getTaskChatId(task);
+    const { chatId, profile: inheritedProfile } = await this.resolveEffectiveChat(task);
     if (!chatId) {
       logger4.debug(`onAfterUpdate[${this.pluginName}]: task #${task.id} has no per-task chat_id, skip. ` + `诊断：检查 task.context JSON 是否含 larkPerTaskChatId 字段 ` + `(sqlite: SELECT context FROM task WHERE id=${task.id})`);
       return;
     }
     const replyChannel = this.getReplyChannelFromCtx(ctx);
-    const profile = replyChannel?.profile ?? this.getTaskChatProfile(task) ?? undefined;
+    const profile = replyChannel?.profile ?? inheritedProfile ?? undefined;
     if (!this.hasMeaningfulChange(changes)) {
       logger4.debug(`onAfterUpdate[${this.pluginName}]: no meaningful change for task #${task.id}, skip`);
       return;
@@ -1023,13 +1102,13 @@ class PerTaskGroupChatPlugin {
       return;
     }
     const taskFromCtx = ctx.metadata?.task;
-    const chatId = taskFromCtx ? this.getTaskChatId(taskFromCtx) : undefined;
+    const { chatId, profile: inheritedProfile } = taskFromCtx ? await this.resolveEffectiveChat(taskFromCtx) : {};
     if (!chatId || !taskFromCtx) {
       logger4.debug(`onAfterOperationCreate[${this.pluginName}]: no per-task chat_id for task #${taskId}, skip. ` + `诊断：ctx.metadata.task 是否包含完整 task 对象？task.context.larkPerTaskChatId 是否存在？`);
       return;
     }
     const replyChannel = this.getReplyChannelFromCtx(ctx);
-    const profile = replyChannel?.profile ?? this.getTaskChatProfile(taskFromCtx) ?? undefined;
+    const profile = replyChannel?.profile ?? inheritedProfile ?? undefined;
     logger4.debug(`onAfterOperationCreate[${this.pluginName}]: send operation #${operation.id} ` + `for task #${taskId} to chat_id=${chatId}`);
     await this.sendToChat({
       chatId,
@@ -1044,13 +1123,13 @@ class PerTaskGroupChatPlugin {
       return;
     }
     const { task, terminalStatus } = data;
-    const chatId = this.getTaskChatId(task);
+    const { chatId, profile: inheritedProfile } = await this.resolveEffectiveChat(task);
     if (!chatId) {
       logger4.debug(`onAfterComplete[${this.pluginName}]: task #${task.id} has no per-task chat_id, skip`);
       return;
     }
     const replyChannel = this.getReplyChannelFromCtx(ctx);
-    const profile = replyChannel?.profile ?? this.getTaskChatProfile(task) ?? undefined;
+    const profile = replyChannel?.profile ?? inheritedProfile ?? undefined;
     const emoji = terminalStatus === "completed" ? "✅" : terminalStatus === "failed" ? "❌" : terminalStatus === "cancelled" ? "\uD83D\uDEAB" : terminalStatus === "timeout" ? "⏰" : "\uD83C\uDFC1";
     logger4.debug(`onAfterComplete[${this.pluginName}]: send complete notification for task #${task.id} ` + `status=${terminalStatus} to chat_id=${chatId}`);
     await this.sendToChat({
@@ -1136,8 +1215,8 @@ class PerTaskGroupChatPlugin {
     } catch {
       parsed = {};
     }
-    parsed[CTX_FIELD_CHAT_ID] = chatId;
-    parsed[CTX_FIELD_CHAT_PROFILE] = profile;
+    parsed[CTX_FIELD_CHAT_ID2] = chatId;
+    parsed[CTX_FIELD_CHAT_PROFILE2] = profile;
     parsed[CTX_FIELD_CHAT_CREATED_AT] = new Date().toISOString();
     parsed[CTX_FIELD_CHAT_TASK_ID] = task.id;
     const newContext = JSON.stringify(parsed);
@@ -1244,30 +1323,77 @@ ${opts.content}`);
     }
     return;
   }
-  getTaskChatId(task) {
-    const ctxStr = task.context;
+  parseChatIdFromContext(ctxStr) {
     if (!ctxStr)
       return;
     try {
       const obj = JSON.parse(ctxStr);
-      const id = obj[CTX_FIELD_CHAT_ID];
+      const id = obj[CTX_FIELD_CHAT_ID2];
       return typeof id === "string" ? id : undefined;
     } catch {
       return;
     }
   }
-  getTaskChatProfile(task) {
-    const ctxStr = task.context;
+  parseProfileFromContext(ctxStr) {
     if (!ctxStr)
       return;
     try {
       const obj = JSON.parse(ctxStr);
-      const profile = obj[CTX_FIELD_CHAT_PROFILE];
+      const profile = obj[CTX_FIELD_CHAT_PROFILE2];
       return typeof profile === "string" ? profile : undefined;
     } catch {
       return;
     }
   }
+  getTaskChatId(task) {
+    return this.parseChatIdFromContext(task.context);
+  }
+  getTaskChatProfile(task) {
+    return this.parseProfileFromContext(task.context);
+  }
+  async resolveEffectiveChat(task) {
+    const ownChatId = this.getTaskChatId(task);
+    if (ownChatId) {
+      return { chatId: ownChatId, profile: this.getTaskChatProfile(task) };
+    }
+    if (!this.taskGetter)
+      return {};
+    const seen = new Set;
+    let id = task.parent_task_id;
+    while (typeof id === "number" && id > 0 && !seen.has(id) && seen.size < 8) {
+      seen.add(id);
+      let parent;
+      try {
+        parent = await this.taskGetter(id);
+      } catch {
+        return {};
+      }
+      if (!parent)
+        return {};
+      const chatId = this.parseChatIdFromContext(parent.context);
+      if (chatId) {
+        return { chatId, profile: this.parseProfileFromContext(parent.context) };
+      }
+      id = parent.parent_task_id ?? undefined;
+    }
+    if (this.config.resolveToTriggerChatFallback) {
+      const store = getSharedEventStore();
+      const triggerEventId = getEnvContextOrEmpty()?.envEvent?.metadata?.triggerEventId;
+      if (store && typeof triggerEventId === "string" && triggerEventId.length > 0) {
+        try {
+          const triggerEvent = await store.getEventById(triggerEventId);
+          const fallbackChatId = triggerEvent?.metadata?.chatId ?? triggerEvent?.metadata?.replyChannel?.chatId;
+          if (fallbackChatId) {
+            return {
+              chatId: fallbackChatId,
+              profile: triggerEvent?.metadata?.profile ?? triggerEvent?.metadata?.replyChannel?.profile
+            };
+          }
+        } catch {}
+      }
+    }
+    return {};
+  }
   resolveBotAppIds(replyChannel) {
     if (this.config.botAppIds.length > 0) {
       logger4.debug(`resolveBotAppIds[${this.pluginName}]: using config.botAppIds=${JSON.stringify(this.config.botAppIds)}`);
@@ -1455,6 +1581,18 @@ __legacyDecorateClassTS([
 __legacyDecorateClassTS([
   TracedAs("per-task-group-chat.onAfterCreate", { recordParams: false })
 ], PerTaskGroupChatPlugin.prototype, "onAfterCreate", null);
+__legacyDecorateClassTS([
+  TracedAs("per-task-group-chat.writeChatBinding", {
+    recordParams: true,
+    recordResult: false,
+    flattenParamFilter: true,
+    paramFilter: (args) => ({
+      taskId: args[0]?.id,
+      chatId: args[1],
+      status: args[3]
+    })
+  })
+], PerTaskGroupChatPlugin.prototype, "writeChatBinding", null);
 __legacyDecorateClassTS([
   TracedAs("per-task-group-chat.onAfterUpdate", { recordParams: false })
 ], PerTaskGroupChatPlugin.prototype, "onAfterUpdate", null);

package/package.json

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