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

package/dist/bin/roy-agent.js

@@ -9461,7 +9461,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.7.38",
+  version: "1.7.40",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -11535,6 +11535,24 @@ import { EventStoreImpl, setSharedEventStore } from "@ai-setting/roy-agent-core/
 
 // src/commands/shared/event-handler.ts
 import { TracedAs as TracedAs5 } from "@ai-setting/roy-agent-core";
+function parseLarkPerTaskChatId(contextJson) {
+  if (!contextJson)
+    return;
+  try {
+    const obj = JSON.parse(contextJson);
+    const id = obj?.larkPerTaskChatId;
+    return typeof id === "string" && id.length > 0 ? id : undefined;
+  } catch {
+    return;
+  }
+}
+var NOTIFY_V2_TERMINAL_TYPES = new Set([
+  "task.background.completed",
+  "task.background.failed",
+  "task.background.timeout",
+  "task.background.stopped"
+]);
+
 class EventHandler {
   env;
   eventTypes;
@@ -11549,6 +11567,7 @@ class EventHandler {
   unsubscribe = null;
   sessionComponent = null;
   activeEventSessionId = null;
+  resolvedSessionByTrigger = new Map;
   eventStore = null;
   getHandlerForEsType = null;
   constructor(options) {
@@ -11607,7 +11626,7 @@ class EventHandler {
     this.enqueue(formatted);
   }
   async formatEvent(event) {
-    if (event.type.startsWith("task.background.") && event.metadata?.triggerEventId && this.eventStore && this.getHandlerForEsType) {
+    if (NOTIFY_V2_TERMINAL_TYPES.has(event.type) && event.metadata?.triggerEventId && this.eventStore && this.getHandlerForEsType) {
       try {
         const v2Formatted = await this.formatEventViaESPluginV2(event);
         if (v2Formatted) {
@@ -11655,13 +11674,17 @@ class EventHandler {
         error: typeof payload?.error === "string" ? payload.error : undefined
       };
       setTimeout(() => {
-        Promise.resolve(handler.postProcessNotifyEvent({
-          notifyEvent: notifyEventForHook,
-          triggerEvent,
-          subAgentResult,
-          formattedPrompt: prompt.promptText,
-          profile
-        })).catch((err) => {
+        (async () => {
+          const resolvedChatIds = await this.resolveNotifyChatIds(notifyEventForHook.taskId);
+          await handler.postProcessNotifyEvent({
+            notifyEvent: notifyEventForHook,
+            triggerEvent,
+            subAgentResult,
+            formattedPrompt: prompt.promptText,
+            profile,
+            resolvedChatIds
+          });
+        })().catch((err) => {
           console.error(`[EventHandler] postProcessNotifyEvent hook failed (swallowed)`, err);
         });
       }, 0);
@@ -11677,6 +11700,33 @@ class EventHandler {
       ...triggerMessageId ? { triggerMessageId } : {}
     };
   }
+  async resolveNotifyChatIds(taskId) {
+    if (!taskId)
+      return [];
+    const taskComp = this.env.getComponent("task");
+    if (!taskComp?.getTask)
+      return [];
+    const seen = new Set;
+    let id = taskId;
+    while (id !== undefined && id !== null && !seen.has(id) && seen.size < 8) {
+      seen.add(id);
+      let task;
+      try {
+        task = await taskComp.getTask(id);
+      } catch (err) {
+        console.error(`[EventHandler] resolveNotifyChatIds: getTask(${id}) failed`, err);
+        return [];
+      }
+      if (!task)
+        return [];
+      const chatId = parseLarkPerTaskChatId(task.context);
+      if (chatId)
+        return [chatId];
+      const parent = task.parent_task_id;
+      id = typeof parent === "number" && parent > 0 ? parent : undefined;
+    }
+    return [];
+  }
   async handleNotifyEventForTest(event) {
     if (this.isStopped)
       return;
@@ -11753,7 +11803,12 @@ class EventHandler {
   async ensureActiveSession(triggerSessionIdOverride) {
     if (!this.sessionComponent)
       return null;
-    if (this.activeEventSessionId) {
+    if (triggerSessionIdOverride) {
+      const cached = this.resolvedSessionByTrigger.get(triggerSessionIdOverride);
+      if (cached) {
+        return cached;
+      }
+    } else if (this.activeEventSessionId) {
       return this.activeEventSessionId;
     }
     const triggerSessionId = triggerSessionIdOverride ?? this.queue.map((item) => item.triggerSessionId).find((id) => !!id);
@@ -11765,6 +11820,7 @@ class EventHandler {
             return null;
           }
           this.activeEventSessionId = existing.id;
+          this.cacheResolvedSession(triggerSessionIdOverride, existing.id);
           await this.sessionComponent.setActiveSession(existing.id);
           return existing.id;
         }
@@ -11782,13 +11838,16 @@ class EventHandler {
             return null;
           }
           this.activeEventSessionId = existing.id;
+          this.cacheResolvedSession(triggerSessionIdOverride, existing.id);
           return existing.id;
         }
       }
     } catch (error) {
       console.error(`[EventHandler] Failed to lookup global active session:`, error);
     }
-    return this.createNewEventSession();
+    const created = await this.createNewEventSession();
+    this.cacheResolvedSession(triggerSessionIdOverride, created);
+    return created;
   }
   async ensureChatSession(chatId) {
     if (!this.sessionComponent)
@@ -11848,6 +11907,12 @@ class EventHandler {
   }
   clearActiveSession() {
     this.activeEventSessionId = null;
+    this.resolvedSessionByTrigger.clear();
+  }
+  cacheResolvedSession(triggerSessionIdOverride, sessionId) {
+    if (triggerSessionIdOverride && sessionId) {
+      this.resolvedSessionByTrigger.set(triggerSessionIdOverride, sessionId);
+    }
   }
   getActiveEventSessionId() {
     return this.activeEventSessionId;
@@ -11886,7 +11951,7 @@ __legacyDecorateClassTS([
   __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], EventHandler.prototype, "formatEventViaESPluginV2", null);
 __legacyDecorateClassTS([
-  TracedAs5("cli.event-handler.ensureActiveSession", { recordParams: true }),
+  TracedAs5("cli.event-handler.ensureActiveSession", { recordParams: true, recordResult: true }),
   __legacyMetadataTS("design:type", Function),
   __legacyMetadataTS("design:paramtypes", [
     String
@@ -13121,16 +13186,23 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
     const agentFromEvent = envEvent.metadata?.agent;
     let envEventForAgent = envEvent;
     const eventReplyChannel = envEvent?.metadata?.replyChannel;
+    const eventChatId = eventReplyChannel?.chatId ?? formattedEvent.chatId ?? envEvent?.payload?.replyChannel?.chatId;
     if (eventReplyChannel) {
       this.lastReplyChannel = eventReplyChannel;
-    } else if (this.lastReplyChannel) {
-      envEventForAgent = {
-        ...envEvent,
-        metadata: {
-          ...envEvent?.metadata ?? {},
-          replyChannel: this.lastReplyChannel
-        }
-      };
+      const rcChatId = eventReplyChannel.chatId;
+      if (rcChatId)
+        this.rememberReplyChannelForChat(rcChatId, eventReplyChannel);
+    } else {
+      const fallbackChannel = (eventChatId ? this.lastReplyChannelByChat?.get(eventChatId) : undefined) ?? this.lastReplyChannel;
+      if (fallbackChannel) {
+        envEventForAgent = {
+          ...envEvent,
+          metadata: {
+            ...envEvent?.metadata ?? {},
+            replyChannel: fallbackChannel
+          }
+        };
+      }
     }
     this.currentAgentContext = {
       agentType: agentFromEvent,
@@ -13144,6 +13216,22 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
   }
   currentAgentContext = undefined;
   lastReplyChannel = undefined;
+  lastReplyChannelByChat = new Map;
+  static REPLY_CHANNEL_CHAT_CACHE_MAX = 100;
+  rememberReplyChannelForChat(chatId, channel) {
+    if (!this.lastReplyChannelByChat)
+      this.lastReplyChannelByChat = new Map;
+    if (this.lastReplyChannelByChat.has(chatId)) {
+      this.lastReplyChannelByChat.delete(chatId);
+    }
+    this.lastReplyChannelByChat.set(chatId, channel);
+    while (this.lastReplyChannelByChat.size > REPL.REPLY_CHANNEL_CHAT_CACHE_MAX) {
+      const oldest = this.lastReplyChannelByChat.keys().next().value;
+      if (oldest === undefined)
+        break;
+      this.lastReplyChannelByChat.delete(oldest);
+    }
+  }
   isIdle() {
     return !this.isExecuting;
   }

package/dist/index.js

@@ -9460,7 +9460,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.7.38",
+  version: "1.7.40",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -11534,6 +11534,24 @@ import { EventStoreImpl, setSharedEventStore } from "@ai-setting/roy-agent-core/
 
 // src/commands/shared/event-handler.ts
 import { TracedAs as TracedAs5 } from "@ai-setting/roy-agent-core";
+function parseLarkPerTaskChatId(contextJson) {
+  if (!contextJson)
+    return;
+  try {
+    const obj = JSON.parse(contextJson);
+    const id = obj?.larkPerTaskChatId;
+    return typeof id === "string" && id.length > 0 ? id : undefined;
+  } catch {
+    return;
+  }
+}
+var NOTIFY_V2_TERMINAL_TYPES = new Set([
+  "task.background.completed",
+  "task.background.failed",
+  "task.background.timeout",
+  "task.background.stopped"
+]);
+
 class EventHandler {
   env;
   eventTypes;
@@ -11548,6 +11566,7 @@ class EventHandler {
   unsubscribe = null;
   sessionComponent = null;
   activeEventSessionId = null;
+  resolvedSessionByTrigger = new Map;
   eventStore = null;
   getHandlerForEsType = null;
   constructor(options) {
@@ -11606,7 +11625,7 @@ class EventHandler {
     this.enqueue(formatted);
   }
   async formatEvent(event) {
-    if (event.type.startsWith("task.background.") && event.metadata?.triggerEventId && this.eventStore && this.getHandlerForEsType) {
+    if (NOTIFY_V2_TERMINAL_TYPES.has(event.type) && event.metadata?.triggerEventId && this.eventStore && this.getHandlerForEsType) {
       try {
         const v2Formatted = await this.formatEventViaESPluginV2(event);
         if (v2Formatted) {
@@ -11654,13 +11673,17 @@ class EventHandler {
         error: typeof payload?.error === "string" ? payload.error : undefined
       };
       setTimeout(() => {
-        Promise.resolve(handler.postProcessNotifyEvent({
-          notifyEvent: notifyEventForHook,
-          triggerEvent,
-          subAgentResult,
-          formattedPrompt: prompt.promptText,
-          profile
-        })).catch((err) => {
+        (async () => {
+          const resolvedChatIds = await this.resolveNotifyChatIds(notifyEventForHook.taskId);
+          await handler.postProcessNotifyEvent({
+            notifyEvent: notifyEventForHook,
+            triggerEvent,
+            subAgentResult,
+            formattedPrompt: prompt.promptText,
+            profile,
+            resolvedChatIds
+          });
+        })().catch((err) => {
           console.error(`[EventHandler] postProcessNotifyEvent hook failed (swallowed)`, err);
         });
       }, 0);
@@ -11676,6 +11699,33 @@ class EventHandler {
       ...triggerMessageId ? { triggerMessageId } : {}
     };
   }
+  async resolveNotifyChatIds(taskId) {
+    if (!taskId)
+      return [];
+    const taskComp = this.env.getComponent("task");
+    if (!taskComp?.getTask)
+      return [];
+    const seen = new Set;
+    let id = taskId;
+    while (id !== undefined && id !== null && !seen.has(id) && seen.size < 8) {
+      seen.add(id);
+      let task;
+      try {
+        task = await taskComp.getTask(id);
+      } catch (err) {
+        console.error(`[EventHandler] resolveNotifyChatIds: getTask(${id}) failed`, err);
+        return [];
+      }
+      if (!task)
+        return [];
+      const chatId = parseLarkPerTaskChatId(task.context);
+      if (chatId)
+        return [chatId];
+      const parent = task.parent_task_id;
+      id = typeof parent === "number" && parent > 0 ? parent : undefined;
+    }
+    return [];
+  }
   async handleNotifyEventForTest(event) {
     if (this.isStopped)
       return;
@@ -11752,7 +11802,12 @@ class EventHandler {
   async ensureActiveSession(triggerSessionIdOverride) {
     if (!this.sessionComponent)
       return null;
-    if (this.activeEventSessionId) {
+    if (triggerSessionIdOverride) {
+      const cached = this.resolvedSessionByTrigger.get(triggerSessionIdOverride);
+      if (cached) {
+        return cached;
+      }
+    } else if (this.activeEventSessionId) {
       return this.activeEventSessionId;
     }
     const triggerSessionId = triggerSessionIdOverride ?? this.queue.map((item) => item.triggerSessionId).find((id) => !!id);
@@ -11764,6 +11819,7 @@ class EventHandler {
             return null;
           }
           this.activeEventSessionId = existing.id;
+          this.cacheResolvedSession(triggerSessionIdOverride, existing.id);
           await this.sessionComponent.setActiveSession(existing.id);
           return existing.id;
         }
@@ -11781,13 +11837,16 @@ class EventHandler {
             return null;
           }
           this.activeEventSessionId = existing.id;
+          this.cacheResolvedSession(triggerSessionIdOverride, existing.id);
           return existing.id;
         }
       }
     } catch (error) {
       console.error(`[EventHandler] Failed to lookup global active session:`, error);
     }
-    return this.createNewEventSession();
+    const created = await this.createNewEventSession();
+    this.cacheResolvedSession(triggerSessionIdOverride, created);
+    return created;
   }
   async ensureChatSession(chatId) {
     if (!this.sessionComponent)
@@ -11847,6 +11906,12 @@ class EventHandler {
   }
   clearActiveSession() {
     this.activeEventSessionId = null;
+    this.resolvedSessionByTrigger.clear();
+  }
+  cacheResolvedSession(triggerSessionIdOverride, sessionId) {
+    if (triggerSessionIdOverride && sessionId) {
+      this.resolvedSessionByTrigger.set(triggerSessionIdOverride, sessionId);
+    }
   }
   getActiveEventSessionId() {
     return this.activeEventSessionId;
@@ -11885,7 +11950,7 @@ __legacyDecorateClassTS([
   __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], EventHandler.prototype, "formatEventViaESPluginV2", null);
 __legacyDecorateClassTS([
-  TracedAs5("cli.event-handler.ensureActiveSession", { recordParams: true }),
+  TracedAs5("cli.event-handler.ensureActiveSession", { recordParams: true, recordResult: true }),
   __legacyMetadataTS("design:type", Function),
   __legacyMetadataTS("design:paramtypes", [
     String
@@ -13120,16 +13185,23 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
     const agentFromEvent = envEvent.metadata?.agent;
     let envEventForAgent = envEvent;
     const eventReplyChannel = envEvent?.metadata?.replyChannel;
+    const eventChatId = eventReplyChannel?.chatId ?? formattedEvent.chatId ?? envEvent?.payload?.replyChannel?.chatId;
     if (eventReplyChannel) {
       this.lastReplyChannel = eventReplyChannel;
-    } else if (this.lastReplyChannel) {
-      envEventForAgent = {
-        ...envEvent,
-        metadata: {
-          ...envEvent?.metadata ?? {},
-          replyChannel: this.lastReplyChannel
-        }
-      };
+      const rcChatId = eventReplyChannel.chatId;
+      if (rcChatId)
+        this.rememberReplyChannelForChat(rcChatId, eventReplyChannel);
+    } else {
+      const fallbackChannel = (eventChatId ? this.lastReplyChannelByChat?.get(eventChatId) : undefined) ?? this.lastReplyChannel;
+      if (fallbackChannel) {
+        envEventForAgent = {
+          ...envEvent,
+          metadata: {
+            ...envEvent?.metadata ?? {},
+            replyChannel: fallbackChannel
+          }
+        };
+      }
     }
     this.currentAgentContext = {
       agentType: agentFromEvent,
@@ -13143,6 +13215,22 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
   }
   currentAgentContext = undefined;
   lastReplyChannel = undefined;
+  lastReplyChannelByChat = new Map;
+  static REPLY_CHANNEL_CHAT_CACHE_MAX = 100;
+  rememberReplyChannelForChat(chatId, channel) {
+    if (!this.lastReplyChannelByChat)
+      this.lastReplyChannelByChat = new Map;
+    if (this.lastReplyChannelByChat.has(chatId)) {
+      this.lastReplyChannelByChat.delete(chatId);
+    }
+    this.lastReplyChannelByChat.set(chatId, channel);
+    while (this.lastReplyChannelByChat.size > REPL.REPLY_CHANNEL_CHAT_CACHE_MAX) {
+      const oldest = this.lastReplyChannelByChat.keys().next().value;
+      if (oldest === undefined)
+        break;
+      this.lastReplyChannelByChat.delete(oldest);
+    }
+  }
   isIdle() {
     return !this.isExecuting;
   }

package/dist/roy-agent-linux-x64/bin/roy-agent

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/dist/roy-agent-linux-x64/bin/roy-agent
-size: 109602944 bytes
-sha256: 4bff7951c55594175f880f2caca477359a3c55c89b5b973d9ba7cf8e721d8928
+size: 109627520 bytes
+sha256: 70e2598656125685dba913f210bd2d2f5d7a41a7e80c3969b259fef85b7b61f1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-cli",
-  "version": "1.7.38",
+  "version": "1.7.40",
   "type": "module",
   "description": "CLI for roy-agent - Non-interactive command execution",
   "main": "./dist/index.js",