@ai-setting/roy-agent-cli 1.5.97 → 1.5.99

package/dist/bin/roy-agent.js

@@ -7427,7 +7427,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.5.97",
+    version: "1.5.99",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -9363,6 +9363,8 @@ class EventHandler {
   isProcessing = false;
   isStopped = false;
   unsubscribe = null;
+  sessionComponent = null;
+  activeEventSessionId = null;
   constructor(options) {
     this.env = options.env;
     this.eventTypes = options.eventTypes;
@@ -9371,6 +9373,7 @@ class EventHandler {
     this.formatter = options.formatter ?? new EventMessageFormatter;
     this.isIdle = options.isIdle ?? (() => true);
     this.idleCheckInterval = options.idleCheckInterval ?? 100;
+    this.sessionComponent = options.sessionComponent ?? null;
   }
   start() {
     this.isStopped = false;
@@ -9406,6 +9409,7 @@ class EventHandler {
     }
     this.queue = [];
     this.isProcessing = false;
+    this.clearActiveSession();
   }
   handleEvent(event) {
     if (this.isStopped) {
@@ -9431,6 +9435,12 @@ class EventHandler {
   }
   async processQueue() {
     this.isProcessing = true;
+    const sessionId = await this.ensureActiveSession();
+    if (this.isStopped) {
+      this.clearActiveSession();
+      this.isProcessing = false;
+      return;
+    }
     while (!this.isStopped && this.queue.length > 0) {
       await this.waitForIdle();
       if (this.isStopped) {
@@ -9440,6 +9450,9 @@ class EventHandler {
       if (!item) {
         break;
       }
+      if (sessionId) {
+        item.eventSessionId = sessionId;
+      }
       try {
         if (this.onEventWithEnv) {
           await this.onEventWithEnv(item);
@@ -9450,8 +9463,35 @@ class EventHandler {
         console.error(`[EventHandler] 处理事件失败:`, error);
       }
     }
+    this.clearActiveSession();
     this.isProcessing = false;
   }
+  async ensureActiveSession() {
+    if (!this.sessionComponent)
+      return null;
+    if (this.activeEventSessionId)
+      return this.activeEventSessionId;
+    try {
+      const session = await this.sessionComponent.create({
+        title: `Event Session - ${new Date().toLocaleString()}`
+      });
+      if (this.isStopped) {
+        this.activeEventSessionId = null;
+        return null;
+      }
+      this.activeEventSessionId = session.id;
+      return session.id;
+    } catch (error) {
+      console.error(`[EventHandler] 创建事件 session 失败:`, error);
+      return null;
+    }
+  }
+  clearActiveSession() {
+    this.activeEventSessionId = null;
+  }
+  getActiveEventSessionId() {
+    return this.activeEventSessionId;
+  }
   async waitForIdle() {
     while (!this.isStopped && !this.isIdle()) {
       await this.sleep(this.idleCheckInterval);
@@ -10076,7 +10116,7 @@ ${COLORS.system("[通知] ❯ " + message.replace(/\n/g, `
     await this.executeInternal(message, { showPrompt: true });
   }
   async handleEventMessageWithEnv(formattedEvent) {
-    const { message, envEvent } = formattedEvent;
+    const { message, envEvent, eventSessionId } = formattedEvent;
     console.log(`
 ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
 ` + COLORS.system("[通知2] ❯ ")))}
@@ -10096,7 +10136,8 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
       agentType: agentFromEvent,
       pluginEnabled,
       envEvent,
-      plugins
+      plugins,
+      eventSessionId
     };
     await this.executeInternal(message, { showPrompt: true });
   }
@@ -10550,7 +10591,8 @@ function createInteractiveCommand(externalEnvService) {
               model: args.model,
               ...agentContext
             };
-            const result = await queryExecutor.execute(message, sessionId, {
+            const effectiveSessionId = mergedContext.eventSessionId ?? sessionId;
+            const result = await queryExecutor.execute(message, effectiveSessionId, {
               showReasoning: args.reasoning,
               showToolCalls: args.toolCalls,
               showToolResults: args.toolResults
@@ -10612,9 +10654,7 @@ function createInteractiveCommand(externalEnvService) {
           eventTypes: ["task.background.*", "event-source.event.*"],
           formatter: new EventMessageFormatter({ prefix: "[通知]" }),
           isIdle: () => repl.isIdle(),
-          onEvent: async (message) => {
-            await repl.handleEventMessage(message);
-          },
+          sessionComponent,
           onEventWithEnv: async (formattedEvent) => {
             await repl.handleEventMessageWithEnv(formattedEvent);
           }

package/dist/index.js

@@ -7426,7 +7426,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.5.97",
+    version: "1.5.99",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -9362,6 +9362,8 @@ class EventHandler {
   isProcessing = false;
   isStopped = false;
   unsubscribe = null;
+  sessionComponent = null;
+  activeEventSessionId = null;
   constructor(options) {
     this.env = options.env;
     this.eventTypes = options.eventTypes;
@@ -9370,6 +9372,7 @@ class EventHandler {
     this.formatter = options.formatter ?? new EventMessageFormatter;
     this.isIdle = options.isIdle ?? (() => true);
     this.idleCheckInterval = options.idleCheckInterval ?? 100;
+    this.sessionComponent = options.sessionComponent ?? null;
   }
   start() {
     this.isStopped = false;
@@ -9405,6 +9408,7 @@ class EventHandler {
     }
     this.queue = [];
     this.isProcessing = false;
+    this.clearActiveSession();
   }
   handleEvent(event) {
     if (this.isStopped) {
@@ -9430,6 +9434,12 @@ class EventHandler {
   }
   async processQueue() {
     this.isProcessing = true;
+    const sessionId = await this.ensureActiveSession();
+    if (this.isStopped) {
+      this.clearActiveSession();
+      this.isProcessing = false;
+      return;
+    }
     while (!this.isStopped && this.queue.length > 0) {
       await this.waitForIdle();
       if (this.isStopped) {
@@ -9439,6 +9449,9 @@ class EventHandler {
       if (!item) {
         break;
       }
+      if (sessionId) {
+        item.eventSessionId = sessionId;
+      }
       try {
         if (this.onEventWithEnv) {
           await this.onEventWithEnv(item);
@@ -9449,8 +9462,35 @@ class EventHandler {
         console.error(`[EventHandler] 处理事件失败:`, error);
       }
     }
+    this.clearActiveSession();
     this.isProcessing = false;
   }
+  async ensureActiveSession() {
+    if (!this.sessionComponent)
+      return null;
+    if (this.activeEventSessionId)
+      return this.activeEventSessionId;
+    try {
+      const session = await this.sessionComponent.create({
+        title: `Event Session - ${new Date().toLocaleString()}`
+      });
+      if (this.isStopped) {
+        this.activeEventSessionId = null;
+        return null;
+      }
+      this.activeEventSessionId = session.id;
+      return session.id;
+    } catch (error) {
+      console.error(`[EventHandler] 创建事件 session 失败:`, error);
+      return null;
+    }
+  }
+  clearActiveSession() {
+    this.activeEventSessionId = null;
+  }
+  getActiveEventSessionId() {
+    return this.activeEventSessionId;
+  }
   async waitForIdle() {
     while (!this.isStopped && !this.isIdle()) {
       await this.sleep(this.idleCheckInterval);
@@ -10075,7 +10115,7 @@ ${COLORS.system("[通知] ❯ " + message.replace(/\n/g, `
     await this.executeInternal(message, { showPrompt: true });
   }
   async handleEventMessageWithEnv(formattedEvent) {
-    const { message, envEvent } = formattedEvent;
+    const { message, envEvent, eventSessionId } = formattedEvent;
     console.log(`
 ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
 ` + COLORS.system("[通知2] ❯ ")))}
@@ -10095,7 +10135,8 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
       agentType: agentFromEvent,
       pluginEnabled,
       envEvent,
-      plugins
+      plugins,
+      eventSessionId
     };
     await this.executeInternal(message, { showPrompt: true });
   }
@@ -10549,7 +10590,8 @@ function createInteractiveCommand(externalEnvService) {
               model: args.model,
               ...agentContext
             };
-            const result = await queryExecutor.execute(message, sessionId, {
+            const effectiveSessionId = mergedContext.eventSessionId ?? sessionId;
+            const result = await queryExecutor.execute(message, effectiveSessionId, {
               showReasoning: args.reasoning,
               showToolCalls: args.toolCalls,
               showToolResults: args.toolResults
@@ -10611,9 +10653,7 @@ function createInteractiveCommand(externalEnvService) {
           eventTypes: ["task.background.*", "event-source.event.*"],
           formatter: new EventMessageFormatter({ prefix: "[通知]" }),
           isIdle: () => repl.isIdle(),
-          onEvent: async (message) => {
-            await repl.handleEventMessage(message);
-          },
+          sessionComponent,
           onEventWithEnv: async (formattedEvent) => {
             await repl.handleEventMessageWithEnv(formattedEvent);
           }

package/package.json

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