@ai-setting/roy-agent-cli 1.7.39 → 1.7.41

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.39",
+  version: "1.7.41",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -11531,7 +11531,10 @@ function extractChatId(event) {
 import { existsSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
-import { EventStoreImpl, setSharedEventStore } from "@ai-setting/roy-agent-core/env/event-source/event-store";
+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";
@@ -11546,6 +11549,12 @@ function parseLarkPerTaskChatId(contextJson) {
     return;
   }
 }
+var NOTIFY_V2_TERMINAL_TYPES = new Set([
+  "task.background.completed",
+  "task.background.failed",
+  "task.background.timeout",
+  "task.background.stopped"
+]);
 
 class EventHandler {
   env;
@@ -11620,7 +11629,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) {
@@ -13180,16 +13189,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,
@@ -13203,6 +13219,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.39",
+  version: "1.7.41",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -11530,7 +11530,10 @@ function extractChatId(event) {
 import { existsSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
-import { EventStoreImpl, setSharedEventStore } from "@ai-setting/roy-agent-core/env/event-source/event-store";
+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";
@@ -11545,6 +11548,12 @@ function parseLarkPerTaskChatId(contextJson) {
     return;
   }
 }
+var NOTIFY_V2_TERMINAL_TYPES = new Set([
+  "task.background.completed",
+  "task.background.failed",
+  "task.background.timeout",
+  "task.background.stopped"
+]);
 
 class EventHandler {
   env;
@@ -11619,7 +11628,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) {
@@ -13179,16 +13188,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,
@@ -13202,6 +13218,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: 109615232 bytes
-sha256: bc11a701a8e4abd25b0b9ba8acc34523b56c936f17885321dd6ad9f4b331cf85
+size: 109627520 bytes
+sha256: 528166449c43291284fb90bf9399e65222287176cbe7114abf870e4fe0aee093

package/package.json

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