@ai-setting/roy-agent-cli 1.7.30 → 1.7.32

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.30",
+  version: "1.7.32",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -11498,10 +11498,12 @@ subSessionId: ${payload.subSessionId}`;
   }
   formatWithEvent(event) {
     const triggerSessionId = extractTriggerSessionId(event);
+    const chatId = extractChatId(event);
     return {
       message: this.format(event),
       envEvent: event,
-      triggerSessionId
+      triggerSessionId,
+      chatId
     };
   }
 }
@@ -11512,6 +11514,18 @@ function extractTriggerSessionId(event) {
   }
   return;
 }
+function extractChatId(event) {
+  const metaChannel = event?.metadata?.replyChannel;
+  if (metaChannel?.chatId && typeof metaChannel.chatId === "string" && metaChannel.chatId.length > 0) {
+    return metaChannel.chatId;
+  }
+  const payload = event?.payload;
+  const payloadChannel = payload?.replyChannel;
+  if (payloadChannel?.chatId && typeof payloadChannel.chatId === "string" && payloadChannel.chatId.length > 0) {
+    return payloadChannel.chatId;
+  }
+  return;
+}
 
 // src/commands/shared/event-handler.ts
 import { TracedAs as TracedAs5 } from "@ai-setting/roy-agent-core";
@@ -11529,6 +11543,7 @@ class EventHandler {
   unsubscribe = null;
   sessionComponent = null;
   activeEventSessionId = null;
+  activeEventSessionChatId = null;
   constructor(options) {
     this.env = options.env;
     this.eventTypes = options.eventTypes;
@@ -11632,8 +11647,27 @@ class EventHandler {
   async ensureActiveSession() {
     if (!this.sessionComponent)
       return null;
-    if (this.activeEventSessionId)
-      return this.activeEventSessionId;
+    const queueChatId = this.queue.map((item) => item.chatId).find((id) => !!id);
+    if (this.activeEventSessionId) {
+      const isChatSwitch = this.activeEventSessionChatId !== null && queueChatId !== undefined && this.activeEventSessionChatId !== queueChatId;
+      if (!isChatSwitch) {
+        return this.activeEventSessionId;
+      }
+      this.activeEventSessionId = null;
+      this.activeEventSessionChatId = null;
+    }
+    if (queueChatId) {
+      const chatSessionId = await this.ensureChatSession(queueChatId);
+      if (chatSessionId) {
+        if (this.isStopped) {
+          return null;
+        }
+        this.activeEventSessionId = chatSessionId;
+        this.activeEventSessionChatId = queueChatId;
+        return chatSessionId;
+      }
+      console.warn(`[EventHandler] Failed to ensure chat-keyed session (chatId=${queueChatId}), ` + `falling back to trigger_session_id path`);
+    }
     const triggerSessionId = this.queue.map((item) => item.triggerSessionId).find((id) => !!id);
     if (triggerSessionId) {
       try {
@@ -11668,6 +11702,45 @@ class EventHandler {
     }
     return this.createNewEventSession();
   }
+  async ensureChatSession(chatId) {
+    if (!this.sessionComponent)
+      return null;
+    try {
+      const existing = await this.sessionComponent.list({
+        filter: { metadata: { chatId, type: "lark-chat" } },
+        limit: 1
+      });
+      if (existing.length > 0) {
+        return existing[0].id;
+      }
+    } catch (error) {
+      console.error(`[EventHandler] Failed to list chat-keyed sessions (chatId=${chatId}):`, error);
+    }
+    try {
+      const created = await this.sessionComponent.create({
+        id: chatId,
+        title: `Lark Chat ${chatId}`,
+        metadata: {
+          chatId,
+          type: "lark-chat"
+        }
+      });
+      if (this.isStopped) {
+        return null;
+      }
+      return created.id;
+    } catch (createErr) {
+      console.warn(`[EventHandler] Failed to create chat-keyed session (chatId=${chatId}), ` + `trying get(): ${String(createErr)}`);
+      try {
+        const fallback = await this.sessionComponent.get(chatId);
+        if (fallback)
+          return fallback.id;
+      } catch (getErr) {
+        console.error(`[EventHandler] get() fallback also failed (chatId=${chatId}):`, getErr);
+      }
+      return null;
+    }
+  }
   async createNewEventSession() {
     try {
       const session = await this.sessionComponent.create({
@@ -11687,6 +11760,7 @@ class EventHandler {
   }
   clearActiveSession() {
     this.activeEventSessionId = null;
+    this.activeEventSessionChatId = null;
   }
   getActiveEventSessionId() {
     return this.activeEventSessionId;
@@ -11708,6 +11782,20 @@ __legacyDecorateClassTS([
   ]),
   __legacyMetadataTS("design:returntype", undefined)
 ], EventHandler.prototype, "handleEvent", null);
+__legacyDecorateClassTS([
+  TracedAs5("cli.event-handler.ensureActiveSession", { recordParams: true }),
+  __legacyMetadataTS("design:type", Function),
+  __legacyMetadataTS("design:paramtypes", []),
+  __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
+], EventHandler.prototype, "ensureActiveSession", null);
+__legacyDecorateClassTS([
+  TracedAs5("cli.event-handler.ensureChatSession", { recordParams: true }),
+  __legacyMetadataTS("design:type", Function),
+  __legacyMetadataTS("design:paramtypes", [
+    String
+  ]),
+  __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
+], EventHandler.prototype, "ensureChatSession", null);
 
 // src/commands/shared/esc-active-descendant.ts
 function hasActiveDescendants(env, parentSessionId) {

package/dist/index.js

@@ -9460,7 +9460,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.7.30",
+  version: "1.7.32",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -11497,10 +11497,12 @@ subSessionId: ${payload.subSessionId}`;
   }
   formatWithEvent(event) {
     const triggerSessionId = extractTriggerSessionId(event);
+    const chatId = extractChatId(event);
     return {
       message: this.format(event),
       envEvent: event,
-      triggerSessionId
+      triggerSessionId,
+      chatId
     };
   }
 }
@@ -11511,6 +11513,18 @@ function extractTriggerSessionId(event) {
   }
   return;
 }
+function extractChatId(event) {
+  const metaChannel = event?.metadata?.replyChannel;
+  if (metaChannel?.chatId && typeof metaChannel.chatId === "string" && metaChannel.chatId.length > 0) {
+    return metaChannel.chatId;
+  }
+  const payload = event?.payload;
+  const payloadChannel = payload?.replyChannel;
+  if (payloadChannel?.chatId && typeof payloadChannel.chatId === "string" && payloadChannel.chatId.length > 0) {
+    return payloadChannel.chatId;
+  }
+  return;
+}
 
 // src/commands/shared/event-handler.ts
 import { TracedAs as TracedAs5 } from "@ai-setting/roy-agent-core";
@@ -11528,6 +11542,7 @@ class EventHandler {
   unsubscribe = null;
   sessionComponent = null;
   activeEventSessionId = null;
+  activeEventSessionChatId = null;
   constructor(options) {
     this.env = options.env;
     this.eventTypes = options.eventTypes;
@@ -11631,8 +11646,27 @@ class EventHandler {
   async ensureActiveSession() {
     if (!this.sessionComponent)
       return null;
-    if (this.activeEventSessionId)
-      return this.activeEventSessionId;
+    const queueChatId = this.queue.map((item) => item.chatId).find((id) => !!id);
+    if (this.activeEventSessionId) {
+      const isChatSwitch = this.activeEventSessionChatId !== null && queueChatId !== undefined && this.activeEventSessionChatId !== queueChatId;
+      if (!isChatSwitch) {
+        return this.activeEventSessionId;
+      }
+      this.activeEventSessionId = null;
+      this.activeEventSessionChatId = null;
+    }
+    if (queueChatId) {
+      const chatSessionId = await this.ensureChatSession(queueChatId);
+      if (chatSessionId) {
+        if (this.isStopped) {
+          return null;
+        }
+        this.activeEventSessionId = chatSessionId;
+        this.activeEventSessionChatId = queueChatId;
+        return chatSessionId;
+      }
+      console.warn(`[EventHandler] Failed to ensure chat-keyed session (chatId=${queueChatId}), ` + `falling back to trigger_session_id path`);
+    }
     const triggerSessionId = this.queue.map((item) => item.triggerSessionId).find((id) => !!id);
     if (triggerSessionId) {
       try {
@@ -11667,6 +11701,45 @@ class EventHandler {
     }
     return this.createNewEventSession();
   }
+  async ensureChatSession(chatId) {
+    if (!this.sessionComponent)
+      return null;
+    try {
+      const existing = await this.sessionComponent.list({
+        filter: { metadata: { chatId, type: "lark-chat" } },
+        limit: 1
+      });
+      if (existing.length > 0) {
+        return existing[0].id;
+      }
+    } catch (error) {
+      console.error(`[EventHandler] Failed to list chat-keyed sessions (chatId=${chatId}):`, error);
+    }
+    try {
+      const created = await this.sessionComponent.create({
+        id: chatId,
+        title: `Lark Chat ${chatId}`,
+        metadata: {
+          chatId,
+          type: "lark-chat"
+        }
+      });
+      if (this.isStopped) {
+        return null;
+      }
+      return created.id;
+    } catch (createErr) {
+      console.warn(`[EventHandler] Failed to create chat-keyed session (chatId=${chatId}), ` + `trying get(): ${String(createErr)}`);
+      try {
+        const fallback = await this.sessionComponent.get(chatId);
+        if (fallback)
+          return fallback.id;
+      } catch (getErr) {
+        console.error(`[EventHandler] get() fallback also failed (chatId=${chatId}):`, getErr);
+      }
+      return null;
+    }
+  }
   async createNewEventSession() {
     try {
       const session = await this.sessionComponent.create({
@@ -11686,6 +11759,7 @@ class EventHandler {
   }
   clearActiveSession() {
     this.activeEventSessionId = null;
+    this.activeEventSessionChatId = null;
   }
   getActiveEventSessionId() {
     return this.activeEventSessionId;
@@ -11707,6 +11781,20 @@ __legacyDecorateClassTS([
   ]),
   __legacyMetadataTS("design:returntype", undefined)
 ], EventHandler.prototype, "handleEvent", null);
+__legacyDecorateClassTS([
+  TracedAs5("cli.event-handler.ensureActiveSession", { recordParams: true }),
+  __legacyMetadataTS("design:type", Function),
+  __legacyMetadataTS("design:paramtypes", []),
+  __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
+], EventHandler.prototype, "ensureActiveSession", null);
+__legacyDecorateClassTS([
+  TracedAs5("cli.event-handler.ensureChatSession", { recordParams: true }),
+  __legacyMetadataTS("design:type", Function),
+  __legacyMetadataTS("design:paramtypes", [
+    String
+  ]),
+  __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
+], EventHandler.prototype, "ensureChatSession", null);
 
 // src/commands/shared/esc-active-descendant.ts
 function hasActiveDescendants(env, parentSessionId) {

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: 109525120 bytes
-sha256: 2a882f2434a5c245bf9db8bf6265633c7da9529821fa408d627af44f9216cfaf
+size: 109566080 bytes
+sha256: fafb83fff1f9f1e3c89084bd1e8c561bbc2e8f8d9653b81710947fc9d55198d5

package/package.json

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